Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ jobs:
fail-fast: false
matrix:
rust: [stable]
version: ["1.8", "1.10", "1.12", "1.14"]
version: ["1.8", "1.10", "1.12", "1.14", "2.0.0"]
steps:
- name: Checkout repository
uses: actions/checkout@v6
Expand All @@ -226,28 +226,45 @@ jobs:
if [[ "${{matrix.version}}" == "1.8" ]]; then
VERSION=1.8.21
DL_PATH=hdf5-1.8.21-Std-win7_64-vs14.zip
BASE_URL=https://support.hdfgroup.org/ftp/HDF5/releases
echo "MSI_PATH=hdf\\HDF5-1.8.21-win64.msi" >> $GITHUB_ENV
DL_URL="$BASE_URL/hdf5-${{matrix.version}}/hdf5-$VERSION/bin/$DL_PATH"
C:/msys64/usr/bin/wget.exe -q -O hdf5.zip $DL_URL
7z x hdf5.zip -y
elif [[ "${{matrix.version}}" == "1.10" ]]; then
VERSION=1.10.0
DL_PATH=windows/extra/hdf5-1.10.0-win64-VS2015-shared.zip
BASE_URL=https://support.hdfgroup.org/ftp/HDF5/releases
echo "MSI_PATH=hdf5\\HDF5-1.10.0-win64.msi" >> $GITHUB_ENV
DL_URL="$BASE_URL/hdf5-${{matrix.version}}/hdf5-$VERSION/bin/$DL_PATH"
C:/msys64/usr/bin/wget.exe -q -O hdf5.zip $DL_URL
7z x hdf5.zip -y
elif [[ "${{matrix.version}}" == "1.12" ]]; then
VERSION=1.12.0
DL_PATH=hdf5-1.12.0-Std-win10_64-vs16.zip
BASE_URL=https://support.hdfgroup.org/ftp/HDF5/releases
echo "MSI_PATH=hdf\\HDF5-1.12.0-win64.msi" >> $GITHUB_ENV
else
DL_URL="$BASE_URL/hdf5-${{matrix.version}}/hdf5-$VERSION/bin/$DL_PATH"
C:/msys64/usr/bin/wget.exe -q -O hdf5.zip $DL_URL
7z x hdf5.zip -y
elif [[ "${{matrix.version}}" == "1.14" ]]; then
VERSION=1.14.0
DL_PATH=windows/hdf5-1.14.0-Std-win10_64-vs16.zip
BASE_URL=https://support.hdfgroup.org/ftp/HDF5/releases
echo "MSI_PATH=hdf\\HDF5-1.14.0-win64.msi" >> $GITHUB_ENV
DL_URL="$BASE_URL/hdf5-${{matrix.version}}/hdf5-$VERSION/bin/$DL_PATH"
C:/msys64/usr/bin/wget.exe -q -O hdf5.zip $DL_URL
7z x hdf5.zip -y
elif [[ "${{matrix.version}}" = "2.0.0" ]]; then
VERSION=2.0.0
echo "MSI_PATH=hdf5.msi" >> $GITHUB_ENV
DL_URL="https://github.com/HDFGroup/hdf5/releases/download/2.0.0/hdf5-2.0.0-win-vs2022_cl.msi"
C:/msys64/usr/bin/wget.exe -q -O hdf5.msi $DL_URL
fi
BASE_URL=https://support.hdfgroup.org/ftp/HDF5/releases
echo "DL_URL=$BASE_URL/hdf5-${{matrix.version}}/hdf5-$VERSION/bin/$DL_PATH" >> $GITHUB_ENV
echo "C:\\Program Files\\HDF_Group\\HDF5\\$VERSION\\bin" >> $GITHUB_PATH
- name: Install HDF5 (${{matrix.version}})
shell: pwsh
run: |
C:\msys64\usr\bin\wget.exe -q -O hdf5.zip ${{env.DL_URL}}
7z x hdf5.zip -y
msiexec /i ${{env.MSI_PATH}} /quiet /qn /norestart
- name: Build and test all crates
run: cargo test -vv
Expand Down
2 changes: 1 addition & 1 deletion hdf5-sys/src/h5fd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ mod globals_2_0_0 {
}

#[cfg(all(feature = "2.0.0", all(target_env = "msvc", not(feature = "static"))))]
mod globals {
mod globals_2_0_0 {
// dllimport hack
pub type id_t = usize;
extern_static!(H5FD_CORE, __imp_H5FD_CORE_id_g);
Expand Down
4 changes: 2 additions & 2 deletions hdf5-sys/src/h5p.rs
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ mod globals {

#[cfg(feature = "1.12.0")]
#[allow(clippy::module_inception)]
pub mod globals {
pub mod globals_1_12_0 {
use super::*;
extern_static!(H5P_MAP_CREATE, __imp_H5P_CLS_MAP_CREATE_ID_g);
extern_static!(H5P_MAP_ACCESS, __imp_H5P_CLS_MAP_ACCESS_ID_g);
Expand All @@ -242,7 +242,7 @@ mod globals {
extern_static!(H5P_REFERENCE_ACCESS_DEFAULT, __imp_H5P_LST_REFERENCE_ACCESS_ID_g);
}
#[cfg(feature = "1.12.0")]
pub use globals::*;
pub use globals_1_12_0::*;
}

extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion hdf5/src/globals.rs
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ pub static H5FD_MULTI: LazyLock<hid_t> = LazyLock::new(|| {

// MPI-IO file driver
#[cfg(all(feature = "2.0.0", all(feature = "have-parallel", feature = "mpio")))]
pub static H5FD_MPIO: LazyLock<hid_t> = LazyLock::new(|| *hdf5_sys::h5p::H5FD_MPIO_id);
pub static H5FD_MPIO: LazyLock<hid_t> = LazyLock::new(|| *hdf5_sys::h5fd::H5FD_MPIO_id);
#[cfg(all(feature = "2.0.0", not(all(feature = "have-parallel", feature = "mpio"))))]
pub static H5FD_MPIO: LazyLock<hid_t> = LazyLock::new(|| H5I_INVALID_HID);

Expand Down
Loading