From 9ec3934f10a2c79ec1987244e50ea4e6b84d09cd Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Mon, 28 Oct 2024 09:06:50 -0600 Subject: [PATCH 1/3] Check upstream master branches for PMIx/PRRTE Repoint submodules. Disable han and hcoll components to avoid bug when testing singleton comm_spawn. Signed-off-by: Ralph Castain --- .github/workflows/ompi_mpi4py.yaml | 1 + .gitmodules | 4 ++-- 3rd-party/openpmix | 2 +- 3rd-party/prrte | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ompi_mpi4py.yaml b/.github/workflows/ompi_mpi4py.yaml index 8e3c450b4be..b10d56fb598 100644 --- a/.github/workflows/ompi_mpi4py.yaml +++ b/.github/workflows/ompi_mpi4py.yaml @@ -77,6 +77,7 @@ jobs: mkdir -p "$(dirname "$mca_params")" echo mpi_param_check = true >> "$mca_params" echo mpi_show_handle_leaks = true >> "$mca_params" + echo coll = ^han,hcoll >> "$mca_params" mca_params="$HOME/.prte/mca-params.conf" mkdir -p "$(dirname "$mca_params")" echo rmaps_default_mapping_policy = :oversubscribe >> "$mca_params" diff --git a/.gitmodules b/.gitmodules index 6914849f45a..67374ea5601 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,10 +1,10 @@ [submodule "prrte"] path = 3rd-party/prrte - url = ../../open-mpi/prrte + url = https://github.com/openpmix/prrte branch = master [submodule "openpmix"] path = 3rd-party/openpmix - url = ../../openpmix/openpmix.git + url = https://github.com/openpmix/openpmix branch = master [submodule "oac"] path = config/oac diff --git a/3rd-party/openpmix b/3rd-party/openpmix index 08e41ed5629..24593f714ea 160000 --- a/3rd-party/openpmix +++ b/3rd-party/openpmix @@ -1 +1 @@ -Subproject commit 08e41ed5629b51832f5708181af6d89218c7a74e +Subproject commit 24593f714ead151c443d67b47b7be20b3d74c274 diff --git a/3rd-party/prrte b/3rd-party/prrte index 30cadc6746e..cfda8004f79 160000 --- a/3rd-party/prrte +++ b/3rd-party/prrte @@ -1 +1 @@ -Subproject commit 30cadc6746ebddd69ea42ca78b964398f782e4e3 +Subproject commit cfda8004f7907ad3d5d7d7e748f8722fdcc04b59 From 2c6d55f24da3ce6452ad695a1dcb3bce1ca494de Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Mon, 25 Nov 2024 07:17:54 -0700 Subject: [PATCH 2/3] Continue testing Signed-off-by: Ralph Castain --- 3rd-party/openpmix | 2 +- 3rd-party/prrte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/3rd-party/openpmix b/3rd-party/openpmix index 24593f714ea..b0b7513e7e0 160000 --- a/3rd-party/openpmix +++ b/3rd-party/openpmix @@ -1 +1 @@ -Subproject commit 24593f714ead151c443d67b47b7be20b3d74c274 +Subproject commit b0b7513e7e0045f2c0f257773bc1554924be3086 diff --git a/3rd-party/prrte b/3rd-party/prrte index cfda8004f79..4f6410810b8 160000 --- a/3rd-party/prrte +++ b/3rd-party/prrte @@ -1 +1 @@ -Subproject commit cfda8004f7907ad3d5d7d7e748f8722fdcc04b59 +Subproject commit 4f6410810b8746593a9c4e09ba511d91a4ba8613 From 46c295f449951d8dc894a2efa4935160bd3f3ebb Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Mon, 25 Nov 2024 09:08:20 -0700 Subject: [PATCH 3/3] Update - remove debug output Signed-off-by: Ralph Castain --- 3rd-party/openpmix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rd-party/openpmix b/3rd-party/openpmix index b0b7513e7e0..086b88ce7c6 160000 --- a/3rd-party/openpmix +++ b/3rd-party/openpmix @@ -1 +1 @@ -Subproject commit b0b7513e7e0045f2c0f257773bc1554924be3086 +Subproject commit 086b88ce7c6e6996a4970c6d09cd05cbdece697d