Cleanup: assume MPI_Init_thread support exists in MPI layer (#3595)

Co-authored-by: Ronak Buch <rabuch2@illinois.edu>
charmplusplus · Jun 22, 2022 · d88db76 · d88db76
1 parent d4d2203
commit d88db76
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 35 deletions.
diff --git a/cmake/detect-features-c.cmake b/cmake/detect-features-c.cmake
@@ -108,7 +108,6 @@ check_function_exists(mmap CMK_HAS_MMAP)
 check_symbol_exists(MAP_ANON sys/mman.h CMK_HAS_MMAP_ANON)
 check_symbol_exists(MAP_NORESERVE sys/mman.h CMK_HAS_MMAP_NORESERVE)
 check_function_exists(mprotect CMK_HAS_MPROTECT)
-check_symbol_exists(MPI_Init_thread mpi.h CMK_MPI_INIT_THREAD)
 check_function_exists(mstats CMK_HAS_MSTATS)
 check_function_exists(ntohl CMK_HAS_NTOHL)
 check_symbol_exists(offsetof stddef.h CMK_HAS_OFFSETOF)

diff --git a/src/arch/mpi/machine.C b/src/arch/mpi/machine.C
@@ -1352,7 +1352,6 @@ static void registerMPITraceEvents(void) {
 }
 
 static const char *thread_level_tostring(int thread_level) {
-#if CMK_MPI_INIT_THREAD
     switch (thread_level) {
     case MPI_THREAD_SINGLE:
         return "MPI_THREAD_SINGLE";
@@ -1362,18 +1361,9 @@ static const char *thread_level_tostring(int thread_level) {
         return "MPI_THREAD_SERIALIZED";
     case MPI_THREAD_MULTIPLE :
         return "MPI_THREAD_MULTIPLE";
-    default: {
-        char *str = (char *)malloc(5); // XXX: leaked
-        sprintf(str,"%d", thread_level);
-        return str;
+    default:
+        return "unknown";
     }
-    }
-    return  "unknown";
-#else
-    char *str = (char *)malloc(5); // XXX: leaked
-    sprintf(str,"%d", thread_level);
-    return str;
-#endif
 }
 
 extern int quietMode;
@@ -1403,7 +1393,6 @@ void LrtsInit(int *argc, char ***argv, int *numNodes, int *myNodeID) {
     *argc = CmiGetArgc(largv);     /* update it in case it is out of sync */
 
     if(!CharmLibInterOperate || userDrivenMode) {
-#if CMK_MPI_INIT_THREAD
 #if CMK_SMP
     if (Cmi_smp_mode_setting == COMM_THREAD_SEND_RECV)
         thread_level = MPI_THREAD_FUNNELED;
@@ -1414,11 +1403,6 @@ void LrtsInit(int *argc, char ***argv, int *numNodes, int *myNodeID) {
 #endif
       MPI_Init_thread(argc, argv, thread_level, &provided);
       _thread_provided = provided;
-#else
-      MPI_Init(argc, argv);
-      thread_level = 0;
-      _thread_provided = -1;
-#endif
     }
 
     largc = *argc;
@@ -1901,7 +1885,7 @@ void CmiTimerInit(char **argv) {
         starttimer = MPI_Wtime();
     }
 
-#if 0 && CMK_SMP && CMK_MPI_INIT_THREAD
+#if 0 && CMK_SMP
     if (CmiMyRank()==0 && _thread_provided == MPI_THREAD_SINGLE)
         timerLock = CmiCreateLock();
 #endif

diff --git a/src/scripts/configure.ac b/src/scripts/configure.ac
@@ -1672,22 +1672,7 @@ then
   fi
 fi
 
-if test "$BUILD_MPI" = "1"
-then
-cat > $t <<EOT
-#include "mpi.h"
-int main(int argc, char **argv)
-{
-  int thread_level, provided;
-  thread_level = MPI_THREAD_FUNNELED;
-  MPI_Init_thread(&argc, &argv, thread_level, &provided);
-}
-EOT
-test_cxx "whether MPI_Init_thread is supported" "yes" "no" ""
-AC_DEFINE_UNQUOTED(CMK_MPI_INIT_THREAD, $strictpass, [Allows MPI_Init_thread.])
-fi
 mv -f ../include/mpi.h.bak ../include/mpi.h 2>/dev/null
-
 fi
 
 if test "$BUILD_MPI" = "1"