Merge pull request #6578 from hppritcha/topic/thread_framework2

Implement a MCA framework for threads
open-mpi · Mar 27, 2020 · f136a20 · f136a20
2 parents 8a624ab + d7fba60
commit f136a20
Show file tree

Hide file tree

Showing 138 changed files with 3,327 additions and 791 deletions.
diff --git a/config/opal_check_pthread_pids.m4 b/config/opal_check_pthread_pids.m4
diff --git a/config/opal_config_threads.m4 b/config/opal_config_threads.m4
diff --git a/configure.ac b/configure.ac
@@ -26,6 +26,8 @@
 # Copyright (c) 2018      Amazon.com, Inc. or its affiliates.
 #                         All Rights reserved.
 # Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
+# Copyright (c) 2019      Triad National Security, LLC. All rights
+#                         reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -945,22 +947,6 @@ OPAL_CHECK_BROKEN_QSORT
 # all: type of getsockopt optlen
 # all: type of recvfrom optlen
 
-#
-# Check out what thread support we have
-#
-OPAL_CONFIG_THREADS
-
-CFLAGS="$CFLAGS $THREAD_CFLAGS"
-CPPFLAGS="$CPPFLAGS $THREAD_CPPFLAGS"
-LDFLAGS="$LDFLAGS $THREAD_LDFLAGS"
-LIBS="$LIBS $THREAD_LIBS"
-
-OPAL_WRAPPER_FLAGS_ADD([CFLAGS], [$THREAD_CFLAGS])
-OPAL_WRAPPER_FLAGS_ADD([CXXFLAGS], [$THREAD_CXXFLAGS])
-OPAL_WRAPPER_FLAGS_ADD([FCFLAGS], [$THREAD_FCFLAGS])
-OPAL_WRAPPER_FLAGS_ADD([LDFLAGS], [$THREAD_LDFLAGS])
-# no need to update WRAPPER_EXTRA_LIBS - we'll get it from LT later
-
 #
 # What is the local equivalent of "ln -s"
 #
@@ -1113,6 +1099,14 @@ AC_MSG_RESULT([$opal_subdir_args])
 
 OPAL_MCA
 
+#
+# Now that we know how to support threads with wrappers, update
+#
+OPAL_WRAPPER_FLAGS_ADD([CFLAGS], [$THREAD_CFLAGS])
+OPAL_WRAPPER_FLAGS_ADD([CXXFLAGS], [$THREAD_CXXFLAGS])
+OPAL_WRAPPER_FLAGS_ADD([FCFLAGS], [$THREAD_FCFLAGS])
+OPAL_WRAPPER_FLAGS_ADD([LDFLAGS], [$THREAD_LDFLAGS])
+
 m4_ifdef([project_ompi], [OMPI_REQUIRE_ENDPOINT_TAG_FINI])
 
 # Last minute disable of OpenSHMEM if we didn't find any oshmem SPMLs

diff --git a/ompi/attribute/attribute.c b/ompi/attribute/attribute.c
@@ -232,7 +232,7 @@
 #include "ompi_config.h"
 
 #include "opal/class/opal_bitmap.h"
-#include "opal/threads/mutex.h"
+#include "opal/mca/threads/mutex.h"
 #include "opal/sys/atomic.h"
 
 #include "ompi/attribute/attribute.h"

diff --git a/ompi/communicator/comm.c b/ompi/communicator/comm.c
@@ -41,7 +41,7 @@
 #include "opal/util/string_copy.h"
 
 #include "ompi/proc/proc.h"
-#include "opal/threads/mutex.h"
+#include "opal/mca/threads/mutex.h"
 #include "opal/util/bit_ops.h"
 #include "opal/util/output.h"
 #include "ompi/mca/topo/topo.h"

diff --git a/ompi/communicator/communicator.h b/ompi/communicator/communicator.h
@@ -36,7 +36,7 @@
 #include "opal/class/opal_hash_table.h"
 #include "opal/util/info_subscriber.h"
 #include "ompi/errhandler/errhandler.h"
-#include "opal/threads/mutex.h"
+#include "opal/mca/threads/mutex.h"
 #include "ompi/communicator/comm_request.h"
 
 #include "mpi.h"

diff --git a/ompi/file/file.h b/ompi/file/file.h
@@ -30,7 +30,7 @@
 #include "mpi.h"
 #include "opal/class/opal_list.h"
 #include "ompi/errhandler/errhandler.h"
-#include "opal/threads/mutex.h"
+#include "opal/mca/threads/mutex.h"
 #include "opal/util/info_subscriber.h"
 #include "ompi/mca/io/io.h"
 

diff --git a/ompi/info/info.h b/ompi/info/info.h
@@ -32,7 +32,7 @@
 #include "opal/util/info.h"
 #include "opal/class/opal_list.h"
 #include "opal/class/opal_pointer_array.h"
-#include "opal/threads/mutex.h"
+#include "opal/mca/threads/mutex.h"
 
 #include "opal/mca/base/mca_base_var_enum.h"
 

diff --git a/ompi/mca/common/monitoring/monitoring_prof.c b/ompi/mca/common/monitoring/monitoring_prof.c
@@ -58,7 +58,7 @@ writing 4x4 matrix to monitoring_avg.mat
 #define OMPI_COMPILING_FORTRAN_WRAPPERS 1
 #endif
 
-#include "opal/threads/thread_usage.h"
+#include "opal/mca/threads/thread_usage.h"
 
 #include "ompi/include/mpi.h"
 #include "ompi/mpi/fortran/base/constants.h"

