zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove experimental hdf5 versions 1.13.x and add hdf5 version 1.10.10. (#38013)

Browse Source 
* 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.
This commit is contained in:
Larry Knox 2023-06-15 22:41:39 -05:00 committed by GitHub
parent 1577eb9602
commit 2972d5847c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/hdf5-vfd-gds/package.py
View File

@ -27,7 +27,7 @@ class Hdf5VfdGds(CMakePackage, CudaPackage):
# system can obtaion via `find_library`. Packaging issues fixed in 11.7.1. # system can obtaion via `find_library`. Packaging issues fixed in 11.7.1.
conflicts("^cuda@:11.7.0") conflicts("^cuda@:11.7.0")
depends_on("cmake@3.12:", type="build") depends_on("cmake@3.12:", type="build")
depends_on("hdf5@1.13.0:") depends_on("hdf5@1.14.0:")
def cmake_args(self): def cmake_args(self):
# CMake options # CMake options

2
var/spack/repos/builtin/packages/hdf5-vol-cache/package.py
View File

@ -17,7 +17,7 @@ class Hdf5VolCache(CMakePackage):
version("v1.1", tag="v1.1") version("v1.1", tag="v1.1")
version("v1.0", tag="v1.0") 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") depends_on("hdf5-vol-async")
def setup_run_environment(self, env): def setup_run_environment(self, env):

4
var/spack/repos/builtin/packages/hdf5-vol-log/package.py
View File

@ -18,12 +18,8 @@ class Hdf5VolLog(AutotoolsPackage):
version("master-1.1", branch="master") version("master-1.1", branch="master")
version("1.4.0", tag="logvol.1.4.0") 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.14.0:", when="@1.4.0:")
depends_on("hdf5@1.13.2", when="@:1.3.0")
depends_on("autoconf", type="build") depends_on("autoconf", type="build")
depends_on("automake", type="build") depends_on("automake", type="build")
depends_on("libtool", type="build") depends_on("libtool", type="build")

10
var/spack/repos/builtin/packages/hdf5/package.py
View File

@ -40,11 +40,6 @@ class Hdf5(CMakePackage):
version("develop-1.8", branch="hdf5_1_8") version("develop-1.8", branch="hdf5_1_8")
# Odd versions are considered experimental releases # 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 # Even versions are maintenance versions
version( version(
"1.14.1-2", "1.14.1-2",
@ -71,6 +66,11 @@ class Hdf5(CMakePackage):
sha256="a62dcb276658cb78e6795dd29bf926ed7a9bc4edf6e77025cd2c689a8f97c17a", sha256="a62dcb276658cb78e6795dd29bf926ed7a9bc4edf6e77025cd2c689a8f97c17a",
preferred=True, preferred=True,
) )
version(
"1.10.10",
sha256="a6877ab7bd5d769d2d68618fdb54beb50263dcc2a8c157fe7e2186925cdb02db",
preferred=True,
)
version( version(
"1.10.9", "1.10.9",
sha256="f5b77f59b705a755a5a223372d0222c7bc408fe8db6fa8d9d7ecf8bce291b8dd", sha256="f5b77f59b705a755a5a223372d0222c7bc408fe8db6fa8d9d7ecf8bce291b8dd",

2
var/spack/repos/builtin/packages/hermes/package.py
View File

@ -30,7 +30,7 @@ class Hermes(CMakePackage):
depends_on("glpk") depends_on("glpk")
depends_on("glog@0.4.0:") depends_on("glog@0.4.0:")
depends_on("mpi") depends_on("mpi")
depends_on("hdf5@1.13.0:", when="+vfd") depends_on("hdf5@1.14.0:", when="+vfd")
depends_on("yaml-cpp") depends_on("yaml-cpp")
def cmake_args(self): def cmake_args(self):