From 12a0738030ef1788a653ea68ba3f7c7c135c7036 Mon Sep 17 00:00:00 2001 From: "Seth R. Johnson" Date: Wed, 3 Nov 2021 14:38:03 -0400 Subject: 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 --- var/spack/repos/builtin/packages/trilinos/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 3799ba05eb..3b03b9dc37 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -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 @@ class Trilinos(CMakePackage, CudaPackage): ('BLAS', 'blas'), ('Boost', 'boost'), ('CGNS', 'cgns'), + ('CUDA', 'cuda'), ('HDF5', 'hdf5'), ('HYPRE', 'hypre'), ('LAPACK', 'lapack'), @@ -686,7 +690,6 @@ class Trilinos(CMakePackage, CudaPackage): ]) 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') -- cgit v1.2.3-60-g2f50