diff --git a/ompi/mca/common/ompio/common_ompio.h b/ompi/mca/common/ompio/common_ompio.h
@@ -29,7 +29,7 @@
 #include "mpi.h"
 #include "opal/class/opal_list.h"
 #include "ompi/errhandler/errhandler.h"
-#include "opal/threads/mutex.h"
+#include "opal/mca/threads/mutex.h"
 #include "ompi/file/file.h"
 #include "ompi/mca/io/io.h"
 #include "ompi/mca/fs/fs.h"

diff --git a/ompi/mca/io/ompio/io_ompio.h b/ompi/mca/io/ompio/io_ompio.h
@@ -29,7 +29,7 @@
 #include "mpi.h"
 #include "opal/class/opal_list.h"
 #include "ompi/errhandler/errhandler.h"
-#include "opal/threads/mutex.h"
+#include "opal/mca/threads/mutex.h"
 #include "ompi/file/file.h"
 #include "ompi/mca/io/io.h"
 #include "ompi/mca/fs/fs.h"

diff --git a/ompi/mca/io/ompio/io_ompio_component.c b/ompi/mca/io/ompio/io_ompio_component.c
@@ -28,7 +28,7 @@
 
 #include "mpi.h"
 #include "opal/class/opal_list.h"
-#include "opal/threads/mutex.h"
+#include "opal/mca/threads/mutex.h"
 #include "opal/mca/base/base.h"
 #include "ompi/mca/io/io.h"
 #include "ompi/mca/fs/base/base.h"

diff --git a/ompi/mca/io/ompio/io_ompio_module.c b/ompi/mca/io/ompio/io_ompio_module.c
@@ -20,7 +20,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "opal/threads/mutex.h"
+#include "opal/mca/threads/mutex.h"
 #include "ompi/mca/io/io.h"
 #include "io_ompio.h"
 

diff --git a/ompi/mca/io/romio321/src/io_romio321.h b/ompi/mca/io/romio321/src/io_romio321.h
@@ -24,7 +24,7 @@
 #define MCA_IO_ROMIO321_H
 
 #include "ompi_config.h"
-#include "opal/threads/mutex.h"
+#include "opal/mca/threads/mutex.h"
 #include "ompi/request/request.h"
 #include "ompi/file/file.h"
 #include "ompi/mca/io/io.h"

diff --git a/ompi/mca/io/romio321/src/io_romio321_component.c b/ompi/mca/io/romio321/src/io_romio321_component.c
@@ -27,7 +27,7 @@
 
 #include "mpi.h"
 #include "opal/class/opal_list.h"
-#include "opal/threads/mutex.h"
+#include "opal/mca/threads/mutex.h"
 #include "opal/mca/base/base.h"
 #include "ompi/mca/io/io.h"
 #include "io_romio321.h"

diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt.h b/ompi/mca/osc/pt2pt/osc_pt2pt.h
@@ -30,7 +30,7 @@
 #include "opal/class/opal_list.h"
 #include "opal/class/opal_free_list.h"
 #include "opal/class/opal_hash_table.h"
-#include "opal/threads/threads.h"
+#include "opal/mca/threads/threads.h"
 #include "opal/util/output.h"
 
 #include "ompi/win/win.h"

diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_active_target.c b/ompi/mca/osc/pt2pt/osc_pt2pt_active_target.c
@@ -33,7 +33,7 @@
 
 #include "mpi.h"
 #include "opal/runtime/opal_progress.h"
-#include "opal/threads/mutex.h"
+#include "opal/mca/threads/mutex.h"
 #include "ompi/communicator/communicator.h"
 #include "ompi/mca/osc/base/base.h"
 

diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_passive_target.c b/ompi/mca/osc/pt2pt/osc_pt2pt_passive_target.c
@@ -31,7 +31,7 @@
 
 #include "mpi.h"
 #include "opal/runtime/opal_progress.h"
-#include "opal/threads/mutex.h"
+#include "opal/mca/threads/mutex.h"
 #include "ompi/communicator/communicator.h"
 #include "ompi/mca/osc/base/base.h"
 #include "opal/include/opal_stdint.h"

diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_sync.h b/ompi/mca/osc/pt2pt/osc_pt2pt_sync.h
@@ -14,7 +14,7 @@
 
 #include "ompi_config.h"
 #include "opal/class/opal_free_list.h"
-#include "opal/threads/threads.h"
+#include "opal/mca/threads/threads.h"
 
 enum ompi_osc_pt2pt_sync_type_t {
     /** default value */

diff --git a/ompi/mca/osc/rdma/osc_rdma.h b/ompi/mca/osc/rdma/osc_rdma.h
@@ -27,7 +27,7 @@
 #include "ompi_config.h"
 #include "opal/class/opal_free_list.h"
 #include "opal/class/opal_hash_table.h"
-#include "opal/threads/threads.h"
+#include "opal/mca/threads/threads.h"
 #include "opal/util/output.h"
 
 #include "opal/mca/shmem/shmem.h"

diff --git a/ompi/mca/osc/rdma/osc_rdma_active_target.c b/ompi/mca/osc/rdma/osc_rdma_active_target.c
@@ -31,7 +31,7 @@
 #include "osc_rdma_active_target.h"
 
 #include "mpi.h"
-#include "opal/threads/mutex.h"
+#include "opal/mca/threads/mutex.h"
 #include "ompi/communicator/communicator.h"
 #include "ompi/mca/osc/base/base.h"