mpi_dp: build always, heuristics determine priority

Author: vicentebolea

CMakeLists.txt

@@ -462,7 +462,7 @@ if (ADIOS2_HAVE_SST)
   if (ADIOS2_SST_HAVE_UCX)
      set (HPCDataPlaneList "${HPCDataPlaneList} UCX")
   endif()
-  if (ADIOS2_SST_HAVE_MPI_DP)
+  if (ADIOS2_HAVE_MPI)
      set (HPCDataPlaneList "${HPCDataPlaneList} MPI")
   endif()
 endif()

cmake/DetectOptions.cmake

@@ -503,12 +503,8 @@ if(ADIOS2_USE_SST AND NOT WIN32)
           MPI_Finalize();
           exit(EXIT_SUCCESS);
         }]=]
-    ADIOS2_HAVE_MPI_CLIENT_SERVER)
+    ADIOS2_SST_HAVE_MPI_DP_HEURISTICS_PASSED)
     unset(CMAKE_REQUIRED_LIBRARIES)
-
-    if (ADIOS2_HAVE_MPI_CLIENT_SERVER)
-      set(ADIOS2_SST_HAVE_MPI_DP TRUE)
-    endif()
   endif()
 
   # UCX

source/adios2/toolkit/sst/CMakeLists.txt

@@ -45,7 +45,7 @@ if(ADIOS2_HAVE_ZFP)
   target_link_libraries(sst PRIVATE zfp::zfp)
 endif()
 
-if(ADIOS2_SST_HAVE_MPI_DP)
+if(ADIOS2_HAVE_MPI)
   target_sources(sst PRIVATE dp/mpi_dp.c)
   target_link_libraries(sst PRIVATE MPI::MPI_C)
 endif()
@@ -68,6 +68,7 @@ set(SST_CONFIG_OPTS
   CRAY_CXI
   NVStream
   MPI
+  MPI_DP_HEURISTICS_PASSED
 )
 include(SSTFunctions)
 GenerateSSTHeaderConfig(${SST_CONFIG_OPTS})

source/adios2/toolkit/sst/dp/dp.c

@@ -24,9 +24,9 @@ extern CP_DP_Interface LoadUcxDP();
 #ifdef SST_HAVE_DAOS
 extern CP_DP_Interface LoadDaosDP();
 #endif /* SST_HAVE_LIBFABRIC */
-#ifdef SST_HAVE_MPI_DP
+#ifdef ADIOS2_HAVE_MPI
 extern CP_DP_Interface LoadMpiDP();
-#endif /* SST_HAVE_MPI_DP */
+#endif /* ADIOS2_HAVE_MPI */
 extern CP_DP_Interface LoadEVpathDP();
 
 typedef struct _DPElement
@@ -79,9 +79,9 @@ CP_DP_Interface SelectDP(CP_Services Svcs, void *CP_Stream, struct _SstParams *P
     List = AddDPPossibility(Svcs, CP_Stream, List, LoadDaosDP(), "daos", Params);
 #endif /* SST_HAVE_DAOS */
 
-#ifdef SST_HAVE_MPI_DP
+#ifdef ADIOS2_HAVE_MPI
     List = AddDPPossibility(Svcs, CP_Stream, List, LoadMpiDP(), "mpi", Params);
-#endif /* SST_HAVE_MPI_DP */
+#endif /* ADIOS2_HAVE_MPI */
 
     int SelectedDP = -1;
     int BestPriority = -1;

source/adios2/toolkit/sst/dp/mpi_dp.c

@@ -766,31 +766,42 @@ static void MpiReleaseTimeStep(CP_Services Svcs, DP_WS_Stream Stream_v, size_t T
  */
 static int MpiGetPriority(CP_Services Svcs, void *CP_Stream, struct _SstParams *Params)
 {
+    char *ReasonMsg = NULL;
+    int ReturnValue = 10;
     int IsInitialized = 0;
-    int provided = 0;
-    int IsMPICH = 0;
-#if defined(MPICH)
-    IsMPICH = 1;
-
     MPI_Initialized(&IsInitialized);
     if (IsInitialized)
     {
-        MPI_Query_thread(&provided);
-        // Only enabled when MPI_THREAD_MULTIPLE and using MPICH
-        if (provided == MPI_THREAD_MULTIPLE)
+        int Provided = 0;
+        MPI_Query_thread(&Provided);
+        if (Provided == MPI_THREAD_MULTIPLE)
         {
-            return 100;
+#if defined(ADIOS2_SST_HAVE_MPI_DP_HEURISTICS_PASSED)
+            ReasonMsg = strdup("Heuristics determined good compatibility");
+            ReturnValue = 10;
+#else
+            ReasonMsg = strdup("Heuristics determined poor compatibility");
+            ReturnValue = 0;
+#endif
+        }
+        else
+        {
+            ReasonMsg = strdup("MPI_THREAD_MULTIPLE not supported by MPI");
+            ReturnValue = -1;
         }
     }
-#endif
+    else
+    {
+        ReasonMsg = strdup("MPI_Initialized() failed");
+        ReturnValue = -1;
+    }
+
+    Svcs->verbose(CP_Stream, DPSummaryVerbose, "mpi_dp priority=%d since: %s.", ReturnValue,
+                  ReasonMsg);
 
-    Svcs->verbose(CP_Stream, DPTraceVerbose,
-                  "MPI DP disabled since the following predicate is false: "
-                  "(MPICH=%s AND MPI_initialized=%s AND MPI_THREAD_MULTIPLE=%s)",
-                  IsMPICH ? "true" : "false", IsInitialized ? "true" : "false",
-                  provided == MPI_THREAD_MULTIPLE ? "true" : "false");
+    free(ReasonMsg);
 
-    return -100;
+    return ReturnValue;
 }
 
 /**