summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorSatish Balay <balay@mcs.anl.gov>2024-12-02 13:44:37 -0600
committerGitHub <noreply@github.com>2024-12-02 11:44:37 -0800
commit839ed9447cd08d526b2d0fab81bf5b9628c75a9e (patch)
treea7059d84d421950abc63fd77d92e58e54b23ae5a /var
parent8e5a04098505d58d8b2997487a1893e7370926e2 (diff)
downloadspack-839ed9447cd08d526b2d0fab81bf5b9628c75a9e.tar.gz
spack-839ed9447cd08d526b2d0fab81bf5b9628c75a9e.tar.bz2
spack-839ed9447cd08d526b2d0fab81bf5b9628c75a9e.tar.xz
spack-839ed9447cd08d526b2d0fab81bf5b9628c75a9e.zip
trilinos@14.4.0 revert kokkos-kernel dependency - as this breaks builds (#47852)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/trilinos/package.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index 7966cb3e67..0339690085 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -418,7 +418,7 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage):
depends_on("kokkos-kernels@4.4.01", when="@master:")
depends_on("kokkos-kernels@4.3.01", when="@16")
depends_on("kokkos-kernels@4.2.01", when="@15.1:15")
- depends_on("kokkos-kernels@4.1.00", when="@14.4:15.0")
+ depends_on("kokkos-kernels@4.1.00", when="@15.0")
for a in CudaPackage.cuda_arch_values:
arch_str = f"+cuda cuda_arch={a}"
@@ -903,6 +903,7 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage):
# External Kokkos
if spec.satisfies("@14.4.0: +kokkos"):
options.append(define_tpl_enable("Kokkos"))
+ if spec.satisfies("@15.0: +kokkos"):
options.append(define_tpl_enable("KokkosKernels", True))
# MPI settings