Merge pull request #7745 from rhc54/topic/prt

Sync up with PRRTE and cleanup stale code

Author: rhc54

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])

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
     }
 
     /*