From 7b877ec9e2df17b8cde4477306e23f2464e4cd42 Mon Sep 17 00:00:00 2001 From: Andrey Prokopenko Date: Mon, 21 Apr 2025 04:02:14 -0400 Subject: [PATCH] arborx: add version 2.0 (#50112) --- var/spack/repos/builtin/packages/arborx/package.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/arborx/package.py b/var/spack/repos/builtin/packages/arborx/package.py index cfd16f08166..cfccaca5d02 100644 --- a/var/spack/repos/builtin/packages/arborx/package.py +++ b/var/spack/repos/builtin/packages/arborx/package.py @@ -22,6 +22,7 @@ class Arborx(CMakePackage, CudaPackage, ROCmPackage): license("BSD-3-Clause") version("master", branch="master") + version("2.0", sha256="5ea6d8f832a69aac77d66c1ae55f96c2ff227272b8a6ba694c7ebcdf3a2413d5") version("1.7", sha256="e3d9a57a1d7c1ad62f6bbb43fd29a366506f3a16cbbe801c04d10f5fb0dec201") version("1.6", sha256="c2230de185d62f1999d36c6b8b92825f19ab9fbf30bdae90595cab04e76561a4") version("1.5", sha256="c26f23c17e749ccf3e2d353a68969aa54d31b8e720dbfdbc2cef16c5d8477e9e") @@ -40,12 +41,13 @@ class Arborx(CMakePackage, CudaPackage, ROCmPackage): # Allowed C++ standard variant( "cxxstd", - default="17", - values=("14", "17", "2a", "2b"), + default="20", + values=("14", "17", "20", "23"), multi=False, description="Use the specified C++ standard when building.", ) conflicts("cxxstd=14", when="@1.3:") + conflicts("cxxstd=17", when="@2.0:") # ArborX relies on Kokkos to provide devices, providing one-to-one matching # variants. The only way to disable those devices is to make sure Kokkos @@ -66,6 +68,7 @@ class Arborx(CMakePackage, CudaPackage, ROCmPackage): depends_on("cmake@3.12:", type="build") depends_on("cmake@3.16:", type="build", when="@1.0:") + depends_on("cmake@3.22:", type="build", when="@2.0:") depends_on("mpi", when="+mpi") depends_on("rocthrust", when="+rocm") patch("0001-update-major-version-required-for-rocm-6.0.patch", when="@:1.5+rocm ^hip@6.0:") @@ -77,7 +80,8 @@ class Arborx(CMakePackage, CudaPackage, ROCmPackage): depends_on("kokkos@3.7.01:", when="@1.4:1.4.1~trilinos") depends_on("kokkos@4.0.00:", when="@1.5~trilinos") depends_on("kokkos@4.1.00:", when="@1.6") - depends_on("kokkos@4.2.00:", when="@1.7:") + depends_on("kokkos@4.2.00:", when="@1.7") + depends_on("kokkos@4.5.00:", when="@2.0:") for backend in kokkos_backends: depends_on("kokkos+%s" % backend.lower(), when="~trilinos+%s" % backend.lower())