summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Chevalier <cedric.chevalier@cea.fr>2024-12-03 17:09:25 +0100
committerGitHub <noreply@github.com>2024-12-03 09:09:25 -0700
commit09b7ea0400c44389c535e7ecc8a1a8a21c3bc0ec (patch)
tree0ba866c618f358a63354095148a2e474996b060a
parentb31dd46ab86bd237793e39a7a6c8c5b2a51f7c68 (diff)
downloadspack-09b7ea0400c44389c535e7ecc8a1a8a21c3bc0ec.tar.gz
spack-09b7ea0400c44389c535e7ecc8a1a8a21c3bc0ec.tar.bz2
spack-09b7ea0400c44389c535e7ecc8a1a8a21c3bc0ec.tar.xz
spack-09b7ea0400c44389c535e7ecc8a1a8a21c3bc0ec.zip
Bump Kokkos and Kokkos-kernels to 4.5.00 (#47809)
* Bump Kokkos and Kokkos-kernels to 4.5.00 * petsc@:3.22 add a conflict with this new version of kokkos * Update kokkos/kokkos-kernel dependency --------- Co-authored-by: Satish Balay <balay@mcs.anl.gov>
-rw-r--r--var/spack/repos/builtin/packages/kokkos-kernels/package.py3
-rw-r--r--var/spack/repos/builtin/packages/kokkos/package.py1
-rw-r--r--var/spack/repos/builtin/packages/petsc/package.py2
3 files changed, 6 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/kokkos-kernels/package.py b/var/spack/repos/builtin/packages/kokkos-kernels/package.py
index af6abf4c11..9993e8b5fe 100644
--- a/var/spack/repos/builtin/packages/kokkos-kernels/package.py
+++ b/var/spack/repos/builtin/packages/kokkos-kernels/package.py
@@ -23,6 +23,8 @@ class KokkosKernels(CMakePackage, CudaPackage):
version("develop", branch="develop")
version("master", branch="master")
+
+ version("4.5.00", sha256="94726a64e349adf6cd276e9fdc1b2bf7ff81efec833e479a5d3024b83f165a59")
version("4.4.01", sha256="4a32bc8330e0113856bdf181df94cc4f9902e3cebb5dc7cea5948f30df03bfa1")
version("4.4.00", sha256="66d5c3f728a8c7689159c97006996164ea00fd39702476220e3dbf2a05c49e8f")
@@ -132,6 +134,7 @@ class KokkosKernels(CMakePackage, CudaPackage):
depends_on("kokkos")
depends_on("kokkos@master", when="@master")
depends_on("kokkos@develop", when="@develop")
+ depends_on("kokkos@4.5.00", when="@4.5.00")
depends_on("kokkos@4.4.01", when="@4.4.01")
depends_on("kokkos@4.4.00", when="@4.4.00")
depends_on("kokkos@4.3.01", when="@4.3.01")
diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py
index 6492906ad7..6b58c7298a 100644
--- a/var/spack/repos/builtin/packages/kokkos/package.py
+++ b/var/spack/repos/builtin/packages/kokkos/package.py
@@ -29,6 +29,7 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage):
version("master", branch="master")
version("develop", branch="develop")
+ version("4.5.00", sha256="cbfb742feeb9e649db9eca0394e6ca9a22aa017a1e6aab8576990772a0e3135b")
version("4.4.01", sha256="3413f0cb39912128d91424ebd92e8832009e7eeaf6fa8da58e99b0d37860d972")
version("4.4.00", sha256="0b46372f38c48aa088411ac1b7c173a5c90f0fdb69ab40271827688fc134f58b")
diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py
index 43d6132a2c..da0e3d0be3 100644
--- a/var/spack/repos/builtin/packages/petsc/package.py
+++ b/var/spack/repos/builtin/packages/petsc/package.py
@@ -377,6 +377,8 @@ class Petsc(Package, CudaPackage, ROCmPackage):
depends_on("kokkos", when="+kokkos")
depends_on("kokkos~complex_align", when="+kokkos+complex")
depends_on("kokkos-kernels", when="+kokkos")
+ conflicts("kokkos@4.5:", when="@:3.22")
+ conflicts("kokkos-kernels@4.5:", when="@:3.22")
for cuda_arch in CudaPackage.cuda_arch_values:
depends_on(
"kokkos+cuda+cuda_lambda cuda_arch=%s" % cuda_arch,