From d8fa6eb559be914fc2d3c4fb4435e84ae8009e2a Mon Sep 17 00:00:00 2001 From: Mikael Simberg Date: Thu, 19 Dec 2024 12:17:39 +0100 Subject: [PATCH] hpx-kokkos: Add 0.4.1 (#48207) --- var/spack/repos/builtin/packages/hpx-kokkos/package.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/var/spack/repos/builtin/packages/hpx-kokkos/package.py b/var/spack/repos/builtin/packages/hpx-kokkos/package.py index c01af6c03f9..5e97d19bb67 100644 --- a/var/spack/repos/builtin/packages/hpx-kokkos/package.py +++ b/var/spack/repos/builtin/packages/hpx-kokkos/package.py @@ -19,6 +19,7 @@ class HpxKokkos(CMakePackage, CudaPackage, ROCmPackage): license("BSL-1.0") version("master", branch="master") + version("0.4.1", sha256="dd6153c8d626013e30537606f7a791e4f36969219337f41dad942351d7f33ffa") version("0.4.0", sha256="dafef55521cf4bf7ab28ebad546ea1d3fb83fac3a9932e292db4ab3666cd833f") version("0.3.0", sha256="83c1d11dab95552ad0abdae767c71f757811d7b51d82bd231653dc942e89a45d") version("0.2.0", sha256="289b711cea26afe80be002fc521234c9194cd0e8f69863f3b08b654674dbe5d5") @@ -49,6 +50,11 @@ class HpxKokkos(CMakePackage, CudaPackage, ROCmPackage): depends_on("hpx@1.8:", when="@0.3:") depends_on("kokkos@3.6:", when="@0.3:") + # Incompatibilities caused by https://github.com/STEllAR-GROUP/hpx/pull/6565 + # and https://github.com/kokkos/kokkos/pull/7156 fixed by + # https://github.com/STEllAR-GROUP/hpx-kokkos/pull/25 + conflicts("^hpx@1.11:", when="@:0.4.0") + conflicts("^kokkos@4.4:", when="@:0.4.0") depends_on("hpx@1.7", when="@0.2") depends_on("kokkos@3.6:", when="@0.2")