From 2979bb2ce8a7c459be7a7e24a6142a2e7ba9501f Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@pmix.org>
Date: Fri, 20 Mar 2020 12:28:08 -0700
Subject: [PATCH] Update PMIx and PRRTE to reduce mpirun complexity

Use "prte" instead of "prun" for proxy execution of cmds like mpirun.
This avoids the fork/exec-rendezvous complexities and should result in
more reliable operation.

Signed-off-by: Ralph Castain <rhc@pmix.org>
---
 ompi/tools/mpirun/Makefile.am | 8 ++++----
 opal/mca/pmix/pmix4x/openpmix | 2 +-
 prrte                         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ompi/tools/mpirun/Makefile.am b/ompi/tools/mpirun/Makefile.am
index 240a555ee1..732607e36c 100644
--- a/ompi/tools/mpirun/Makefile.am
+++ b/ompi/tools/mpirun/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019      Intel, Inc.  All rights reserved.
+# Copyright (c) 2019-2020 Intel, Inc.  All rights reserved.
 # Copyright (c) 2020      IBM Corporation.  All rights reserved.
 # $COPYRIGHT$
 #
@@ -10,9 +10,9 @@
 
 if OMPI_WANT_PRRTE
 install-exec-hook:
-	(cd $(DESTDIR)$(bindir); rm -f mpirun$(EXEEXT); $(LN_S) prun$(EXEEXT) mpirun$(EXEEXT))
-	(cd $(DESTDIR)$(bindir); rm -f mpiexec$(EXEEXT); $(LN_S) prun$(EXEEXT) mpiexec$(EXEEXT))
-	(cd $(DESTDIR)$(bindir); rm -f oshrun$(EXEEXT); $(LN_S) prun$(EXEEXT) oshrun$(EXEEXT))
+	(cd $(DESTDIR)$(bindir); rm -f mpirun$(EXEEXT); $(LN_S) prte$(EXEEXT) mpirun$(EXEEXT))
+	(cd $(DESTDIR)$(bindir); rm -f mpiexec$(EXEEXT); $(LN_S) prte$(EXEEXT) mpiexec$(EXEEXT))
+	(cd $(DESTDIR)$(bindir); rm -f oshrun$(EXEEXT); $(LN_S) prte$(EXEEXT) oshrun$(EXEEXT))
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/mpirun$(EXEEXT) \
diff --git a/opal/mca/pmix/pmix4x/openpmix b/opal/mca/pmix/pmix4x/openpmix
index 7d4350d66d..98d14d55f8 160000
--- a/opal/mca/pmix/pmix4x/openpmix
+++ b/opal/mca/pmix/pmix4x/openpmix
@@ -1 +1 @@
-Subproject commit 7d4350d66d61aa425868284e5c71fb504c092cde
+Subproject commit 98d14d55f8d4bd27fe6eb1e508c336702e1fbf76
diff --git a/prrte b/prrte
index 6a777040e3..9add90bcfe 160000
--- a/prrte
+++ b/prrte
@@ -1 +1 @@
-Subproject commit 6a777040e377819062db1532db67d6ed0d2a005e
+Subproject commit 9add90bcfe88af1994914a78544d6236327be10e