GNUmakefile

@@ -68,6 +68,7 @@ BLOSC_CPPFLAGS := $(BLOSC_CPPFLAGS) \
 	-I$(VELOC_INSTALL_DIR)/include
 BASE_CXXFLAGS := \
 	-L$(VELOC_INSTALL_DIR)/lib -L$(VELOC_INSTALL_DIR)/lib64 \
+	-Wl,-rpath,$(VELOC_INSTALL_DIR)/lib64 -Wl,-rpath,$(VELOC_INSTALL_DIR)/lib\
 	-Wl,--copy-dt-needed-entries -lveloc-client
 endif
 

GenericIO.h

@@ -462,14 +462,24 @@ public:
   static void setNaturalDefaultPartition();
 
   static bool flushAll() {
+      bool ret = true;
 #ifdef GENERICIO_WITH_VELOC
-      return GenericFileIO_VELOC::flush();
+      bool retLocal = GenericFileIO_VELOC::flush();//With veloc do a blocking flush of anything outstanding and return if all outstanding tasks were successful
+#ifndef GENERICIO_NO_MPI
+      MPI_Allreduce(&retLocal, &ret, 1, MPI_C_BOOL, MPI_LAND, MPI_COMM_WORLD);//Global reduction on if flush was successful 
+#else
+      ret = retLocal;
 #endif
+#endif//GENERICIO_WITH_VELOC
+      return ret;//by default return that flush was successful (as it does not do anything)
   }
 
   static void shutdown() {
 #ifdef GENERICIO_WITH_VELOC
       GenericFileIO_VELOC::flush();
+#ifndef GENERICIO_NO_MPI
+      MPI_Barrier(MPI_COMM_WORLD);//Barrier to wait for all ranks to finish
+#endif
 #endif
   }
 

GenericIOBenchmarkWrite.cxx

@@ -128,7 +128,7 @@ int main(int argc, char *argv[]) {
   GenericIO::setNaturalDefaultPartition();
 
   char *mpiioName = argv[a++];
-  size_t Np = atoi(argv[a++])/commRanks;
+  size_t Np = atol(argv[a++])/commRanks;
   int seed = atoi(argv[a++]);
 
   srand48(seed + commRank);