summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Kuhn <suraia@ikkoku.de>2019-02-19 11:02:02 +0100
committerMassimiliano Culpo <massimiliano.culpo@gmail.com>2019-02-19 11:02:02 +0100
commitbcee3efecd29c666d3122c136d7e50419560f434 (patch)
tree679b98d2a76220aea171ef93480751d27602306f
parentec4da14e2c17f1d6bf66ef2fc2b34c8716f08785 (diff)
downloadspack-bcee3efecd29c666d3122c136d7e50419560f434.tar.gz
spack-bcee3efecd29c666d3122c136d7e50419560f434.tar.bz2
spack-bcee3efecd29c666d3122c136d7e50419560f434.tar.xz
spack-bcee3efecd29c666d3122c136d7e50419560f434.zip
mvapich2: Improve package (#10642)
- Add support for nemesis:ofi netmod - Add missing pkg-config and libxml2 dependencies
-rw-r--r--var/spack/repos/builtin/packages/mvapich2/package.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py
index 3cf2dba408..1c4a91d777 100644
--- a/var/spack/repos/builtin/packages/mvapich2/package.py
+++ b/var/spack/repos/builtin/packages/mvapich2/package.py
@@ -76,7 +76,7 @@ class Mvapich2(AutotoolsPackage):
default='psm',
values=(
'psm', 'sock', 'nemesisib', 'nemesis', 'mrail', 'nemesisibtcp',
- 'nemesistcpib'
+ 'nemesistcpib', 'nemesisofi'
)
)
@@ -94,14 +94,17 @@ class Mvapich2(AutotoolsPackage):
depends_on('findutils', type='build')
depends_on('bison', type='build')
+ depends_on('pkgconfig', type='build')
depends_on('zlib')
depends_on('libpciaccess', when=(sys.platform != 'darwin'))
+ depends_on('libxml2')
depends_on('cuda', when='+cuda')
depends_on('psm', when='fabrics=psm')
depends_on('rdma-core', when='fabrics=mrail')
depends_on('rdma-core', when='fabrics=nemesisib')
depends_on('rdma-core', when='fabrics=nemesistcpib')
depends_on('rdma-core', when='fabrics=nemesisibtcp')
+ depends_on('libfabric', when='fabrics=nemesisofi')
filter_compiler_wrappers(
'mpicc', 'mpicxx', 'mpif77', 'mpif90', 'mpifort', relative_root='bin'
@@ -163,6 +166,9 @@ class Mvapich2(AutotoolsPackage):
elif 'fabrics=mrail' in self.spec:
opts = ["--with-device=ch3:mrail", "--with-rdma=gen2",
"--disable-mcast"]
+ elif 'fabrics=nemesisofi' in self.spec:
+ opts = ["--with-device=ch3:nemesis:ofi",
+ "--with-ofi={0}".format(self.spec['libfabric'].prefix)]
return opts
@property