From b659eac453427be807543468889ab289ed3f71ef Mon Sep 17 00:00:00 2001 From: G-Ragghianti <33492707+G-Ragghianti@users.noreply.github.com> Date: Tue, 19 Mar 2024 11:58:34 -0400 Subject: slate: add v2023.11.05 (#42913) * Updated version of slate * Added rocm version conflict * Added patch to fix openMP problem --- var/spack/repos/builtin/packages/slate/omp.patch | 20 ++++++++++++++++++++ var/spack/repos/builtin/packages/slate/package.py | 7 +++++++ 2 files changed, 27 insertions(+) create mode 100644 var/spack/repos/builtin/packages/slate/omp.patch diff --git a/var/spack/repos/builtin/packages/slate/omp.patch b/var/spack/repos/builtin/packages/slate/omp.patch new file mode 100644 index 0000000000..b4dab603d9 --- /dev/null +++ b/var/spack/repos/builtin/packages/slate/omp.patch @@ -0,0 +1,20 @@ +diff --git a/src/omptarget/device_util.hh b/src/omptarget/device_util.hh +index e7aa15c3..3968878d 100644 +--- a/src/omptarget/device_util.hh ++++ b/src/omptarget/device_util.hh +@@ -6,6 +6,8 @@ + #ifndef SLATE_OMPTARGET_UTIL_HH + #define SLATE_OMPTARGET_UTIL_HH + ++#ifdef SLATE_HAVE_OMPTARGET ++ + #include + + namespace slate { +@@ -157,4 +159,6 @@ inline double abs_val(std::complex x) + } // namespace device + } // namespace slate + ++#endif // SLATE_HAVE_OMPTARGET ++ + #endif // SLATE_OMPTARGET_UTIL_HH diff --git a/var/spack/repos/builtin/packages/slate/package.py b/var/spack/repos/builtin/packages/slate/package.py index 284a350624..de5ec795eb 100644 --- a/var/spack/repos/builtin/packages/slate/package.py +++ b/var/spack/repos/builtin/packages/slate/package.py @@ -26,6 +26,9 @@ class Slate(CMakePackage, CudaPackage, ROCmPackage): license("BSD-3-Clause") version("master", branch="master") + version( + "2023.11.05", sha256="d3d925adec137ef4b7d876b2d7d0f8f2ff9d8485fa4125454a42f5da4ac026f3" + ) version( "2023.08.25", sha256="0894d8669ed88358cc7c4cb7b77d8467336613245a7b843f3504e9224632ce0e" ) @@ -48,6 +51,8 @@ class Slate(CMakePackage, CudaPackage, ROCmPackage): "2020.10.00", sha256="ff58840cdbae2991d100dfbaf3ef2f133fc2f43fc05f207dc5e38a41137882ab" ) + patch("omp.patch", when="@2023.11.05") + variant( "mpi", default=True, description="Build with MPI support (without MPI is experimental)." ) @@ -77,6 +82,7 @@ class Slate(CMakePackage, CudaPackage, ROCmPackage): for val in ROCmPackage.amdgpu_targets: depends_on("blaspp +rocm amdgpu_target=%s" % val, when="amdgpu_target=%s" % val) depends_on("lapackpp +rocm amdgpu_target=%s" % val, when="amdgpu_target=%s" % val) + depends_on("lapackpp@2023.11.05:", when="@2023.11.05:") depends_on("lapackpp@2023.08.25:", when="@2023.08.25:") depends_on("lapackpp@2022.07.00:", when="@2022.07.00:") depends_on("lapackpp@2022.05.00:", when="@2022.05.00:") @@ -101,6 +107,7 @@ class Slate(CMakePackage, CudaPackage, ROCmPackage): conflicts("+rocm", when="+sycl", msg=backend_msg) conflicts("+cuda", when="+sycl", msg=backend_msg) conflicts("+sycl", when="@:2022.07.00", msg="SYCL support requires SLATE version 2023.08.25") + conflicts("^hip@5.6.0:", when="@:2023.08.25", msg="Incompatible version of HIP/ROCm") def cmake_args(self): spec = self.spec -- cgit v1.2.3-70-g09d2