From 839ed9447cd08d526b2d0fab81bf5b9628c75a9e Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Mon, 2 Dec 2024 13:44:37 -0600 Subject: trilinos@14.4.0 revert kokkos-kernel dependency - as this breaks builds (#47852) --- var/spack/repos/builtin/packages/trilinos/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') 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 -- cgit v1.2.3-70-g09d2