Merge branch 'master' into provide_support_for_atomics_in_all_btls_be…

…cause_this_support_is_needed_to_truely_eliminate_the_awful_osc_pt2pt_component_which_has_gone_away_on_the_master_branch
open-mpi · Mar 3, 2021 · 6010c00 · 6010c00
2 parents 1fa152d + 8f8e9b8
commit 6010c00
Show file tree

Hide file tree

Showing 115 changed files with 1,354 additions and 11,933 deletions.
diff --git a/.github/workflows/git-commit-checks.yml b/.github/workflows/git-commit-checks.yml
@@ -1,4 +1,4 @@
-name: Git commit checker
+name: GitHub Action CI
 
 on:
     pull_request:
@@ -11,6 +11,7 @@ on:
 
 jobs:
     ci:
+        name: Git commit checker
         runs-on: ubuntu-latest
         steps:
           - name: Check out the code

diff --git a/.gitignore b/.gitignore
@@ -265,6 +265,14 @@ ompi/mpi/tool/profile/*.c
 ompi/mpiext/affinity/c/OMPI_Affinity_str.3
 ompi/mpiext/affinity/c/example
 
+ompi/mpiext/ftmpi/c/profile/pcomm_agree.c
+ompi/mpiext/ftmpi/c/profile/pcomm_failure_ack.c
+ompi/mpiext/ftmpi/c/profile/pcomm_failure_get_acked.c
+ompi/mpiext/ftmpi/c/profile/pcomm_iagree.c
+ompi/mpiext/ftmpi/c/profile/pcomm_is_revoked.c
+ompi/mpiext/ftmpi/c/profile/pcomm_revoke.c
+ompi/mpiext/ftmpi/c/profile/pcomm_shrink.c
+
 ompi/mpiext/example/tests/progress_c
 ompi/mpiext/example/tests/progress_mpifh
 ompi/mpiext/example/tests/progress_usempi
@@ -632,15 +640,6 @@ test/datatype/position_noncontig
 test/datatype/unpack_ooo
 test/datatype/unpack_hetero
 
-test/dss/dss_buffer
-test/dss/dss_copy
-test/dss/dss_size
-test/dss/dss_cmp
-test/dss/dss_release
-test/dss/dss_payload
-test/dss/dss_set_get
-test/dss/dss_print
-
 test/event/signal-test
 test/event/event-test
 test/event/time-test

diff --git a/3rd-party/openpmix b/3rd-party/openpmix
diff --git a/3rd-party/prrte b/3rd-party/prrte
diff --git a/config/ompi_check_ucx.m4 b/config/ompi_check_ucx.m4
@@ -104,44 +104,58 @@ AC_DEFUN([OMPI_CHECK_UCX],[
                   old_CPPFLAGS="$CPPFLAGS"
                   AS_IF([test -n "$ompi_check_ucx_dir"],
                         [CPPFLAGS="$CPPFLAGS -I$ompi_check_ucx_dir/include"])
-                  AC_CHECK_DECLS([ucp_tag_send_nbr],
-                                 [AC_DEFINE([HAVE_UCP_TAG_SEND_NBR],[1],
-                                            [have ucp_tag_send_nbr()])], [],
-                                 [#include <ucp/api/ucp.h>])
-                  AC_CHECK_DECLS([ucp_ep_flush_nb, ucp_worker_flush_nb,
-                                  ucp_request_check_status, ucp_put_nb, ucp_get_nb,
-                                  ucp_put_nbx, ucp_get_nbx, ucp_atomic_op_nbx],
-                                 [], [],
-                                 [#include <ucp/api/ucp.h>])
-                  AC_CHECK_DECLS([ucm_test_events,
-                                  ucm_test_external_events],
-                                 [], [],
-                                 [#include <ucm/api/ucm.h>])
-                  AC_CHECK_DECLS([UCP_ATOMIC_POST_OP_AND,
-                                  UCP_ATOMIC_POST_OP_OR,
-                                  UCP_ATOMIC_POST_OP_XOR,
-                                  UCP_ATOMIC_FETCH_OP_FAND,
-                                  UCP_ATOMIC_FETCH_OP_FOR,
-                                  UCP_ATOMIC_FETCH_OP_FXOR,
-                                  UCP_PARAM_FIELD_ESTIMATED_NUM_PPN],
-                                 [], [],
-                                 [#include <ucp/api/ucp.h>])
-                  AC_CHECK_DECLS([UCP_WORKER_ATTR_FIELD_ADDRESS_FLAGS],
-                                 [AC_DEFINE([HAVE_UCP_WORKER_ADDRESS_FLAGS], [1],
-                                            [have worker address attribute])], [],
-                                 [#include <ucp/api/ucp.h>])
-                  AC_CHECK_DECLS([UCP_ATTR_FIELD_MEMORY_TYPES],
-                                 [AC_DEFINE([HAVE_UCP_ATTR_MEMORY_TYPES], [1],
-                                            [have memory types attribute])], [],
-                                 [#include <ucp/api/ucp.h>])
-                  AC_CHECK_DECLS([ucp_tag_send_nbx,
-                                  ucp_tag_send_sync_nbx,
-                                  ucp_tag_recv_nbx],
-                                 [], [],
-                                 [#include <ucp/api/ucp.h>])
-                  AC_CHECK_TYPES([ucp_request_param_t],
-                                 [], [],
-                                 [[#include <ucp/api/ucp.h>]])
+                  # Turn off UCX version v1.8 due to issue #8321
+                  AC_MSG_CHECKING([UCX version])
+                  AC_PREPROC_IFELSE([AC_LANG_PROGRAM([#include <ucp/api/ucp_version.h>
+                                                      #if (UCP_API_MAJOR == 1) && (UCP_API_MINOR == 8)
+                                                      #error "Invalid version"
+                                                      #endif], [])],
+                                    [AC_MSG_RESULT([ok (not 1.8.x)])],
+                                    [AC_MSG_RESULT([bad (1.8.x)])
+                                     AC_MSG_WARN([UCX support skipped because version 1.8.x was found, which has a known catastrophic issue.])
+                                     AC_MSG_WARN([Please upgrade to UCX version 1.9 or higher.])
+                                     ompi_check_ucx_happy=no])
+                  AS_IF([test "$ompi_check_ucx_happy" = yes],
+                        [
+                         AC_CHECK_DECLS([ucp_tag_send_nbr],
+                                        [AC_DEFINE([HAVE_UCP_TAG_SEND_NBR],[1],
+                                                   [have ucp_tag_send_nbr()])], [],
+                                        [#include <ucp/api/ucp.h>])
+                         AC_CHECK_DECLS([ucp_ep_flush_nb, ucp_worker_flush_nb,
+                                         ucp_request_check_status, ucp_put_nb, ucp_get_nb,
+                                         ucp_put_nbx, ucp_get_nbx, ucp_atomic_op_nbx],
+                                        [], [],
+                                        [#include <ucp/api/ucp.h>])
+                         AC_CHECK_DECLS([ucm_test_events,
+                                         ucm_test_external_events],
+                                        [], [],
+                                        [#include <ucm/api/ucm.h>])
+                         AC_CHECK_DECLS([UCP_ATOMIC_POST_OP_AND,
+                                         UCP_ATOMIC_POST_OP_OR,
+                                         UCP_ATOMIC_POST_OP_XOR,
+                                         UCP_ATOMIC_FETCH_OP_FAND,
+                                         UCP_ATOMIC_FETCH_OP_FOR,
+                                         UCP_ATOMIC_FETCH_OP_FXOR,
+                                         UCP_PARAM_FIELD_ESTIMATED_NUM_PPN],
+                                        [], [],
+                                        [#include <ucp/api/ucp.h>])
+                         AC_CHECK_DECLS([UCP_WORKER_ATTR_FIELD_ADDRESS_FLAGS],
+                                        [AC_DEFINE([HAVE_UCP_WORKER_ADDRESS_FLAGS], [1],
+                                                   [have worker address attribute])], [],
+                                        [#include <ucp/api/ucp.h>])
+                         AC_CHECK_DECLS([UCP_ATTR_FIELD_MEMORY_TYPES],
+                                        [AC_DEFINE([HAVE_UCP_ATTR_MEMORY_TYPES], [1],
+                                                   [have memory types attribute])], [],
+                                        [#include <ucp/api/ucp.h>])
+                         AC_CHECK_DECLS([ucp_tag_send_nbx,
+                                         ucp_tag_send_sync_nbx,
+                                         ucp_tag_recv_nbx],
+                                        [], [],
+                                        [#include <ucp/api/ucp.h>])
+                         AC_CHECK_TYPES([ucp_request_param_t],
+                                        [], [],
+                                        [[#include <ucp/api/ucp.h>]])
+                        ])
                   CPPFLAGS=$old_CPPFLAGS
 
                   OPAL_SUMMARY_ADD([[Transports]],[[Open UCX]],[$1],[$ompi_check_ucx_happy])])])
+10 −6		NEWS
+3 −0		config/Makefile.am
+41 −0		config/pmix_check_cflags.m4
+51 −165		config/pmix_setup_cc.m4
+63 −0		include/pmix.h
+19 −17		include/pmix_common.h.in
+3 −0		include/pmix_deprecated.h
+1 −4		src/atomics/sys/atomic_impl.h
+9 −0		src/client/pmix_client.c
+25 −0		src/common/pmix_data.c
+10 −9		src/mca/base/pmix_mca_base_var.c
+73 −0		src/mca/bfrops/base/base.h
+193 −0		src/mca/bfrops/base/bfrop_base_copy.c
+99 −1		src/mca/bfrops/base/bfrop_base_fns.c
+356 −0		src/mca/bfrops/base/bfrop_base_pack.c
+208 −0		src/mca/bfrops/base/bfrop_base_print.c
+14 −1		src/mca/bfrops/base/bfrop_base_stubs.c
+504 −1		src/mca/bfrops/base/bfrop_base_unpack.c
+1 −1		src/mca/bfrops/bfrops_types.h
+2 −1		src/mca/bfrops/v4/bfrop_pmix4_component.c
+54 −0		src/mca/bfrops/v41/Makefile.am
+852 −0		src/mca/bfrops/v41/bfrop_pmix41.c
+35 −0		src/mca/bfrops/v41/bfrop_pmix41.h
+100 −0		src/mca/bfrops/v41/bfrop_pmix41_component.c
+11 −6		src/mca/pnet/base/pnet_base_fns.c
+8 −1		src/mca/ptl/base/ptl_base_connection_hdlr.c
+16 −2		src/mca/ptl/base/ptl_base_fns.c
+1 −1		src/mca/ptl/base/ptl_base_listener.c
+3 −0		src/mca/ptl/ptl_types.h
+6 −0		src/server/pmix_server.c
+37 −13		src/server/pmix_server_ops.c