From bcee3efecd29c666d3122c136d7e50419560f434 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Tue, 19 Feb 2019 11:02:02 +0100 Subject: mvapich2: Improve package (#10642) - Add support for nemesis:ofi netmod - Add missing pkg-config and libxml2 dependencies --- var/spack/repos/builtin/packages/mvapich2/package.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3-70-g09d2