Merge pull request #95 from mulimoen/feature/hdf5-1.12.0

Author: aldanor

.github/workflows/ci.yml

@@ -35,6 +35,31 @@ jobs:
           command: ${{matrix.command}}
           args: "${{matrix.command == 'fmt' && '--all -- --check' || '-- -D warnings'}}"
 
+  brew:
+    name: brew
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - {version: [email protected]}
+          - {version: [email protected]}
+          - {version: [email protected]}
+          - {version: hdf5-mpi, mpi: true}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with: {submodules: true}
+      - name: Install Rust (${{matrix.rust}})
+        uses: actions-rs/toolchain@v1
+        with: {toolchain: stable, profile: minimal, override: true}
+      - name: Install HDF5 (${{matrix.version}})
+        run: brew install ${{matrix.version}}
+      - name: Build and test all crates
+        run: |
+          [ "${{matrix.mpi}}" != "" ] && FEATURES=mpio
+          cargo test -vv --features="$FEATURES"
+
   conda:
     name: conda
     runs-on: ${{matrix.os}}-latest
@@ -55,6 +80,9 @@ 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.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}
     defaults:
       run:
         shell: bash -l {0}
@@ -102,26 +130,6 @@ jobs:
       - name: Build and test all crates
         run: cargo test --workspace -v --features hdf5-sys/static,hdf5-sys/zlib --exclude hdf5-derive
 
-  brew:
-    name: brew
-    runs-on: macos-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        version: [1.8, '1.10']
-        rust: [stable]
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-        with: {submodules: true}
-      - name: Install Rust (${{matrix.rust}})
-        uses: actions-rs/toolchain@v1
-        with: {toolchain: '${{matrix.rust}}', profile: minimal, override: true}
-      - name: Install HDF5 (${{matrix.version}})
-        run: brew install hdf5@${{matrix.version}}
-      - name: Build and test all crates
-        run: cargo test -v
-
   apt:
     name: apt
     runs-on: ubuntu-${{matrix.ubuntu}}

hdf5-sys/build.rs

