From 25ae8c526b47850737085f8da25c790c276cbadd Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Mon, 11 Apr 2022 10:13:50 +0200 Subject: openmpi: ucx >= 1.9.0 for 4.0.x, 4.1.x and 5.x (#29971) --- var/spack/repos/builtin/packages/openmpi/package.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index baae1c2b78..3694c65ce4 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -303,9 +303,13 @@ class Openmpi(AutotoolsPackage, CudaPackage): depends_on('rdma-core', when='fabrics=verbs') depends_on('mxm', when='fabrics=mxm') depends_on('binutils+libiberty', when='fabrics=mxm') - depends_on('ucx', when='fabrics=ucx') - depends_on('ucx +thread_multiple', when='fabrics=ucx +thread_multiple') - depends_on('ucx +thread_multiple', when='@3.0.0: fabrics=ucx') + with when('fabrics=ucx'): + depends_on('ucx') + depends_on('ucx +thread_multiple', when='+thread_multiple') + depends_on('ucx +thread_multiple', when='@3.0.0:') + depends_on('ucx@1.9.0:', when='@4.0.6:4.0') + depends_on('ucx@1.9.0:', when='@4.1.1:4.1') + depends_on('ucx@1.9.0:', when='@5.0.0:') depends_on('libfabric', when='fabrics=ofi') depends_on('fca', when='fabrics=fca') depends_on('hcoll', when='fabrics=hcoll') -- cgit v1.2.3-60-g2f50