From 55c7e327c6fc51ae5c886c8d3ee9dae141135f35 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Sun, 31 Mar 2024 09:14:18 -0400 Subject: [PATCH 1/3] Update PRRTE git submodule to point to Open MPI fork Shift away from the upstream PRRTE (https://github.com/openpmix/prrte) and point to an Open MPI-specific fork for future releases of Open MPI. The direct consequence of this is that the PRRTE bundled in Open MPI will now be an Open MPI-specific fork of PRRTE. Tighter integration between Open MPI and this bundled, Open MPI-specific PRRTE will likely happen over time, but right now, it's functionallty identical as the upstream PRRTE. Note: this commit both updates to the current upstream PRRTE master branch tip (5cde35d439) plus one additional Open MPI-specific commit (1d867e8498) that edits the PRRTE VERSION file to include "ompi" to the version string. Signed-off-by: Jeff Squyres --- .gitmodules | 2 +- 3rd-party/prrte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index d50b377cc73..6914849f45a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "prrte"] path = 3rd-party/prrte - url = ../../openpmix/prrte + url = ../../open-mpi/prrte branch = master [submodule "openpmix"] path = 3rd-party/openpmix diff --git a/3rd-party/prrte b/3rd-party/prrte index 4f27008906d..1d867e84981 160000 --- a/3rd-party/prrte +++ b/3rd-party/prrte @@ -1 +1 @@ -Subproject commit 4f27008906d96845e22df6502d6a9a29d98dec83 +Subproject commit 1d867e84981077bffda9ad9d44ff415a3f6d91c4 From 0cf8071ab99cfd9871bffc115d9a38df62be528b Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Tue, 2 Apr 2024 13:09:54 -0600 Subject: [PATCH 2/3] openpmix: advance to pick up local group fixes 2f225b0748febe4df3695ec89d16a33ce155394e Fix local group operations and cleanup to pass all examples Signed-off-by: Howard Pritchard --- 3rd-party/openpmix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rd-party/openpmix b/3rd-party/openpmix index 6f81bfd163f..2f225b0748f 160000 --- a/3rd-party/openpmix +++ b/3rd-party/openpmix @@ -1 +1 @@ -Subproject commit 6f81bfd163f3275d2b0630974968c82759dd4439 +Subproject commit 2f225b0748febe4df3695ec89d16a33ce155394e From e3f0adab475f2376f6e2b470de4ff8a73e60fac3 Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Mon, 29 Apr 2024 14:07:34 -0600 Subject: [PATCH 3/3] openpmix: advance sha to 213956cf also rebase to pull in some cid fixes for inter communicators Signed-off-by: Howard Pritchard --- 3rd-party/openpmix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rd-party/openpmix b/3rd-party/openpmix index 2f225b0748f..213956cf00f 160000 --- a/3rd-party/openpmix +++ b/3rd-party/openpmix @@ -1 +1 @@ -Subproject commit 2f225b0748febe4df3695ec89d16a33ce155394e +Subproject commit 213956cf00ff164230de06b9887a9412bf1e1dad