Merge pull request #227 from mulimoen/feature/hdf5_1_14

Support hdf5 1.14.0

Author: aldanor

.github/workflows/ci.yml

@@ -58,7 +58,8 @@ jobs:
         include:
           - {version: [email protected]}
           - {version: [email protected]}
-          # - {version: hdf5-mpi, mpi: true}  # TODO: re-enable once 1.14 support is merged in
+          - {version: [email protected]}
+          - {version: hdf5-mpi, mpi: true}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -98,6 +99,9 @@ jobs:
           - {os: macos, version: 1.12.0, channel: conda-forge, rust: stable}
           - {os: windows, version: 1.12.0, channel: conda-forge, rust: stable}
           - {os: ubuntu, version: 1.12.1, channel: conda-forge, rust: stable}
+          - {os: macos, version: 1.14.0, channel: conda-forge, rust: stable}
+          - {os: windows, version: 1.14.0, channel: conda-forge, rust: stable}
+          - {os: ubuntu, version: 1.14.0, channel: conda-forge, rust: stable}
     defaults:
       run:
         shell: bash -l {0}
@@ -193,7 +197,7 @@ jobs:
       fail-fast: false
       matrix:
         rust: [stable]
-        version: ["1.8", "1.10", "1.12", "1.13"]
+        version: ["1.8", "1.10", "1.12", "1.14"]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -217,9 +221,9 @@ jobs:
             DL_PATH=hdf5-1.12.0-Std-win10_64-vs16.zip
             echo "MSI_PATH=hdf\\HDF5-1.12.0-win64.msi" >> $GITHUB_ENV
           else
-            VERSION=1.13.2
-            DL_PATH=windows/hdf5-1.13.2-Std-win10_64-vs16.zip
-            echo "MSI_PATH=hdf\\HDF5-1.13.2-win64.msi" >> $GITHUB_ENV
+            VERSION=1.14.0
+            DL_PATH=windows/hdf5-1.14.0-Std-win10_64-vs16.zip
+            echo "MSI_PATH=hdf\\HDF5-1.14.0-win64.msi" >> $GITHUB_ENV
           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

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Added
 
 - Support for HDF5 version 1.13.0.
+- Support for HDF5 version 1.14.0.
 - Support field renaming via `#[hdf5(rename = "new_name")]` helper attribute.
 - Add a `ByteReader` which implements `std::io::{Read, Seek}` for 1D `u8`
   datasets. Usage via `Dataset::as_byte_reader()`.

hdf5-sys/build.rs

@@ -29,7 +29,7 @@ impl Version {
     }
 
     pub fn parse(s: &str) -> Option<Self> {
-        let re = Regex::new(r"^(1)\.(8|10|12|13)\.(\d\d?)(_\d+)?(-patch\d+)?$").ok()?;
+        let re = Regex::new(r"^(1)\.(8|10|12|13|14)\.(\d\d?)(_\d+)?(-(patch)?\d+)?$").ok()?;
         let captures = re.captures(s)?;
         Some(Self {
             major: captures.get(1).and_then(|c| c.as_str().parse::<u8>().ok())?,
@@ -305,14 +305,15 @@ mod macos {
         }
         // We have to explicitly support homebrew since the HDF5 bottle isn't
         // packaged with pkg-config metadata.
-        let (v18, v110, v112) = if let Some(version) = config.version {
+        let (v18, v110, v112, v114) = if let Some(version) = config.version {
             (
                 version.major == 1 && version.minor == 8,
                 version.major == 1 && version.minor == 10,
                 version.major == 1 && version.minor == 12,
+                version.major == 1 && version.minor == 14,
             )
         } else {
-            (false, false, false)
+            (false, false, false, false)
         };
         println!(
             "Attempting to find HDF5 via Homebrew ({})...",
@@ -322,10 +323,19 @@ mod macos {
                 "1.10.*"
             } else if v112 {
                 "1.12.*"
+            } else if v114 {
+                "1.14.*"
             } else {
                 "any version"
             }
         );
+        if !(v18 || v110 || v112) {
+            if let Some(out) = run_command("brew", &["--prefix", "[email protected]"]) {
+                if is_root_dir(&out) {
+                    config.inc_dir = Some(PathBuf::from(out).join("include"));
+                }
+            }
+        }
         if !(v18 || v110) {
             if let Some(out) = run_command("brew", &["--prefix", "[email protected]"]) {
                 if is_root_dir(&out) {
@@ -611,8 +621,9 @@ impl Config {
         assert!(version >= Version::new(1, 8, 4), "required HDF5 version: >=1.8.4");
         let mut vs: Vec<_> = (5..=21).map(|v| Version::new(1, 8, v)).collect(); // 1.8.[5-21]
         vs.extend((0..=8).map(|v| Version::new(1, 10, v))); // 1.10.[0-8]
-        vs.extend((0..=1).map(|v| Version::new(1, 12, v))); // 1.12.[0-1]
+        vs.extend((0..=2).map(|v| Version::new(1, 12, v))); // 1.12.[0-2]
         vs.extend((0..=0).map(|v| Version::new(1, 13, v))); // 1.13.[0-0]
+        vs.extend((0..=0).map(|v| Version::new(1, 14, v))); // 1.14.[0-0]
         for v in vs.into_iter().filter(|&v| version >= v) {
             println!("cargo:rustc-cfg=feature=\"{}.{}.{}\"", v.major, v.minor, v.micro);
             println!("cargo:version_{}_{}_{}=1", v.major, v.minor, v.micro);

hdf5-sys/src/h5d.rs

@@ -291,9 +291,11 @@ extern "C" {
 pub type H5D_chunk_iter_op_t = Option<
     extern "C" fn(
         offset: *const hsize_t,
-        filter_mask: u32,
+        #[cfg(feature = "1.14.0")] filter_mask: c_uint,
+        #[cfg(not(feature = "1.14.0"))] filter_mask: u32,
         addr: haddr_t,
-        nbytes: u32,
+        #[cfg(not(feature = "1.14.0"))] nbytes: u32,
+        #[cfg(feature = "1.14.0")] size: hsize_t,
         op_data: *mut c_void,
     ) -> c_int,
 >;