Merge pull request #184 from mulimoen/feature/hdf5-1_12_1

Add support for hdf5 1.12.1

Author: mulimoen

.github/workflows/ci.yml

@@ -94,9 +94,11 @@ jobs:
           - {os: macos, version: 1.10.5, mpi: openmpi, channel: conda-forge, rust: beta}
           - {os: ubuntu, version: 1.10.6, channel: anaconda, rust: stable}
           - {os: ubuntu, version: 1.10.6, mpi: mpich, channel: conda-forge, rust: nightly}
+          # - {os: ubuntu, version: 1.10.8, channel: conda-forge, rust: stable}
           - {os: ubuntu, version: 1.12.0, mpi: openmpi, channel: conda-forge, rust: stable}
           - {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}
     defaults:
       run:
         shell: bash -l {0}

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - `Error` now implements `From<Infallible>`, which allows passing convertible
   extents (like tuples of integers) where `impl TryInto<Extents>` is required.
+- Support for HDF5 versions 1.12.1 and 1.10.8.
 
 ## 0.8.0
 

hdf5-sys/build.rs

@@ -613,8 +613,8 @@ impl Config {
         let version = self.header.version;
         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..=7).map(|v| Version::new(1, 10, v))); // 1.10.[0-7]
-        vs.push(Version::new(1, 12, 0)); // 1.12.0
+        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]
         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/h5.rs

@@ -87,7 +87,7 @@ extern "C" {
     pub fn H5is_library_threadsafe(is_ts: *mut hbool_t) -> herr_t;
 }
 
-#[cfg(all(feature = "1.10.7", not(feature = "1.12.0")))]
+#[cfg(any(all(feature = "1.10.7", not(feature = "1.12.0")), feature = "1.12.1"))]
 #[repr(C)]
 pub struct H5_alloc_stats_t {
     total_alloc_bytes: c_ulonglong,
@@ -99,7 +99,7 @@ pub struct H5_alloc_stats_t {
     peak_alloc_blocks_count: size_t,
 }
 
-#[cfg(all(feature = "1.10.7", not(feature = "1.12.0")))]
+#[cfg(any(all(feature = "1.10.7", not(feature = "1.12.0")), feature = "1.12.1"))]
 extern "C" {
     pub fn H5get_alloc_stats(stats: *mut H5_alloc_stats_t) -> herr_t;
     pub fn H5get_free_list_sizes(

hdf5-sys/src/h5e.rs

@@ -289,6 +289,12 @@ mod globals {
     extern_static!(H5E_CANTREMOVE, H5E_CANTREMOVE_g);
     extern_static!(H5E_CANTCONVERT, H5E_CANTCONVERT_g);
     extern_static!(H5E_BADSIZE, H5E_BADSIZE_g);
+    #[cfg(feature = "1.12.1")]
+    extern_static!(H5E_CANTLOCKFILE, H5E_CANTLOCKFILE_g);
+    #[cfg(feature = "1.12.1")]
+    extern_static!(H5E_CANTUNLOCKFILE, H5E_CANTUNLOCKFILE_g);
+    #[cfg(feature = "1.12.1")]
+    extern_static!(H5E_LIB, H5E_LIB_g);
 }
 
 #[cfg(all(target_env = "msvc", not(feature = "static")))]
@@ -447,4 +453,10 @@ mod globals {
     extern_static!(H5E_CANTREMOVE, __imp_H5E_CANTREMOVE_g);
     extern_static!(H5E_CANTCONVERT, __imp_H5E_CANTCONVERT_g);
     extern_static!(H5E_BADSIZE, __imp_H5E_BADSIZE_g);
+    #[cfg(feature = "1.12.1")]
+    extern_static!(H5E_CANTLOCKFILE, __imp_H5E_CANTLOCKFILE_g);
+    #[cfg(feature = "1.12.1")]
+    extern_static!(H5E_CANTUNLOCKFILE, __imp_H5E_CANTUNLOCKFILE_g);
+    #[cfg(feature = "1.12.1")]
+    extern_static!(H5E_LIB, __imp_H5E_LIB_g);
 }

hdf5-sys/src/h5fd.rs

@@ -417,7 +417,7 @@ pub mod ros3 {
     }
 }
 
-#[cfg(all(feature = "1.10.7", not(feature = "1.12.0")))]
+#[cfg(any(all(feature = "1.10.7", not(feature = "1.12.0")), feature = "1.12.1"))]
 pub mod splitter {
     use super::*;
 

hdf5-sys/src/h5p.rs

@@ -771,7 +771,7 @@ extern "C" {
     pub fn H5Pset_dset_no_attrs_hint(dcpl_id: hid_t, minimize: hbool_t) -> herr_t;
 }
 
-#[cfg(all(feature = "1.10.7", not(feature = "1.12.0")))]
+#[cfg(any(all(feature = "1.10.7", not(feature = "1.12.0")), feature = "1.12.1"))]
 extern "C" {
     pub fn H5Pget_file_locking(
         fapl_id: hid_t, use_file_locking: *mut hbool_t, ignore_when_disable: *mut hbool_t,

hdf5-sys/src/h5s.rs

@@ -143,3 +143,8 @@ extern "C" {
         nbytes: *mut size_t, off: *mut hsize_t, len: *mut size_t,
     ) -> herr_t;
 }
+
+#[cfg(feature = "1.12.1")]
+extern "C" {
+    pub fn H5Ssel_iter_reset(sel_iter_id: hid_t, space_id: hid_t) -> hid_t;
+}

hdf5-sys/src/h5vl.rs

@@ -22,3 +22,29 @@ extern "C" {
     ) -> hid_t;
     pub fn H5VLunregister_connector(vol_id: hid_t) -> herr_t;
 }
+
+#[cfg(feature = "1.12.1")]
+#[repr(C)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub enum H5VL_subclass_t {
+    H5VL_SUBCLS_NONE,
+    H5VL_SUBCLS_INFO,
+    H5VL_SUBCLS_WRAP,
+    H5VL_SUBCLS_ATTR,
+    H5VL_SUBCLS_DATASET,
+    H5VL_SUBCLS_DATATYPE,
+    H5VL_SUBCLS_FILE,
+    H5VL_SUBCLS_GROUP,
+    H5VL_SUBCLS_LINK,
+    H5VL_SUBCLS_OBJECT,
+    H5VL_SUBCLS_REQUEST,
+    H5VL_SUBCLS_BLOB,
+    H5VL_SUBCLS_TOKEN,
+}
+
+#[cfg(feature = "1.12.1")]
+extern "C" {
+    pub fn H5VLquery_optional(
+        obj_id: hid_t, subcls: H5VL_subclass_t, opt_type: c_int, supported: *mut hbool_t,
+    ) -> herr_t;
+}