Subfiling VFD - add note about MPICH_MAX_THREAD_SAFETY env. var.

HDFGroup · Aug 31, 2023 · aaabe3f · aaabe3f
1 parent 54d19b0
commit aaabe3f
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 5 deletions.
diff --git a/examples/ph5_subfiling.c b/examples/ph5_subfiling.c
@@ -501,7 +501,11 @@ main(int argc, char **argv)
     /* HDF5 Subfiling VFD requires MPI_Init_thread with MPI_THREAD_MULTIPLE */
     MPI_Init_thread(&argc, &argv, mpi_thread_required, &mpi_thread_provided);
     if (mpi_thread_provided < mpi_thread_required) {
+#ifdef MPICH
+        printf("MPI_THREAD_MULTIPLE not supported. Try setting the environment variable MPICH_MAX_THREAD_SAFETY=multiple\n");
+#else
         printf("MPI_THREAD_MULTIPLE not supported\n");
+#endif
         MPI_Abort(comm, -1);
     }
 

diff --git a/src/H5FDsubfiling/H5FDioc.c b/src/H5FDsubfiling/H5FDioc.c
@@ -235,10 +235,17 @@ H5FD_ioc_init(void)
                 /* If MPI is initialized, validate that it was initialized with MPI_THREAD_MULTIPLE */
                 if (MPI_SUCCESS != (mpi_code = MPI_Query_thread(&provided)))
                     H5_SUBFILING_MPI_GOTO_ERROR(H5I_INVALID_HID, "MPI_Query_thread failed", mpi_code);
-                if (provided != MPI_THREAD_MULTIPLE)
+                if (provided != MPI_THREAD_MULTIPLE) {
+#ifdef MPICH
+                    H5_SUBFILING_GOTO_ERROR(
+                        H5E_VFL, H5E_CANTINIT, H5I_INVALID_HID,
+                        "IOC VFD requires the use of MPI_Init_thread with MPI_THREAD_MULTIPLE. Try setting the environment variable MPICH_MAX_THREAD_SAFETY=multiple");
+#else
                     H5_SUBFILING_GOTO_ERROR(
                         H5E_VFL, H5E_CANTINIT, H5I_INVALID_HID,
                         "IOC VFD requires the use of MPI_Init_thread with MPI_THREAD_MULTIPLE");
+#endif
+                }
             }
             else {
                 int required = MPI_THREAD_MULTIPLE;
@@ -249,9 +256,15 @@ H5FD_ioc_init(void)
 
                 H5FD_mpi_self_initialized = TRUE;
 
-                if (provided != required)
+                if (provided != required) {
+#ifdef MPICH
+                    H5_SUBFILING_GOTO_ERROR(H5E_VFL, H5E_CANTINIT, H5I_INVALID_HID,
+                                            "MPI doesn't support MPI_Init_thread with MPI_THREAD_MULTIPLE. Try setting the environment variable MPICH_MAX_THREAD_SAFETY=multiple");
+#else
                     H5_SUBFILING_GOTO_ERROR(H5E_VFL, H5E_CANTINIT, H5I_INVALID_HID,
                                             "MPI doesn't support MPI_Init_thread with MPI_THREAD_MULTIPLE");
+#endif
+                }
             }
         }
 

diff --git a/src/H5FDsubfiling/H5FDsubfiling.c b/src/H5FDsubfiling/H5FDsubfiling.c
@@ -310,10 +310,17 @@ H5FD_subfiling_init(void)
             /* If MPI is initialized, validate that it was initialized with MPI_THREAD_MULTIPLE */
             if (MPI_SUCCESS != (mpi_code = MPI_Query_thread(&provided)))
                 H5_SUBFILING_MPI_GOTO_ERROR(H5I_INVALID_HID, "MPI_Query_thread failed", mpi_code);
-            if (provided != MPI_THREAD_MULTIPLE)
+            if (provided != MPI_THREAD_MULTIPLE) {
+#ifdef MPICH
+                H5_SUBFILING_GOTO_ERROR(
+                    H5E_VFL, H5E_CANTINIT, H5I_INVALID_HID,
+                    "Subfiling VFD requires the use of MPI_Init_thread with MPI_THREAD_MULTIPLE. Try setting the environment variable MPICH_MAX_THREAD_SAFETY=multiple");
+#else
                 H5_SUBFILING_GOTO_ERROR(
                     H5E_VFL, H5E_CANTINIT, H5I_INVALID_HID,
                     "Subfiling VFD requires the use of MPI_Init_thread with MPI_THREAD_MULTIPLE");
+#endif
+            }
         }
         else {
             int required = MPI_THREAD_MULTIPLE;
@@ -323,9 +330,15 @@ H5FD_subfiling_init(void)
 
             H5FD_mpi_self_initialized = TRUE;
 
-            if (provided != required)
+            if (provided != required) {
+#ifdef MPICH
+                H5_SUBFILING_GOTO_ERROR(H5E_VFL, H5E_CANTINIT, H5I_INVALID_HID,
+                                        "MPI doesn't support MPI_Init_thread with MPI_THREAD_MULTIPLE. Try setting the environment variable MPICH_MAX_THREAD_SAFETY=multiple");
+#else
                 H5_SUBFILING_GOTO_ERROR(H5E_VFL, H5E_CANTINIT, H5I_INVALID_HID,
                                         "MPI doesn't support MPI_Init_thread with MPI_THREAD_MULTIPLE");
+#endif
+            }
 
             if (atexit(H5FD__subfiling_mpi_finalize) < 0)
                 H5_SUBFILING_GOTO_ERROR(H5E_VFL, H5E_CANTINIT, H5I_INVALID_HID,

diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c
@@ -2142,7 +2142,11 @@ main(int argc, char **argv)
 
     if (provided != required) {
         if (MAINPROCESS)
+#ifdef MPICH
+            printf("MPI doesn't support MPI_Init_thread with MPI_THREAD_MULTIPLE. Try setting the environment variable MPICH_MAX_THREAD_SAFETY=multiple\n");
+#else
             printf("MPI doesn't support MPI_Init_thread with MPI_THREAD_MULTIPLE\n");
+#endif
         nerrors++;
         goto exit;
     }

diff --git a/testpar/t_vfd.c b/testpar/t_vfd.c
@@ -5907,12 +5907,16 @@ main(int argc, char **argv)
 
 #ifdef H5_HAVE_SUBFILING_VFD
     if (MPI_SUCCESS != MPI_Init_thread(&argc, &argv, required, &provided)) {
-        printf("    MPI doesn't support MPI_Init_thread with MPI_THREAD_MULTIPLE. Exiting\n");
+        printf("    MPI_Init_thread failed. Exiting\n");
         goto finish;
     }
 
     if (provided != required) {
+#ifdef MPICH
+        printf("    MPI doesn't support MPI_Init_thread with MPI_THREAD_MULTIPLE. Try setting the environment variable MPICH_MAX_THREAD_SAFETY=multiple. Exiting\n");
+#else
         printf("    MPI doesn't support MPI_Init_thread with MPI_THREAD_MULTIPLE. Exiting\n");
+#endif
         goto finish;
     }
 #else