summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorJake Koester <146987853+aperijake@users.noreply.github.com>2024-04-24 10:42:08 -0600
committerGitHub <noreply@github.com>2024-04-24 10:42:08 -0600
commit6c3218920f0e0c41947bb8abfb4e941f8553e451 (patch)
tree9bd4171eb71d6d58b65a2a0333bc12d2703c077b /var
parent02cc3ea005c7bda9478d0358a9fdf23873235d5e (diff)
downloadspack-6c3218920f0e0c41947bb8abfb4e941f8553e451.tar.gz
spack-6c3218920f0e0c41947bb8abfb4e941f8553e451.tar.bz2
spack-6c3218920f0e0c41947bb8abfb4e941f8553e451.tar.xz
spack-6c3218920f0e0c41947bb8abfb4e941f8553e451.zip
Trilinos: update kokkos dependency (#43785)
* fix so trilinos@master uses correct kokkos (@4.3.00) * Update var/spack/repos/builtin/packages/trilinos/package.py
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 0d08e0e2d7..acdacddc6d 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -400,7 +400,8 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage):
# ###################### Dependencies ##########################
# External Kokkos
- depends_on("kokkos@4.2.01", when="@15.1.0: +kokkos")
+ depends_on("kokkos@4.3.00", when="@master: +kokkos")
+ depends_on("kokkos@4.2.01", when="@15.1.0:15.1.1 +kokkos")
depends_on("kokkos@4.1.00", when="@14.4.0:15.0.0 +kokkos")
depends_on("kokkos +wrapper", when="trilinos@14.4.0: +kokkos +wrapper")