From 871670d7bae5a2b44bda902c0a2b84dfde85a9f4 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Mon, 28 Oct 2024 09:06:50 -0600 Subject: [PATCH] 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..39adf49167c 160000 --- a/3rd-party/openpmix +++ b/3rd-party/openpmix @@ -1 +1 @@ -Subproject commit 08e41ed5629b51832f5708181af6d89218c7a74e +Subproject commit 39adf49167c3de05abf64fc42df820e5bd701ae3 diff --git a/3rd-party/prrte b/3rd-party/prrte index 30cadc6746e..12fc7d80e73 160000 --- a/3rd-party/prrte +++ b/3rd-party/prrte @@ -1 +1 @@ -Subproject commit 30cadc6746ebddd69ea42ca78b964398f782e4e3 +Subproject commit 12fc7d80e73f0410951f003610c9077aa659a9ff