diff --git a/var/spack/repos/builtin/packages/dla-future/package.py b/var/spack/repos/builtin/packages/dla-future/package.py index c831dd1f671..9ab2883ad35 100644 --- a/var/spack/repos/builtin/packages/dla-future/package.py +++ b/var/spack/repos/builtin/packages/dla-future/package.py @@ -16,6 +16,7 @@ class DlaFuture(CMakePackage, CudaPackage, ROCmPackage): license("BSD-3-Clause") + version("0.7.0", sha256="40a62bc70b0a06246a16348ce6701ccfab1f0c1ace99684de4bfc6c90776f8c6") version("0.6.0", sha256="85dfcee36ff28fa44da3134408c40ebd611bccff8a295982a7c78eaf982524d9") version("0.5.0", sha256="f964ee2a96bb58b3f0ee4563ae65fcd136e409a7c0e66beda33f926fc9515a8e") version("0.4.1", sha256="ba95f26475ad68da1f3a24d091dc1b925525e269e4c83c1eaf1d37d29b526666") @@ -70,7 +71,13 @@ class DlaFuture(CMakePackage, CudaPackage, ROCmPackage): depends_on("blas") depends_on("lapack") depends_on("scalapack", when="+scalapack") + depends_on("blaspp@2022.05.00:") + + # see https://github.com/eth-cscs/DLA-Future/pull/1181 + depends_on("blaspp@2024.05.31:", when="@0.6.1:") + conflicts("^blaspp@2025.05:", when="@:0.6.0") + depends_on("lapackpp@2022.05.00:") depends_on("intel-oneapi-mkl +cluster", when="^[virtuals=scalapack] intel-oneapi-mkl") @@ -89,12 +96,15 @@ class DlaFuture(CMakePackage, CudaPackage, ROCmPackage): depends_on("pika@0.18:", when="@0.3") depends_on("pika@0.19.1:", when="@0.4.0:") conflicts("^pika@0.28:", when="@:0.6") + depends_on("pika@0.30:", when="@0.7.0:") depends_on("pika-algorithms@0.1:", when="@:0.2") depends_on("pika +mpi") depends_on("pika +cuda", when="+cuda") depends_on("pika +rocm", when="+rocm") - conflicts("^pika cxxstd=20", when="+cuda") + for cxxstd in ("20", "23"): + conflicts(f"^pika cxxstd={cxxstd}", when="@:0.6 +cuda ^pika@:0.29") + conflicts("^pika +stdexec", when="@:0.6 +cuda") depends_on("whip +cuda", when="+cuda") depends_on("whip +rocm", when="+rocm") @@ -149,7 +159,7 @@ class DlaFuture(CMakePackage, CudaPackage, ROCmPackage): when="@:0.3 %gcc@13:", ) # https://github.com/spack/spack/issues/41511 - patch("hip_complex_operator_overloads.patch", when="+rocm") + patch("hip_complex_operator_overloads.patch", when="@:0.6 +rocm") def cmake_args(self): spec = self.spec