summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVicente Bolea <vicente.bolea@kitware.com>2024-10-31 21:21:25 -0400
committerGitHub <noreply@github.com>2024-11-01 02:21:25 +0100
commit76ed4578e7e2ecb4f87cbf1c9f0967651059dd3a (patch)
tree4664c827ceb8b44b219298b82472bba885af0332
parent504cc808d642a969d0e13242b505e6f8430a594f (diff)
downloadspack-76ed4578e7e2ecb4f87cbf1c9f0967651059dd3a.tar.gz
spack-76ed4578e7e2ecb4f87cbf1c9f0967651059dd3a.tar.bz2
spack-76ed4578e7e2ecb4f87cbf1c9f0967651059dd3a.tar.xz
spack-76ed4578e7e2ecb4f87cbf1c9f0967651059dd3a.zip
adios2: add v2.10.2 release and fix build of older versions (#47235)
Co-authored-by: Bernhard Kaindl <bernhardkaindl7@gmail.com>
-rw-r--r--var/spack/repos/builtin/packages/adios2/package.py22
1 files changed, 11 insertions, 11 deletions
diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py
index 6083c1ff8a..41e80d615d 100644
--- a/var/spack/repos/builtin/packages/adios2/package.py
+++ b/var/spack/repos/builtin/packages/adios2/package.py
@@ -26,10 +26,11 @@ class Adios2(CMakePackage, CudaPackage, ROCmPackage):
version("master", branch="master")
version(
- "2.10.1",
- sha256="ce776f3a451994f4979c6bd6d946917a749290a37b7433c0254759b02695ad85",
+ "2.10.2",
+ sha256="14cf0bcd94772194bce0f2c0e74dba187965d1cffd12d45f801c32929158579e",
preferred=True,
)
+ version("2.10.1", sha256="ce776f3a451994f4979c6bd6d946917a749290a37b7433c0254759b02695ad85")
version("2.10.0", sha256="e5984de488bda546553dd2f46f047e539333891e63b9fe73944782ba6c2d95e4")
version("2.9.2", sha256="78309297c82a95ee38ed3224c98b93d330128c753a43893f63bbe969320e4979")
version("2.9.1", sha256="ddfa32c14494250ee8a48ef1c97a1bf6442c15484bbbd4669228a0f90242f4f9")
@@ -39,11 +40,10 @@ class Adios2(CMakePackage, CudaPackage, ROCmPackage):
version("2.8.1", sha256="3f515b442bbd52e3189866b121613fe3b59edb8845692ea86fad83d1eba35d93")
version("2.8.0", sha256="5af3d950e616989133955c2430bd09bcf6bad3a04cf62317b401eaf6e7c2d479")
version("2.7.1", sha256="c8e237fd51f49d8a62a0660db12b72ea5067512aa7970f3fcf80b70e3f87ca3e")
- version("2.7.0", sha256="4b5df1a1f92d7ff380416dec7511cfcfe3dc44da27e486ed63c3e6cffb173924")
- version("2.6.0", sha256="45b41889065f8b840725928db092848b8a8b8d1bfae1b92e72f8868d1c76216c")
- version("2.5.0", sha256="7c8ff3bf5441dd662806df9650c56a669359cb0185ea232ecb3578de7b065329")
- version("2.4.0", sha256="50ecea04b1e41c88835b4b3fd4e7bf0a0a2a3129855c9cc4ba6cf6a1575106e2")
- version("2.3.1", sha256="3bf81ccc20a7f2715935349336a76ba4c8402355e1dc3848fcd6f4c3c5931893")
+ with default_args(deprecated=True):
+ version("2.7.0", sha256="4b5df1a1f92d7ff380416dec7511cfcfe3dc44da27e486ed63c3e6cffb173924")
+ version("2.6.0", sha256="45b41889065f8b840725928db092848b8a8b8d1bfae1b92e72f8868d1c76216c")
+ version("2.5.0", sha256="7c8ff3bf5441dd662806df9650c56a669359cb0185ea232ecb3578de7b065329")
depends_on("c", type="build")
depends_on("cxx", type="build")
@@ -76,7 +76,7 @@ class Adios2(CMakePackage, CudaPackage, ROCmPackage):
variant("bzip2", default=True, when="@2.4:", description="Enable BZip2 compression")
variant("zfp", default=True, description="Enable ZFP compression")
variant("png", default=True, when="@2.4:", description="Enable PNG compression")
- variant("sz", default=True, description="Enable SZ compression")
+ variant("sz", default=True, when="@2.6:", description="Enable SZ compression")
variant("mgard", default=True, when="@2.8:", description="Enable MGARD compression")
# Rransport engines
@@ -214,7 +214,7 @@ class Adios2(CMakePackage, CudaPackage, ROCmPackage):
# Fix an unnecessary python dependency when testing is disabled
# See https://github.com/ornladios/ADIOS2/pull/2596
- patch("2.7-fix-python-test-deps.patch", when="@2.5.0:2.7.0")
+ patch("2.7-fix-python-test-deps.patch", when="@2.7.0")
# Fix unresolved symbols when built with gcc10.
# See https://github.com/ornladios/ADIOS2/pull/2714
@@ -227,7 +227,7 @@ class Adios2(CMakePackage, CudaPackage, ROCmPackage):
# https://github.com/ornladios/adios2/pull/2710
patch(
"https://github.com/ornladios/adios2/pull/2710.patch?full_index=1",
- when="@:2.7.1",
+ when="@2.5:2.7.1",
sha256="8221073d1b2f8944395a88a5d60a15c7370646b62f5fc6309867bbb6a8c2096c",
)
@@ -241,7 +241,7 @@ class Adios2(CMakePackage, CudaPackage, ROCmPackage):
# ROCM: enable support for rocm >= 6
# https://github.com/ornladios/ADIOS2/pull/4214
- patch("2.10-enable-rocm6.patch", when="@2.9.1:")
+ patch("2.10-enable-rocm6.patch", when="@2.9.1:2.10.1")
@when("%fj")
def patch(self):