@@ -25,7 +25,7 @@ impl Version {
     }
 
     pub fn parse(s: &str) -> Option<Self> {
-        let re = Regex::new(r"^(1)\.(8|10)\.(\d\d?)(_\d+)?(-patch\d+)?$").ok()?;
+        let re = Regex::new(r"^(1)\.(8|10|12)\.(\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())?,
@@ -35,7 +35,10 @@ impl Version {
     }
 
     pub fn is_valid(self) -> bool {
-        self.major == 1 && ((self.minor == 8 && self.micro >= 4) || (self.minor == 10))
+        self.major == 1
+            && ((self.minor == 8 && self.micro >= 4)
+                || (self.minor == 10)
+                || (self.minor == 12 && self.micro == 0))
     }
 }
 
@@ -297,35 +300,55 @@ mod macos {
         }
         // We have to explicitly support homebrew since the HDF5 bottle isn't
         // packaged with pkg-config metadata.
-        let (v18, v110) = if let Some(version) = config.version {
-            (version.major == 1 && version.minor == 8, version.major == 1 && version.minor == 10)
+        let (v18, v110, v112) = if let Some(version) = config.version {
+            (
+                version.major == 1 && version.minor == 8,
+                version.major == 1 && version.minor == 10,
+                version.major == 1 && version.minor == 12,
+            )
         } else {
-            (false, false)
+            (false, false, false)
         };
         println!(
             "Attempting to find HDF5 via Homebrew ({})...",
             if v18 {
                 "1.8.*"
             } else if v110 {
                 "1.10.*"
+            } else if v112 {
+                "1.12.*"
             } else {
                 "any version"
             }
         );
-        if !v18 {
+        if !(v18 || v110) {
+            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 config.inc_dir.is_none() && !v18 {
             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 config.inc_dir.is_none() && !v110 {
+        if config.inc_dir.is_none() {
             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 config.inc_dir.is_none() {
+            if let Some(out) = run_command("brew", &["--prefix", "hdf5-mpi"]) {
+                if is_root_dir(&out) {
+                    config.inc_dir = Some(PathBuf::from(out).join("include"));
+                }
+            }
+        }
         if let Some(ref inc_dir) = config.inc_dir {
             println!("Found Homebrew HDF5 headers at:");
             println!("    {:?}", inc_dir);
@@ -592,6 +615,7 @@ 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..=5).map(|v| Version::new(1, 10, v))); // 1.10.[0-5]
+        vs.push(Version::new(1, 12, 0)); // 1.12.0
         for v in vs.into_iter().filter(|&v| version >= v) {
             println!("cargo:rustc-cfg=hdf5_{}_{}_{}", v.major, v.minor, v.micro);
             println!("cargo:version_{}_{}_{}=1", v.major, v.minor, v.micro);

hdf5-sys/src/h5f.rs

@@ -139,16 +139,22 @@ extern "C" {
     )]
     pub fn H5Fset_latest_format(file_id: hid_t, latest_format: hbool_t) -> herr_t;
     pub fn H5Fis_hdf5(filename: *const c_char) -> htri_t;
+    #[cfg(hdf5_1_12_0)]
+    pub fn H5Fis_accessible(container_name: *const c_char, fapl_id: hid_t) -> htri_t;
     pub fn H5Fcreate(
         filename: *const c_char, flags: c_uint, create_plist: hid_t, access_plist: hid_t,
     ) -> hid_t;
     pub fn H5Fopen(filename: *const c_char, flags: c_uint, access_plist: hid_t) -> hid_t;
     pub fn H5Freopen(file_id: hid_t) -> hid_t;
     pub fn H5Fflush(object_id: hid_t, scope: H5F_scope_t) -> herr_t;
     pub fn H5Fclose(file_id: hid_t) -> herr_t;
+    #[cfg(hdf5_1_12_0)]
+    pub fn H5Fdelete(filename: *const c_char, fapl_id: hid_t) -> herr_t;
     pub fn H5Fget_create_plist(file_id: hid_t) -> hid_t;
     pub fn H5Fget_access_plist(file_id: hid_t) -> hid_t;
     pub fn H5Fget_intent(file_id: hid_t, intent: *mut c_uint) -> herr_t;
+    #[cfg(hdf5_1_12_0)]
+    pub fn H5Fget_fileno(file_id: hid_t, fileno: *mut c_ulong) -> herr_t;
     pub fn H5Fget_obj_count(file_id: hid_t, types: c_uint) -> ssize_t;
     pub fn H5Fget_obj_ids(
         file_id: hid_t, types: c_uint, max_objs: size_t, obj_id_list: *mut hid_t,

hdf5-sys/src/h5i.rs

@@ -8,20 +8,27 @@ pub enum H5I_type_t {
     H5I_UNINIT = -2,
     H5I_BADID = -1,
     H5I_FILE = 1,
-    H5I_GROUP = 2,
-    H5I_DATATYPE = 3,
-    H5I_DATASPACE = 4,
-    H5I_DATASET = 5,
-    H5I_ATTR = 6,
+    H5I_GROUP,
+    H5I_DATATYPE,
+    H5I_DATASPACE,
+    H5I_DATASET,
+    #[cfg(hdf5_1_12_0)]
+    H5I_MAP,
+    H5I_ATTR,
+    #[cfg(not(hdf5_1_12_0))]
     #[cfg_attr(hdf5_1_10_2, deprecated(note = "deprecated in HDF5 1.10.2"))]
-    H5I_REFERENCE = 7,
-    H5I_VFL = 8,
-    H5I_GENPROP_CLS = 9,
-    H5I_GENPROP_LST = 10,
-    H5I_ERROR_CLASS = 11,
-    H5I_ERROR_MSG = 12,
-    H5I_ERROR_STACK = 13,
-    H5I_NTYPES = 14,
+    H5I_REFERENCE,
+    H5I_VFL,
+    #[cfg(hdf5_1_12_0)]
+    H5I_VOL,
+    H5I_GENPROP_CLS,
+    H5I_GENPROP_LST,
+    H5I_ERROR_CLASS,
+    H5I_ERROR_MSG,
+    H5I_ERROR_STACK,
+    #[cfg(hdf5_1_12_0)]
+    H5I_SPACE_SEL_ITER,
+    H5I_NTYPES,
 }
 
 #[cfg(hdf5_1_10_0)]
@@ -35,6 +42,8 @@ pub const H5I_INVALID_HID: hid_t = -1;
 pub type H5I_free_t = Option<extern "C" fn(arg1: *mut c_void) -> herr_t>;
 pub type H5I_search_func_t =
     Option<extern "C" fn(obj: *mut c_void, id: hid_t, key: *mut c_void) -> c_int>;
+#[cfg(hdf5_1_12_0)]
+pub type H5I_iterate_func_t = Option<extern "C" fn(id: hid_t, udata: *mut c_void) -> herr_t>;
 
 extern "C" {
     pub fn H5Iregister(type_: H5I_type_t, object: *const c_void) -> hid_t;
@@ -55,6 +64,8 @@ extern "C" {
     pub fn H5Idec_type_ref(type_: H5I_type_t) -> c_int;
     pub fn H5Iget_type_ref(type_: H5I_type_t) -> c_int;
     pub fn H5Isearch(type_: H5I_type_t, func: H5I_search_func_t, key: *mut c_void) -> *mut c_void;
+    #[cfg(hdf5_1_12_0)]
+    pub fn H5Iiterate(type_: H5I_type_t, op: H5I_iterate_func_t, op_data: *mut c_void) -> herr_t;
     pub fn H5Inmembers(type_: H5I_type_t, num_members: *mut hsize_t) -> herr_t;
     pub fn H5Itype_exists(type_: H5I_type_t) -> htri_t;
     pub fn H5Iis_valid(id: hid_t) -> htri_t;