hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

openmpi: add variant for using internal hwloc (#19109)

Browse source 
It turns out there are certain cases where having Open MPI use an external hwloc messes up other
applications that also rely on hwloc, but a different version.

Signed-off-by: Howard Pritchard <howardp@lanl.gov>
This commit is contained in:
Howard Pritchard 2021-02-20 01:52:34 -07:00 committed by GitHub
parent aa01123bba
commit 4bd8cd1916
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
var/spack/repos/builtin/packages/openmpi/package.py
View file

@ -249,6 +249,8 @@ class Openmpi(AutotoolsPackage):
default=False,
description='Do not remove mpirun/mpiexec when building with slurm'
)
# Variants to use internal packages
variant('internal-hwloc', default=False, description='Use internal hwloc')
provides('mpi')
provides('mpi@:2.2', when='@1.6.5')
@ -268,14 +270,14 @@ class Openmpi(AutotoolsPackage):
depends_on('libevent@2.0:', when='@4:')
depends_on('hwloc@2.0:', when='@4:')
depends_on('hwloc@2.0:', when='@4: ~internal-hwloc')
# ompi@:3.0.0 doesn't support newer hwloc releases:
# "configure: error: OMPI does not currently support hwloc v2 API"
# 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@:1.999', when='@:3.999.999 ~internal-hwloc')
depends_on('hwloc +cuda', when='+cuda')
depends_on('hwloc +cuda', when='+cuda ~internal-hwloc')
depends_on('java', when='+java')
depends_on('sqlite', when='+sqlite3@:1.11')
depends_on('zlib', when='@3.0.0:')
@ -683,7 +685,7 @@ def configure_args(self):
if spec.satisfies('@4.0.0:'):
config_args.append('--with-libevent={0}'.format(spec['libevent'].prefix))
# Hwloc support
if spec.satisfies('@1.5.2:'):
if '~internal-hwloc' in spec and spec.satisfies('@1.5.2:'):
config_args.append('--with-hwloc={0}'.format(spec['hwloc'].prefix))
# Java support
if spec.satisfies('@1.7.4:'):