diff options
Diffstat (limited to 'var/spack/repos/builtin/packages/openmpi/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/openmpi/package.py | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 2925048d39..5eda1d0658 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -7,8 +7,6 @@ import os import sys -from spack import * - def _verbs_dir(): """Try to find the directory where the OpenFabrics verbs package is @@ -180,20 +178,17 @@ class Openmpi(AutotoolsPackage): patch('btl_vader.patch', when='@3.1.0:3.1.2') fabrics = ('psm', 'psm2', 'verbs', 'mxm', 'ucx', 'libfabric') - variant( - 'fabrics', - default=None if _verbs_dir() is None else 'verbs', + 'fabrics', values=auto_or_any_combination_of(*fabrics).with_default( + 'auto' if _verbs_dir() is None else 'verbs' + ), description="List of fabrics that are enabled", - values=fabrics, - multi=True ) + schedulers = ('alps', 'lsf', 'tm', 'slurm', 'sge', 'loadleveler') variant( - 'schedulers', - description='List of schedulers for which support is enabled', - values=('alps', 'lsf', 'tm', 'slurm', 'sge', 'loadleveler'), - multi=True + 'schedulers', values=auto_or_any_combination_of(*schedulers), + description='List of schedulers for which support is enabled' ) # Additional support options |