diff options
3 files changed, 21 insertions, 4 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml index eae204527c..2e10267f36 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml @@ -198,12 +198,12 @@ spack: # GPU - aml +ze - amrex +sycl - - arborx +sycl ^kokkos +sycl +openmp cxxstd=17 +tests +examples - - cabana +sycl ^kokkos +sycl +openmp cxxstd=17 +tests +examples + - arborx +sycl ^kokkos +sycl +openmp cxxstd=17 +examples + - cabana +sycl ^kokkos +sycl +openmp cxxstd=17 +examples - ginkgo +sycl - heffte +sycl - - kokkos +sycl +openmp cxxstd=17 +tests +examples - - kokkos-kernels build_type=Release %oneapi ^kokkos +sycl +openmp cxxstd=17 +tests +examples + - kokkos +sycl +openmp cxxstd=17 +examples + - kokkos-kernels build_type=Release %oneapi ^kokkos +sycl +openmp cxxstd=17 +examples - petsc +sycl - slate +sycl - sundials +sycl cxxstd=17 +examples-install diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py index 5eb7ce5cca..174e059c85 100644 --- a/var/spack/repos/builtin/packages/kokkos/package.py +++ b/var/spack/repos/builtin/packages/kokkos/package.py @@ -25,6 +25,7 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage): version("master", branch="master") version("develop", branch="develop") + version("4.2.00", sha256="ac08765848a0a6ac584a0a46cd12803f66dd2a2c2db99bb17c06ffc589bf5be8") version("4.1.00", sha256="cf725ea34ba766fdaf29c884cfe2daacfdc6dc2d6af84042d1c78d0f16866275") version("4.0.01", sha256="bb942de8afdd519fd6d5d3974706bfc22b6585a62dd565c12e53bdb82cd154f0") version("4.0.00", sha256="1829a423883d4b44223c7c3a53d3c51671145aad57d7d23e6a1a4bebf710dcf6") @@ -155,6 +156,7 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage): "gfx906": "vega906", "gfx908": "vega908", "gfx90a": "vega90A", + "gfx942": "amd_gfx942", "gfx1030": "navi1030", "gfx1100": "navi1100", } @@ -234,6 +236,7 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage): # Patches patch("hpx_profiling_fences.patch", when="@3.5.00 +hpx") + patch("sycl_bhalft_test.patch", when="@4.2.00 +sycl") variant("shared", default=True, description="Build shared libraries") diff --git a/var/spack/repos/builtin/packages/kokkos/sycl_bhalft_test.patch b/var/spack/repos/builtin/packages/kokkos/sycl_bhalft_test.patch new file mode 100644 index 0000000000..483bfc493a --- /dev/null +++ b/var/spack/repos/builtin/packages/kokkos/sycl_bhalft_test.patch @@ -0,0 +1,14 @@ +diff -ruN spack-src/core/unit_test/TestNumericTraits.hpp spack-src-patched/core/unit_test/TestNumericTraits.hpp +--- spack-src/core/unit_test/TestNumericTraits.hpp 2023-11-20 13:26:46.000000000 -0800 ++++ spack-src-patched/core/unit_test/TestNumericTraits.hpp 2023-11-28 12:06:44.216150685 -0800 +@@ -110,8 +110,8 @@ + + KOKKOS_FUNCTION void operator()(Epsilon, int, int& e) const { + using Kokkos::Experimental::epsilon; +- auto const eps = epsilon<T>::value; +- auto const one = T(1); ++ T const eps = epsilon<T>::value; ++ T const one = 1; + // Avoid higher precision intermediate representation + compare() = one + eps; + e += (int)!(compare() != one); |