From 9a46ee00850e9d4a332b1549ab2926707ff0ccfb Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Fri, 9 Oct 2020 13:29:58 -0700 Subject: Fixed the dependency of newer OpenMPI on current hwloc. Pathch (#17917) contributed by Thorsten Kurth. --- var/spack/repos/builtin/packages/openmpi/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index b95fd03164..7653690c42 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -258,10 +258,12 @@ class Openmpi(AutotoolsPackage): depends_on('pkgconfig', type='build') - depends_on('hwloc', when='@4:') + depends_on('hwloc@2.0:', when='@4:') # ompi@:3.0.0 doesn't support newer hwloc releases: # "configure: error: OMPI does not currently support hwloc v2 API" - depends_on('hwloc@:1.999', when='@:3.999.999') + # Future ompi releases may support it, needs to be verified. + # See #7483 for context. + depends_on('hwloc@:1.999', when='@:3.999.9999') depends_on('hwloc +cuda', when='+cuda') depends_on('java', when='+java') -- cgit v1.2.3-60-g2f50