From 7a3ec1b4628307e72e1648571035a8029f035dbd Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Mon, 13 Oct 2025 09:29:45 -0600 Subject: [PATCH] move shas for 3rd-party/openpmix and prrte Move prrte sha to head of https://github.com/open-mpi/prrte/tree/ompi_main (https://github.com/open-mpi/prrte/commit/9794e127f9d1bf930e52464d69e2fa541e6a31f7) Move openpmix sha to v6.0.0 tag minor adjustments to open mpi for renamed prrte binaries and more distinct configure output. Signed-off-by: Howard Pritchard --- 3rd-party/openpmix | 2 +- 3rd-party/prrte | 2 +- config/ompi_setup_prrte.m4 | 4 +++- ompi/dpm/dpm.c | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/3rd-party/openpmix b/3rd-party/openpmix index 08e41ed5629..e87b2ee832d 160000 --- a/3rd-party/openpmix +++ b/3rd-party/openpmix @@ -1 +1 @@ -Subproject commit 08e41ed5629b51832f5708181af6d89218c7a74e +Subproject commit e87b2ee832d249fadd61938a578aaee407b976b9 diff --git a/3rd-party/prrte b/3rd-party/prrte index 30cadc6746e..9794e127f9d 160000 --- a/3rd-party/prrte +++ b/3rd-party/prrte @@ -1 +1 @@ -Subproject commit 30cadc6746ebddd69ea42ca78b964398f782e4e3 +Subproject commit 9794e127f9d1bf930e52464d69e2fa541e6a31f7 diff --git a/config/ompi_setup_prrte.m4 b/config/ompi_setup_prrte.m4 index 28140bad066..2a56421e146 100644 --- a/config/ompi_setup_prrte.m4 +++ b/config/ompi_setup_prrte.m4 @@ -122,7 +122,9 @@ OPAL_VAR_SCOPE_PUSH([prrte_setup_internal_happy prrte_setup_external_happy targe AC_SUBST(OMPI_SCHIZO_OMPI_RST_CONTENT_DIR) AM_CONDITIONAL(OMPI_HAVE_PRRTE_RST, [test $OMPI_HAVE_PRRTE_RST -eq 1]) - OPAL_SUMMARY_ADD([Miscellaneous], [PRRTE], [], [$opal_prrte_mode]) + AS_IF([test "$OMPI_USING_INTERNAL_PRRTE" = "1"], + [OPAL_SUMMARY_ADD([Miscellaneous], [OMPI-RTE], [], ["yes"])], + [OPAL_SUMMARY_ADD([Miscellaneous], [PRRTE], [], [$opal_prrte_mode])]) OPAL_VAR_SCOPE_POP ]) diff --git a/ompi/dpm/dpm.c b/ompi/dpm/dpm.c index 4b5dbf623e1..ebf296ce4a5 100644 --- a/ompi/dpm/dpm.c +++ b/ompi/dpm/dpm.c @@ -1975,7 +1975,7 @@ static char *find_prte(void) #if OMPI_USING_INTERNAL_PRRTE /* 2) If using internal PRRTE, use our bindir. Note that this * will obey OPAL_PREFIX and OPAL_DESTDIR */ - opal_asprintf(&filename, "%s%sprte", opal_install_dirs.bindir, OPAL_PATH_SEP); + opal_asprintf(&filename, "%s%sompi-prte", opal_install_dirs.bindir, OPAL_PATH_SEP); return filename; #else