From 1c8a5dd0d17b5fd1a78f0310fb27b60c75b97160 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Fri, 12 Jun 2015 14:49:10 +0200
Subject: [PATCH] MPIPOSIX removed, this has been removed in hdf5 1.8.13, so we
 cannot use it any more

---
 src/h5core/h5_hdf5_private.h | 2 ++
 src/h5core/h5_openclose.c    | 5 ++++-
 src/h5core/h5_readwrite.c    | 4 ++++
 src/include/H5.h             | 3 ++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/h5core/h5_hdf5_private.h b/src/h5core/h5_hdf5_private.h
index a57e0b2..23153d5 100644
--- a/src/h5core/h5_hdf5_private.h
+++ b/src/h5core/h5_hdf5_private.h
@@ -925,6 +925,7 @@ hdf5_set_fapl_mpio_property (
 	HDF5_WRAPPER_RETURN (H5_SUCCESS);
 }
 
+#if H5_VERSION_LE(1,8,12)
 static inline h5_err_t
 hdf5_set_fapl_mpiposix_property (
 	hid_t fapl_id,
@@ -942,6 +943,7 @@ hdf5_set_fapl_mpiposix_property (
 				" the file access property list."));
 	HDF5_WRAPPER_RETURN (H5_SUCCESS);
 }
+#endif
 
 static inline h5_err_t
 hdf5_set_dxpl_mpio_property (
diff --git a/src/h5core/h5_openclose.c b/src/h5core/h5_openclose.c
index adbd823..c48ac6d 100644
--- a/src/h5core/h5_openclose.c
+++ b/src/h5core/h5_openclose.c
@@ -139,11 +139,14 @@ h5_err_t mpi_init (
 	TRY (f->access_prop = hdf5_create_property(H5P_FILE_ACCESS));
 
 	/* select the HDF5 VFD */
+#if H5_VERSION_LE(1,8,12)
 	if (f->mode & H5_VFD_MPIPOSIX) {
 		h5_info("Selecting MPI-POSIX VFD");
 		hbool_t use_gpfs = 0; // TODO autodetect GPFS?
 		TRY (hdf5_set_fapl_mpiposix_property(f->access_prop, comm, use_gpfs));
-	} else {
+	} else
+#endif
+	{
 		h5_info("Selecting MPI-IO VFD");
 		TRY (hdf5_set_fapl_mpio_property(f->access_prop, comm, MPI_INFO_NULL));
 		if (f->mode & H5_VFD_INDEPENDENT) {
diff --git a/src/h5core/h5_readwrite.c b/src/h5core/h5_readwrite.c
index d637402..3d62981 100644
--- a/src/h5core/h5_readwrite.c
+++ b/src/h5core/h5_readwrite.c
@@ -292,7 +292,11 @@ h5_set_throttle (
 	const int factor
 	) {
 	H5_CORE_API_ENTER (h5_err_t, "f=%p, factor=%d", f, factor);
+#if H5_VERSION_LE(1,8,12)
 	if ( (f->mode & H5_VFD_INDEPENDENT) || (f->mode & H5_VFD_MPIPOSIX) ) {
+#else
+	if (f->mode & H5_VFD_INDEPENDENT) {
+#endif
 		f->throttle = factor;
 		h5_info ("Throttling enabled with factor = %d", f->throttle );
 	} else {
diff --git a/src/include/H5.h b/src/include/H5.h
index 30cb015..1717dc5 100644
--- a/src/include/H5.h
+++ b/src/include/H5.h
@@ -28,7 +28,8 @@ extern "C" {
 
   You can also select a "virtual file driver" in the HDF5 layer using:
   - H5_VFD_INDEPENDENT: MPI-IO in independent (asynchronous) mode
-  - H5_VFD_MPIPOSIX: parallel I/O implemented directly by HDF5, bypassing MPI-IO
+  - H5_VFD_MPIPOSIX: parallel I/O implemented directly by HDF5, bypassing
+    MPI-IO (only for hdf5 <= 1.8.12)
 
   \return File handle.
   \return NULL on error.