Skip to content

Commit a513966

Browse files
committed
checksum fix, zfp install layout fix
1 parent 569f795 commit a513966

3 files changed

Lines changed: 13 additions & 3 deletions

File tree

.github/workflows/build_conduit_win.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
run: |
2121
env build_conduit=false `
2222
enable_tests=OFF `
23+
enable_zfp=OFF `
2324
./scripts/build_conduit/build_conduit.sh
2425
- name: Configure Conduit
2526
run: |

scripts/build_conduit/build_conduit.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -759,8 +759,15 @@ fi
759759

760760
echo "**** Configuring H5Z-ZFP ${h5zzfp_version}"
761761

762-
HDF5_DIR=${hdf5_install_dir} \
763-
ZFP_DIR=${zfp_install_dir}/lib/cmake/zfp/ \
762+
# depending on the system zfp may use lib or lib64 pattern:
763+
if [ ! -d ${zfp_install_dir}/lib64/cmake/zfp/ ]; then
764+
zfp_cmake_dir=${zfp_install_dir}/lib64/cmake/zfp/
765+
else
766+
zfp_cmake_dir=${zfp_install_dir}/lib/cmake/zfp/
767+
fi
768+
769+
HDF5_DIR=${hdf5_install_dir} \
770+
ZFP_DIR=${zfp_cmake_dir} \
764771
cmake -S ${h5zzfp_src_dir} -B ${h5zzfp_build_dir} ${cmake_compiler_settings} \
765772
-DCMAKE_VERBOSE_MAKEFILE:BOOL=${enable_verbose} \
766773
-DCMAKE_BUILD_TYPE=${build_config} \

scripts/uberenv_configs/packages/hdf5/package.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,12 @@ class Hdf5(CMakePackage):
3939
version("develop-1.10", branch="hdf5_1_10")
4040
version("develop-1.8", branch="hdf5_1_8")
4141

42+
# note: there is a checksum mismatch between 2.0 github release and hdf5 group web tarballs
43+
# use github tarball b/c it matches the published shasum
4244
version(
4345
"2.0.0",
4446
sha256="f4c2edc5668fb846627182708dbe1e16c60c467e63177a75b0b9f12c19d7efed",
45-
url="https://support.hdfgroup.org/releases/hdf5/v2_0/v2_0_0/downloads/hdf5-2.0.0.tar.gz"
47+
url="https://github.com/HDFGroup/hdf5/releases/download/2.0.0/hdf5-2.0.0.tar.gz"
4648
)
4749
# Odd versions are considered experimental releases
4850
# Even versions are maintenance versions

0 commit comments

Comments
 (0)