Merge branch 'hpx_1_5' of github.com:STEllAR-GROUP/cinch into hpx_1_5

laristra · Nov 16, 2020 · a239a76 · a239a76
2 parents 43ea0e3 + 6b837e2
commit a239a76
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/auxiliary/test-hpx.cc b/auxiliary/test-hpx.cc
@@ -166,7 +166,12 @@ main(int argc, char ** argv) {
 
 #if defined(CINCH_ENABLE_MPI)
     if(has_mpi) {
-      MPI_Finalize();
+      int finalized = 1;
+      MPI_Finalized(&finalized);
+      if (!finalized) {
+        // Shutdown the MPI runtime
+        MPI_Finalize();
+      }
     }
 #endif
 
@@ -216,8 +221,12 @@ main(int argc, char ** argv) {
 
 #if defined(CINCH_ENABLE_MPI)
   if(has_mpi) {
-    // Shutdown the MPI runtime
-    MPI_Finalize();
+    int finalized = 1;
+    MPI_Finalized(&finalized);
+    if (!finalized) {
+      // Shutdown the MPI runtime
+      MPI_Finalize();
+    }
   }
 #endif