zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openmpi: add additional variants (#16044)

Browse Source 
* Add variants to OpenMPI

* Add variant for toggling runpath

* Fix typo

* Remove blank line whitespace
This commit is contained in:
Carson Woods 2020-04-28 11:51:30 -04:00 committed by GitHub
parent aec3589679
commit 27b7d4bd21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
var/spack/repos/builtin/packages/openmpi/package.py
View File

@ -230,13 +230,16 @@ class Openmpi(AutotoolsPackage):
) )
# Additional support options # Additional support options
variant('atomics', default=False, description='Enable built-in atomics')
variant('java', default=False, description='Build Java support') variant('java', default=False, description='Build Java support')
variant('static', default=True, description='Build static libraries')
variant('sqlite3', default=False, description='Build SQLite3 support') variant('sqlite3', default=False, description='Build SQLite3 support')
variant('vt', default=True, description='Build VampirTrace support') variant('vt', default=True, description='Build VampirTrace support')
variant('thread_multiple', default=False, variant('thread_multiple', default=False,
description='Enable MPI_THREAD_MULTIPLE support') description='Enable MPI_THREAD_MULTIPLE support')
variant('cuda', default=False, description='Enable CUDA support') variant('cuda', default=False, description='Enable CUDA support')
variant('pmi', default=False, description='Enable PMI support') variant('pmi', default=False, description='Enable PMI support')
variant('runpath', default=True, description='Enable wrapper runpath')
variant('cxx', default=False, description='Enable C++ MPI bindings') variant('cxx', default=False, description='Enable C++ MPI bindings')
variant('cxx_exceptions', default=False, description='Enable C++ Exception support') variant('cxx_exceptions', default=False, description='Enable C++ Exception support')
# Adding support to build a debug version of OpenMPI that activates # Adding support to build a debug version of OpenMPI that activates
@ -421,6 +424,11 @@ def configure_args(self):
'--with-wrapper-ldflags={0}'.format(' '.join(rpaths)) '--with-wrapper-ldflags={0}'.format(' '.join(rpaths))
]) ])
if '+atomics' in spec:
config_args.append('--enable-builtin-atomics')
else:
config_args.append('--disable-builtin-atomics')
# According to this comment on github: # According to this comment on github:
# #
# https://github.com/open-mpi/ompi/issues/4338#issuecomment-383982008 # https://github.com/open-mpi/ompi/issues/4338#issuecomment-383982008
@ -431,9 +439,14 @@ def configure_args(self):
if spec.satisfies('schedulers=slurm'): if spec.satisfies('schedulers=slurm'):
config_args.append('--with-pmi={0}'.format(spec['slurm'].prefix)) config_args.append('--with-pmi={0}'.format(spec['slurm'].prefix))
if spec.satisfies('@3.1.3:') or spec.satisfies('@3.0.3'): if spec.satisfies('@3.1.3:') or spec.satisfies('@3.0.3'):
config_args.append('--enable-static') if '+static' in spec:
config_args.append('--enable-static')
else: else:
config_args.append('--enable-static') if '+static' in spec:
config_args.append('--enable-static')
else:
config_args.append('--disable-static')
config_args.extend(self.with_or_without('pmi')) config_args.extend(self.with_or_without('pmi'))
if spec.satisfies('@3.0.0:', strict=True): if spec.satisfies('@3.0.0:', strict=True):
@ -533,6 +546,13 @@ def configure_args(self):
else: else:
config_args.append('--without-cuda') config_args.append('--without-cuda')
if '+runpath' in spec:
config_args.append('--enable-wrapper-rpath')
config_args.append('--enable-wrapper-runpath')
else:
config_args.append('--disable-wrapper-rpath')
config_args.append('--disable-wrapper-runpath')
if spec.satisfies('@:4'): if spec.satisfies('@:4'):
if '+cxx' in spec: if '+cxx' in spec:
config_args.append('--enable-mpi-cxx') config_args.append('--enable-mpi-cxx')