From 067800bc315125caa86037bbb82e45bab71a9896 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Tue, 24 May 2022 21:57:21 +0200 Subject: mpich: re-enable building of the older versions (#30766) * mpich: enable building @3.4:3.4.3 ~cuda * mpich: add dependency on mxm --- var/spack/repos/builtin/packages/mpich/package.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py index 64fd90f0d6..25205b0cf6 100644 --- a/var/spack/repos/builtin/packages/mpich/package.py +++ b/var/spack/repos/builtin/packages/mpich/package.py @@ -192,6 +192,7 @@ with '-Wl,-commons,use_dylibs' and without depends_on('libfabric@:1.6', when='device=ch3 netmod=ofi') depends_on('ucx', when='netmod=ucx') + depends_on('mxm', when='netmod=mxm') # The dependencies on libpciaccess and libxml2 come from the embedded # hwloc, which, before version 3.3, was used only for Hydra. @@ -508,7 +509,12 @@ with '-Wl,-commons,use_dylibs' and without elif 'pmi=cray' in spec: config_args.append('--with-pmi=cray') - config_args += self.with_or_without('cuda', activation_value='prefix') + if '+cuda' in spec: + config_args.append('--with-cuda={0}'.format(spec['cuda'].prefix)) + elif spec.satisfies('@:3.3,3.4.4:'): + # Versions from 3.4 to 3.4.3 cannot handle --without-cuda + # (see https://github.com/pmodels/mpich/pull/5060): + config_args.append('--without-cuda') if '+rocm' in spec: config_args.append('--with-hip={0}'.format(spec['hip'].prefix)) -- cgit v1.2.3-60-g2f50