diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2023-06-15 22:41:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-15 22:41:39 -0500 |
| commit | 2972d5847c6b1f21f29b888ded99fa642f9a2fce (patch) | |
| tree | 4e8292d85fbdfb21a4446e33091d69f223b59c3b | |
| parent | 1577eb96022e8db57465cdac27125f639a504c57 (diff) | |
| download | spack-2972d5847c6b1f21f29b888ded99fa642f9a2fce.tar.gz spack-2972d5847c6b1f21f29b888ded99fa642f9a2fce.tar.bz2 spack-2972d5847c6b1f21f29b888ded99fa642f9a2fce.tar.xz spack-2972d5847c6b1f21f29b888ded99fa642f9a2fce.zip | |
Remove experimental hdf5 versions 1.13.x and add hdf5 version 1.10.10. (#38013)
* Remove experimental hdf5 versions 1.13.x.
Upgrade to 1.14 or remove dependencies on hdf5 1.13.x.
* Revert change to netcdf-c/package.py.
5 files changed, 8 insertions, 12 deletions
diff --git a/var/spack/repos/builtin/packages/hdf5-vfd-gds/package.py b/var/spack/repos/builtin/packages/hdf5-vfd-gds/package.py index 4d09d3d453..8bcefb47dc 100644 --- a/var/spack/repos/builtin/packages/hdf5-vfd-gds/package.py +++ b/var/spack/repos/builtin/packages/hdf5-vfd-gds/package.py @@ -27,7 +27,7 @@ class Hdf5VfdGds(CMakePackage, CudaPackage): # system can obtaion via `find_library`. Packaging issues fixed in 11.7.1. conflicts("^cuda@:11.7.0") depends_on("cmake@3.12:", type="build") - depends_on("hdf5@1.13.0:") + depends_on("hdf5@1.14.0:") def cmake_args(self): # CMake options diff --git a/var/spack/repos/builtin/packages/hdf5-vol-cache/package.py b/var/spack/repos/builtin/packages/hdf5-vol-cache/package.py index 39ff9d71ca..8417555879 100644 --- a/var/spack/repos/builtin/packages/hdf5-vol-cache/package.py +++ b/var/spack/repos/builtin/packages/hdf5-vol-cache/package.py @@ -17,7 +17,7 @@ class Hdf5VolCache(CMakePackage): version("v1.1", tag="v1.1") version("v1.0", tag="v1.0") - depends_on("hdf5@1.13: +mpi +threadsafe") + depends_on("hdf5@1.14: +mpi +threadsafe") depends_on("hdf5-vol-async") def setup_run_environment(self, env): diff --git a/var/spack/repos/builtin/packages/hdf5-vol-log/package.py b/var/spack/repos/builtin/packages/hdf5-vol-log/package.py index 6a5216db51..d36910a195 100644 --- a/var/spack/repos/builtin/packages/hdf5-vol-log/package.py +++ b/var/spack/repos/builtin/packages/hdf5-vol-log/package.py @@ -18,12 +18,8 @@ class Hdf5VolLog(AutotoolsPackage): version("master-1.1", branch="master") version("1.4.0", tag="logvol.1.4.0") - version("1.3.0", tag="logvol.1.3.0") - version("1.2.0", tag="logvol.1.2.0") - version("1.1.0", tag="logvol.1.1.0") depends_on("hdf5@1.14.0:", when="@1.4.0:") - depends_on("hdf5@1.13.2", when="@:1.3.0") depends_on("autoconf", type="build") depends_on("automake", type="build") depends_on("libtool", type="build") diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index 4d180c1bc7..1a48d47158 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -40,11 +40,6 @@ class Hdf5(CMakePackage): version("develop-1.8", branch="hdf5_1_8") # Odd versions are considered experimental releases - # Note: These are still required to build some VOL adapters, but even releases should be - # preferred. - version("1.13.3", sha256="83c7c06671f975cee6944b0b217f95005faa55f79ea5532cf4ac268989866af4") - version("1.13.2", sha256="01643fa5b37dba7be7c4db6bbf3c5d07adf5c1fa17dbfaaa632a279b1b2f06da") - # Even versions are maintenance versions version( "1.14.1-2", @@ -72,6 +67,11 @@ class Hdf5(CMakePackage): preferred=True, ) version( + "1.10.10", + sha256="a6877ab7bd5d769d2d68618fdb54beb50263dcc2a8c157fe7e2186925cdb02db", + preferred=True, + ) + version( "1.10.9", sha256="f5b77f59b705a755a5a223372d0222c7bc408fe8db6fa8d9d7ecf8bce291b8dd", preferred=True, diff --git a/var/spack/repos/builtin/packages/hermes/package.py b/var/spack/repos/builtin/packages/hermes/package.py index 18c00992f1..698e412bb4 100644 --- a/var/spack/repos/builtin/packages/hermes/package.py +++ b/var/spack/repos/builtin/packages/hermes/package.py @@ -30,7 +30,7 @@ class Hermes(CMakePackage): depends_on("glpk") depends_on("glog@0.4.0:") depends_on("mpi") - depends_on("hdf5@1.13.0:", when="+vfd") + depends_on("hdf5@1.14.0:", when="+vfd") depends_on("yaml-cpp") def cmake_args(self): |