trilinos: mark conflicts in @:13.1+tpetra^cuda@11 (#27188)
* trilinos: fix @13.0.1+tpetra^cuda@11 * Mark CUDA conflict with old versions and always define TPL * trilinos: patch doesn't build so just mark as conflict
This commit is contained in:
parent
e5a9beed28
commit
12a0738030
1 changed files with 4 additions and 1 deletions
|
@ -275,6 +275,9 @@ class Trilinos(CMakePackage, CudaPackage):
|
|||
conflicts('+wrapper', when='~cuda')
|
||||
conflicts('+wrapper', when='%clang')
|
||||
|
||||
# Old trilinos fails with new CUDA (see #27180)
|
||||
conflicts('@:13.0.1 +cuda', when='^cuda@11:')
|
||||
|
||||
# stokhos fails on xl/xl_r
|
||||
conflicts('+stokhos', when='%xl')
|
||||
conflicts('+stokhos', when='%xl_r')
|
||||
|
@ -560,6 +563,7 @@ def define_enable(suffix, value=None):
|
|||
('BLAS', 'blas'),
|
||||
('Boost', 'boost'),
|
||||
('CGNS', 'cgns'),
|
||||
('CUDA', 'cuda'),
|
||||
('HDF5', 'hdf5'),
|
||||
('HYPRE', 'hypre'),
|
||||
('LAPACK', 'lapack'),
|
||||
|
@ -686,7 +690,6 @@ def define_enable(suffix, value=None):
|
|||
])
|
||||
if '+cuda' in spec:
|
||||
options.extend([
|
||||
define_tpl_enable('CUDA', True),
|
||||
define_kok_enable('CUDA_UVM', True),
|
||||
define_kok_enable('CUDA_LAMBDA', True),
|
||||
define_kok_enable('CUDA_RELOCATABLE_DEVICE_CODE', 'cuda_rdc')
|
||||
|
|
Loading…
Reference in a new issue