Commit 9c1702b2 authored by Philip Carns's avatar Philip Carns

remove deprecated patches

parent 62fb7010
diff --git a/var/spack/repos/builtin/packages/mercury/package.py b/var/spack/repos/builtin/packages/mercury/package.py
index e69d19d4b..a2a65a4a4 100644
--- a/var/spack/repos/builtin/packages/mercury/package.py
+++ b/var/spack/repos/builtin/packages/mercury/package.py
@@ -25,7 +25,6 @@ class Mercury(CMakePackage):
depends_on('cci@master', when='+cci', type=('build', 'link', 'run'))
depends_on('libfabric', when='+fabric', type=('build', 'link', 'run'))
- depends_on('libfabric@develop', when='+fabric platform=cray', type=('build', 'link', 'run'))
depends_on('bmi', when='+bmi', type=('build', 'link', 'run'))
depends_on('openpa', type=('build', 'link', 'run'))
diff --git a/var/spack/repos/builtin/packages/mercury/package.py b/var/spack/repos/builtin/packages/mercury/package.py
index e69d19d4b..fd4bcdfdc 100644
--- a/var/spack/repos/builtin/packages/mercury/package.py
+++ b/var/spack/repos/builtin/packages/mercury/package.py
@@ -22,6 +22,11 @@ class Mercury(CMakePackage):
variant('selfforward', default=True,
description='Mercury will short-circuit operations' +
' by forwarding to itself when possible')
+# NOTE: the 'udreg' variant requires that the MPICH_GNI_NDREG_ENTRIES=1024
+# environment variable be set at run time to avoid conflicts with
+# Cray-MPICH if libfabric and MPI are used at the same time
+ variant('udreg', default=False,
+ description='Enable udreg on supported Cray platforms')
depends_on('cci@master', when='+cci', type=('build', 'link', 'run'))
depends_on('libfabric', when='+fabric', type=('build', 'link', 'run'))
@@ -53,4 +58,9 @@ class Mercury(CMakePackage):
else:
args.extend(['-DMERCURY_USE_SELF_FORWARD=OFF'])
+ if (self.spec.variants['udreg'].value):
+ args.extend(['-DNA_OFI_GNI_USE_UDREG=ON'])
+ else:
+ args.extend(['-DNA_OFI_GNI_USE_UDREG=OFF'])
+
return args
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment