[cig-commits] [commit] master: Fix HDF5 parallel #ifdef (ff2aced)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/vq

On branch  : master
Link       : https://github.com/geodynamics/vq/compare/4d339b3a383b69e1552cfeef4ca20868a1377289...d0edc6ddd56f9105f6d2488db4a9f36368529695

>---------------------------------------------------------------

commit ff2acedcf4bdca8642e56402c3ec1b7e32696c3a
Author: Eric Heien <emheien at ucdavis.edu>
Date:   Thu Dec 4 13:34:43 2014 -0800

    Fix HDF5 parallel #ifdef


>---------------------------------------------------------------

ff2acedcf4bdca8642e56402c3ec1b7e32696c3a
 config.h.in             |  1 +
 src/core/Simulation.cpp |  6 ++----
 src/io/EventOutput.cpp  |  6 ++----
 src/io/HDF5Data.cpp     | 26 +++++++-------------------
 4 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/config.h.in b/config.h.in
index 3083f0f..7cfa64d 100644
--- a/config.h.in
+++ b/config.h.in
@@ -10,6 +10,7 @@
 #cmakedefine VQ_HAVE_SLEEP_FUNC
 #cmakedefine VQ_HAVE_USLEEP_FUNC
 #cmakedefine HDF5_FOUND
+#cmakedefine HDF5_IS_PARALLEL
 #cmakedefine MPI_C_FOUND
 #cmakedefine VQ_VERSION_STR "@VQ_VERSION_STR@"
 #cmakedefine VQ_GIT_SHA1 "@VQ_GIT_SHA1@"
