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

Only add hwloc to tpl/dep list for certain versions of Trilinos (#25071)

Browse Source
This commit is contained in:
Paul Kuberry 2021-07-24 05:20:51 -06:00 committed by GitHub
parent 0beb35e426
commit bb20cadd91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
var/spack/repos/builtin/packages/trilinos/package.py
View File

@ -613,14 +613,13 @@ def define_tpl_enable(cmake_var, spec_var=None):
# Enable TPLs based on whether they're in our spec, not whether they're # Enable TPLs based on whether they're in our spec, not whether they're
# variant names: packages/features should disable availability # variant names: packages/features should disable availability
for tpl_name, dep_name in [ tpl_dep_map = [
('ADIOS2', 'adios2'), ('ADIOS2', 'adios2'),
('BLAS', 'blas'), ('BLAS', 'blas'),
('Boost', 'boost'), ('Boost', 'boost'),
('CGNS', 'cgns'), ('CGNS', 'cgns'),
('HDF5', 'hdf5'), ('HDF5', 'hdf5'),
('HYPRE', 'hypre'), ('HYPRE', 'hypre'),
('HWLOC', 'hwloc'),
('LAPACK', 'lapack'), ('LAPACK', 'lapack'),
('Matio', 'matio'), ('Matio', 'matio'),
('METIS', 'metis'), ('METIS', 'metis'),
@ -629,7 +628,10 @@ def define_tpl_enable(cmake_var, spec_var=None):
('SuperLU', 'superlu'), ('SuperLU', 'superlu'),
('X11', 'libx11'), ('X11', 'libx11'),
('Zlib', 'zlib'), ('Zlib', 'zlib'),
]: ]
if spec.satisfies('@13:'):
tpl_dep_map.append(('HWLOC', 'hwloc'))
for tpl_name, dep_name in tpl_dep_map:
have_dep = (dep_name in spec) have_dep = (dep_name in spec)
options.append(define('TPL_ENABLE_' + tpl_name, have_dep)) options.append(define('TPL_ENABLE_' + tpl_name, have_dep))
if not have_dep: if not have_dep: