From d37749cedd3ac76d6160c3d98ed42630d789cca7 Mon Sep 17 00:00:00 2001 From: Mikael Simberg Date: Thu, 5 Sep 2024 14:12:21 +0200 Subject: pika: Add 0.28.0 (#46207) * pika: Add 0.28.0 * Add conflict between pika 0.28.0 and dla-future --- var/spack/repos/builtin/packages/dla-future/package.py | 1 + var/spack/repos/builtin/packages/pika/package.py | 3 +++ 2 files changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dla-future/package.py b/var/spack/repos/builtin/packages/dla-future/package.py index d889351324..078779411e 100644 --- a/var/spack/repos/builtin/packages/dla-future/package.py +++ b/var/spack/repos/builtin/packages/dla-future/package.py @@ -88,6 +88,7 @@ class DlaFuture(CMakePackage, CudaPackage, ROCmPackage): depends_on("pika@0.17:", when="@0.2.1") 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-algorithms@0.1:", when="@:0.2") depends_on("pika +mpi") depends_on("pika +cuda", when="+cuda") diff --git a/var/spack/repos/builtin/packages/pika/package.py b/var/spack/repos/builtin/packages/pika/package.py index 3739ff9cca..466212e1c6 100644 --- a/var/spack/repos/builtin/packages/pika/package.py +++ b/var/spack/repos/builtin/packages/pika/package.py @@ -19,6 +19,7 @@ class Pika(CMakePackage, CudaPackage, ROCmPackage): license("BSL-1.0") + version("0.28.0", sha256="a64ebac04135c0c8d392ddcd8d683fe02e2c0782abfe130754244d58f27ae6cf") version("0.27.0", sha256="4a58dc4014edc2074399e4a6ecfa244537c89ce1319b3e14ff3dfe617fb9f9e8") version("0.26.1", sha256="d7cc842238754019abdb536e22325e9a57186cd2ac8cc9c7140a5385f9d730f6") version("0.26.0", sha256="bbec5472c71006c1f55e7946c8dc517dae76c41cacb36fa98195312c74a1bb9a") @@ -127,6 +128,8 @@ class Pika(CMakePackage, CudaPackage, ROCmPackage): conflicts("^fmt@10:", when="@:0.15 +rocm") depends_on("spdlog@1.9.2:", when="@0.25:") depends_on("hwloc@1.11.5:") + # https://github.com/pika-org/pika/issues/1223 + conflicts("^hwloc@2.11:", when="@:0.27 target=aarch64:") depends_on("gperftools", when="malloc=tcmalloc") depends_on("jemalloc", when="malloc=jemalloc") -- cgit v1.2.3-70-g09d2