diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py index 5cf3376f0d5..181645d9d5d 100644 --- a/var/spack/repos/builtin/packages/caliper/package.py +++ b/var/spack/repos/builtin/packages/caliper/package.py @@ -18,7 +18,7 @@ class Caliper(CachedCMakePackage, CudaPackage, ROCmPackage): homepage = "https://github.com/LLNL/Caliper" git = "https://github.com/LLNL/Caliper.git" - url = "https://github.com/LLNL/Caliper/archive/v2.11.0.tar.gz" + url = "https://github.com/LLNL/Caliper/archive/v2.12.1.tar.gz" tags = ["e4s", "radiuss"] maintainers("daboehme", "adrienbernede") @@ -28,11 +28,16 @@ class Caliper(CachedCMakePackage, CudaPackage, ROCmPackage): license("BSD-3-Clause") version("master", branch="master") + version("2.12.1", sha256="2b5a8f98382c94dc75cc3f4517c758eaf9a3f9cea0a8dbdc7b38506060d6955c") version("2.11.0", sha256="b86b733cbb73495d5f3fe06e6a9885ec77365c8aa9195e7654581180adc2217c") version("2.10.0", sha256="14c4fb5edd5e67808d581523b4f8f05ace8549698c0e90d84b53171a77f58565") version("2.9.1", sha256="4771d630de505eff9227e0ec498d0da33ae6f9c34df23cb201b56181b8759e9e") version("2.9.0", sha256="507ea74be64a2dfd111b292c24c4f55f459257528ba51a5242313fa50978371f") - version("2.8.0", sha256="17807b364b5ac4b05997ead41bd173e773f9a26ff573ff2fe61e0e70eab496e4") + version( + "2.8.0", + sha256="17807b364b5ac4b05997ead41bd173e773f9a26ff573ff2fe61e0e70eab496e4", + deprecated=True, + ) version( "2.7.0", sha256="b3bf290ec2692284c6b4f54cc0c507b5700c536571d3e1a66e56626618024b2b", @@ -102,9 +107,7 @@ class Caliper(CachedCMakePackage, CudaPackage, ROCmPackage): variant("kokkos", default=True, when="@2.3.0:", description="Enable Kokkos profiling support") variant("tests", default=False, description="Enable tests") variant("tools", default=True, description="Enable tools") - - # TODO change the 'when' argument for the next release of Caliper - variant("python", default=False, when="@master", description="Build Python bindings") + variant("python", default=False, when="@v2.12:", description="Build Python bindings") depends_on("adiak@0.1:0", when="@2.2:2.10 +adiak") depends_on("adiak@0.4:0", when="@2.11: +adiak") @@ -129,13 +132,13 @@ class Caliper(CachedCMakePackage, CudaPackage, ROCmPackage): depends_on("py-pybind11", when="+python", type=("build", "link", "run")) # sosflow support not yet in 2.0 - conflicts("+sosflow", "@2.0.0:2.11") + conflicts("+sosflow", "@2:") conflicts("+adiak", "@:2.1") conflicts("+libdw", "@:2.4") conflicts("+rocm", "@:2.7") conflicts("+rocm+cuda") - patch("for_aarch64.patch", when="target=aarch64:") + patch("for_aarch64.patch", when="@:2.11 target=aarch64:") patch( "sampler-service-missing-libunwind-include-dir.patch", when="@2.9.0:2.9.1 +libunwind +sampler",