diff --git a/src/core/Simulation.cpp b/src/core/Simulation.cpp
index bbb0b90..7697e71 100644
--- a/src/core/Simulation.cpp
+++ b/src/core/Simulation.cpp
@@ -176,10 +176,8 @@ void Simulation::open_stress_hdf5_file(const std::string &hdf5_file_name) {
 
     if (plist_id < 0) exit(-1);
 
-#ifdef MPI_C_FOUND
-#ifdef H5_HAVE_PARALLEL
-    //H5Pset_fapl_mpio(plist_id, MPI_COMM_WORLD, MPI_INFO_NULL);
-#endif
+#ifdef HDF5_IS_PARALLEL
+    H5Pset_fapl_mpio(plist_id, MPI_COMM_WORLD, MPI_INFO_NULL);
 #endif
     // Create the data file, overwriting any old files
     stress_data_file = H5Fcreate(hdf5_file_name.c_str(), H5F_ACC_TRUNC, H5P_DEFAULT, plist_id);
diff --git a/src/io/EventOutput.cpp b/src/io/EventOutput.cpp
index 19970d5..b691a23 100644
--- a/src/io/EventOutput.cpp
+++ b/src/io/EventOutput.cpp
@@ -56,10 +56,8 @@ void EventOutput::open_hdf5_file(const std::string &hdf5_file_name, const double
 
     if (plist_id < 0) exit(-1);
 
-#ifdef MPI_C_FOUND
-#ifdef H5_HAVE_PARALLEL
-    //H5Pset_fapl_mpio(plist_id, MPI_COMM_WORLD, MPI_INFO_NULL);
-#endif
+#ifdef HDF5_IS_PARALLEL
+    H5Pset_fapl_mpio(plist_id, MPI_COMM_WORLD, MPI_INFO_NULL);
 #endif
     // Create the data file, overwriting any old files
     data_file = H5Fcreate(hdf5_file_name.c_str(), H5F_ACC_TRUNC, H5P_DEFAULT, plist_id);
diff --git a/src/io/HDF5Data.cpp b/src/io/HDF5Data.cpp
index 4d3e1d3..0443eb0 100644
--- a/src/io/HDF5Data.cpp
+++ b/src/io/HDF5Data.cpp
@@ -42,11 +42,9 @@ HDF5CheckpointReader::HDF5CheckpointReader(const std::string &ckpt_file_name,
 
     if (plist_id < 0) exit(-1);
 
-#ifdef MPI_C_FOUND
-#ifdef H5_HAVE_PARALLEL
+#ifdef HDF5_IS_PARALLEL
     H5Pset_fapl_mpio(plist_id, MPI_COMM_WORLD, MPI_INFO_NULL);
 #endif
-#endif
 
     data_file = H5Fopen(ckpt_file_name.c_str(), H5F_ACC_RDONLY, plist_id);
 
@@ -74,11 +72,9 @@ HDF5CheckpointWriter::HDF5CheckpointWriter(const std::string &ckpt_file_name,
 
     if (plist_id < 0) exit(-1);
 
-    #ifdef MPI_C_FOUND
-    #ifdef H5_HAVE_PARALLEL
+    #ifdef HDF5_IS_PARALLEL
     H5Pset_fapl_mpio(plist_id, MPI_COMM_WORLD, MPI_INFO_NULL);
     #endif
-    #endif
 
     // Create the data file, overwriting any old files
     data_file = H5Fcreate(ckpt_file_name.c_str(), H5F_ACC_TRUNC, H5P_DEFAULT, plist_id);
@@ -138,11 +134,9 @@ HDF5CheckpointWriter::HDF5CheckpointWriter(const std::string &ckpt_file_name,
 
     // Write all block state data in parallel
     xfer_plist_id = H5Pcreate(H5P_DATASET_XFER);
-    #ifdef MPI_C_FOUND
-    #ifdef H5_HAVE_PARALLEL
+    #ifdef HDF5_IS_PARALLEL
     H5Pset_dxpl_mpio(xfer_plist_id, H5FD_MPIO_COLLECTIVE);
     #endif
-    #endif
     status = H5Dwrite(state_dataset, H5T_NATIVE_DOUBLE, mem_select, file_select, xfer_plist_id, mem_state);
 
     res = H5Sclose(file_select);
@@ -236,11 +230,9 @@ HDF5GreensDataWriter::HDF5GreensDataWriter(const std::string &hdf5_file_name, co
 
     if (plist_id < 0) exit(-1);
 
-#ifdef MPI_C_FOUND
-#ifdef H5_HAVE_PARALLEL
+#ifdef HDF5_IS_PARALLEL
     H5Pset_fapl_mpio(plist_id, MPI_COMM_WORLD, MPI_INFO_NULL);
 #endif
-#endif
     // Create the data file, overwriting any old files
     data_file = H5Fcreate(hdf5_file_name.c_str(), H5F_ACC_TRUNC, H5P_DEFAULT, plist_id);
 
@@ -290,10 +282,8 @@ void HDF5GreensDataWriter::setGreensVals(const int &bid, const double *shear_val
     status = H5Sselect_hyperslab(mem_select, H5S_SELECT_SET, mem_start, NULL, count, NULL);
 
     plist_id = H5Pcreate(H5P_DATASET_XFER);
-#ifdef MPI_C_FOUND
-#ifdef H5_HAVE_PARALLEL
-    //H5Pset_dxpl_mpio(plist_id, H5FD_MPIO_COLLECTIVE);
-#endif
+#ifdef HDF5_IS_PARALLEL
+    H5Pset_dxpl_mpio(plist_id, H5FD_MPIO_COLLECTIVE);
 #endif
     status = H5Dwrite(green_shear_set, H5T_NATIVE_DOUBLE, mem_select, file_select, plist_id, shear_vals);
     status = H5Dwrite(green_norm_set, H5T_NATIVE_DOUBLE, mem_select, file_select, plist_id, norm_vals);
@@ -326,11 +316,9 @@ void HDF5GreensDataReader::getGreensVals(const int &bid, double *shear_vals, dou
     status = H5Sselect_hyperslab(mem_select, H5S_SELECT_SET, mem_start, NULL, count, NULL);
 
     plist_id = H5Pcreate(H5P_DATASET_XFER);
-#ifdef MPI_C_FOUND
-#ifdef H5_HAVE_PARALLEL
+#ifdef HDF5_IS_PARALLEL
     //H5Pset_dxpl_mpio(plist_id, H5FD_MPIO_COLLECTIVE);
 #endif
-#endif
     status = H5Dread(green_shear_set, H5T_NATIVE_DOUBLE, mem_select, file_select, plist_id, shear_vals);
     status = H5Dread(green_norm_set, H5T_NATIVE_DOUBLE, mem_select, file_select, plist_id, norm_vals);