From 4468691eebe5feb3f8710073d00340e60ed4ec30 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Sat, 16 May 2020 14:48:31 -0700 Subject: [PATCH] Sync up with PRRTE and cleanup stale code Signed-off-by: Ralph Castain --- config/ompi_setup_prrte.m4 | 2 +- ompi/runtime/ompi_mpi_finalize.c | 15 --------------- prrte | 2 +- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/config/ompi_setup_prrte.m4 b/config/ompi_setup_prrte.m4 index 5ae4c2059d..4b672d7cd6 100644 --- a/config/ompi_setup_prrte.m4 +++ b/config/ompi_setup_prrte.m4 @@ -114,7 +114,7 @@ AC_DEFUN([OMPI_SETUP_PRRTE],[ opal_prrte_args="$opal_prrte_args --with-platform=$with_prrte_platform" fi # add the extra libs - opal_prrte_args="$opal_prrte_args --with-prrte-extra-lib=\"$opal_prrte_extra_libs\" --with-prrte-extra-ltlib=\"$opal_prrte_extra_ltlibs\"" + opal_prrte_args="$opal_prrte_args --with-prte-extra-lib=\"$opal_prrte_extra_libs\" --with-prte-extra-ltlib=\"$opal_prrte_extra_ltlibs\"" AC_MSG_CHECKING([final prrte configure args]) AC_MSG_RESULT([$opal_prrte_args]) diff --git a/ompi/runtime/ompi_mpi_finalize.c b/ompi/runtime/ompi_mpi_finalize.c index ff746870ce..4d3db4a697 100644 --- a/ompi/runtime/ompi_mpi_finalize.c +++ b/ompi/runtime/ompi_mpi_finalize.c @@ -250,7 +250,6 @@ int ompi_mpi_finalize(void) https://svn.open-mpi.org/trac/ompi/ticket/4669#comment:4 for more details). */ if (!ompi_async_mpi_finalize && !ompi_singleton) { -#ifdef PMIx_Fence_nb active = true; OPAL_POST_OBJECT(&active); /* Note that use of the non-blocking PMIx fence will @@ -267,20 +266,6 @@ int ompi_mpi_finalize(void) active = false; } OMPI_LAZY_WAIT_FOR_COMPLETION(active); -#else - /* However, we cannot guarantee that the provided PMIx has - * fence_nb. If it doesn't, then do the best we can: an MPI - * barrier on COMM_WORLD (which isn't the best because of the - * reasons cited above), followed by a blocking PMIx fence - * (which does not call opal_progress()). */ - ompi_communicator_t *comm = &ompi_mpi_comm_world.comm; - comm->c_coll->coll_barrier(comm, comm->c_coll->coll_barrier_module); - - if (PMIX_SUCCESS != (rc = PMIx_Fence(NULL, 0, NULL, 0))) { - ret = opal_pmix_convert_status(rc); - OMPI_ERROR_LOG(ret); - } -#endif } /* diff --git a/prrte b/prrte index 62d961b84d..681496e383 160000 --- a/prrte +++ b/prrte @@ -1 +1 @@ -Subproject commit 62d961b84dd0cef164cd7880503b99c54242b2a4 +Subproject commit 681496e383bfc2ee7f4b77fa14e38a0bff5b5bd3