From 23671767778bb62ab8bbbecc3767f4bfc9fee6ce Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Tue, 9 Nov 2021 09:07:00 -0800 Subject: [PATCH] Resume tracking PMIx/PRRTE master branches Update our calls to PMIX/PRRTE configure when using internal versions of the packages to support more recent versions of the packages. Bump the pmix/prrte submodule pointers to resume tracking their master branches. Signed-off-by: Brian Barrett --- 3rd-party/openpmix | 2 +- 3rd-party/prrte | 2 +- config/ompi_setup_prrte.m4 | 21 +++++++++------------ config/opal_config_pmix.m4 | 23 ++++++++++++----------- 4 files changed, 23 insertions(+), 25 deletions(-) diff --git a/3rd-party/openpmix b/3rd-party/openpmix index 9984334f91e..0afdd41215d 160000 --- a/3rd-party/openpmix +++ b/3rd-party/openpmix @@ -1 +1 @@ -Subproject commit 9984334f91eadd17ebf3618b95d74fbca9c708fc +Subproject commit 0afdd41215da9590e848aa25d738bc46871967f9 diff --git a/3rd-party/prrte b/3rd-party/prrte index b2d1226461f..9f43d8e8153 160000 --- a/3rd-party/prrte +++ b/3rd-party/prrte @@ -1 +1 @@ -Subproject commit b2d1226461f9be2689779a2f3b8503987559f69e +Subproject commit 9f43d8e81534d88de3a0923095e17458328b8cb7 diff --git a/config/ompi_setup_prrte.m4 b/config/ompi_setup_prrte.m4 index d39bf15fe21..271516298ce 100644 --- a/config/ompi_setup_prrte.m4 +++ b/config/ompi_setup_prrte.m4 @@ -147,7 +147,6 @@ AC_DEFUN([_OMPI_SETUP_PRRTE_INTERNAL], [ internal_prrte_CPPFLAGS= internal_prrte_args="--with-proxy-version-string=$OPAL_VERSION --with-proxy-package-name=\"Open MPI\" --with-proxy-bugreport=\"https://www.open-mpi.org/community/help/\"" - internal_prrte_libs= # Set --enable-prte-prefix-by-default to the deprecated options, # if they were specified. Otherwise, set it to enabled if the @@ -159,19 +158,19 @@ AC_DEFUN([_OMPI_SETUP_PRRTE_INTERNAL], [ [internal_prrte_args="$internal_prrte_args --enable-prte-prefix-by-default"]) AS_IF([test "$opal_libevent_mode" = "internal"], - [internal_prrte_args="$internal_prrte_args --with-libevent-header=$opal_libevent_header" - internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_libevent_CPPFLAGS" - internal_prrte_libs="$internal_prrte_libs $opal_libevent_LIBS"]) + [internal_prrte_args="$internal_prrte_args --with-libevent --disable-libevent-lib-checks" + internal_prrte_args="$internal_prrte_args --with-libevent-extra-libs=\"$opal_libevent_LIBS\"" + internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_libevent_CPPFLAGS"]) AS_IF([test "$opal_hwloc_mode" = "internal"], - [internal_prrte_args="$internal_prrte_args --with-hwloc-header=$opal_hwloc_header" - internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_hwloc_CPPFLAGS" - internal_prrte_libs="$internal_prrte_libs $opal_hwloc_LIBS"]) + [internal_prrte_args="$internal_prrte_args --disable-hwloc-lib-checks" + internal_prrte_args="$internal_prrte_args --with-hwloc-extra-libs=\"$opal_hwloc_LIBS\"" + internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_hwloc_CPPFLAGS"]) AS_IF([test "$opal_pmix_mode" = "internal"], - [internal_prrte_args="$internal_prrte_args --with-pmix-header=$opal_pmix_header" - internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_pmix_CPPFLAGS" - internal_prrte_libs="$internal_prrte_libs $opal_pmix_LIBS"]) + [internal_prrte_args="$internal_prrte_args --disable-pmix-lib-checks" + internal_prrte_args="$internal_prrte_args --with-pmix-extra-libs=\"$opal_pmix_LIBS\"" + internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_pmix_CPPFLAGS"]) AC_MSG_CHECKING([if PMIx version is 4.0.0 or greater]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], @@ -190,8 +189,6 @@ AC_DEFUN([_OMPI_SETUP_PRRTE_INTERNAL], [ AC_MSG_WARN([--without-prrte option.]) AC_MSG_ERROR([Cannot continue])]) - # add the extra libs - internal_prrte_args="$internal_prrte_args --with-prte-extra-lib=\"$internal_prrte_libs\" --with-prte-extra-ltlib=\"$internal_prrte_libs\"" AS_IF([test "$with_ft" != "no"], [internal_prrte_args="--enable-prte-ft $internal_prrte_args"], []) diff --git a/config/opal_config_pmix.m4 b/config/opal_config_pmix.m4 index c6cf4090bb8..a5ad5b8eabe 100644 --- a/config/opal_config_pmix.m4 +++ b/config/opal_config_pmix.m4 @@ -64,7 +64,7 @@ dnl application when opal is built as a static library. dnl * CPPFLAGS, LDFLAGS - Updated opal_pmix_CPPFLAGS and dnl opal_pmix_LDFLAGS. AC_DEFUN([OPAL_CONFIG_PMIX], [ - OPAL_VAR_SCOPE_PUSH([external_pmix_happy internal_pmix_happy internal_pmix_args internal_pmix_libs internal_pmix_CPPFLAGS]) + OPAL_VAR_SCOPE_PUSH([external_pmix_happy internal_pmix_happy internal_pmix_args internal_pmix_wrapper_libs internal_pmix_CPPFLAGS]) opal_show_subtitle "Configuring PMIx" @@ -87,21 +87,20 @@ AC_DEFUN([OPAL_CONFIG_PMIX], [ # desired. internal_pmix_args="--without-tests-examples --enable-pmix-binaries --disable-pmix-backward-compatibility --disable-visibility" - internal_pmix_libs= + internal_pmix_wrapper_libs= internal_pmix_CPPFLAGS= AS_IF([test "$opal_libevent_mode" = "internal"], - [internal_pmix_args="$internal_pmix_args --with-libevent=cobuild" - internal_pmix_CPPFLAGS="$internal_pmix_CPPFLAGS $opal_libevent_CPPFLAGS" - internal_pmix_libs="$internal_pmix_libs $opal_libevent_LIBS"]) + [internal_pmix_args="$internal_pmix_args --with-libevent --disable-libevent-lib-checks" + internal_pmix_args="$internal_pmix_args --with-libevent-extra-libs=\"$opal_libevent_LIBS\"" + internal_pmix_wrapper_libs="$internal_pmix_wrapper_libs \"$opal_libevent_WRAPPER_LIBS\"" + internal_pmix_CPPFLAGS="$internal_pmix_CPPFLAGS $opal_libevent_CPPFLAGS"]) AS_IF([test "$opal_hwloc_mode" = "internal"], - [internal_pmix_args="$internal_pmix_args --with-hwloc=cobuild" - internal_pmix_CPPFLAGS="$internal_pmix_CPPFLAGS $opal_hwloc_CPPFLAGS" - internal_pmix_libs="$internal_pmix_libs $opal_hwloc_LIBS"]) - - AS_IF([test ! -z "$internal_pmix_libs"], - [internal_pmix_args="$internal_pmix_args --with-pmix-extra-lib=\"$internal_pmix_libs\""]) + [internal_pmix_args="$internal_pmix_args --disable-hwloc-lib-checks" + internal_pmix_args="$internal_pmix_args --with-hwloc-extra-libs=\"$opal_hwloc_LIBS\"" + internal_pmix_wrapper_libs="$internal_pmix_wrapper_libs \"$opal_hwloc_WRAPPER_LIBS\"" + internal_pmix_CPPFLAGS="$internal_pmix_CPPFLAGS $opal_hwloc_CPPFLAGS"]) if test "$WANT_DEBUG" = "1"; then internal_pmix_args="$internal_pmix_args --enable-debug" @@ -114,6 +113,8 @@ AC_DEFUN([OPAL_CONFIG_PMIX], [ OPAL_SUBDIR_ENV_CLEAN([opal_pmix_configure]) AS_IF([test -n "$internal_pmix_CPPFLAGS"], [OPAL_SUBDIR_ENV_APPEND([CPPFLAGS], [$internal_pmix_CPPFLAGS])]) + AS_IF([test -n "$internal_pmix_wrapper_libs"], + [inernal_pmix_args="$internal_pmix_args --with-wrapper-libs=\"$internal_pmix_wrapper_libs\""]) PAC_CONFIG_SUBDIR_ARGS([3rd-party/openpmix], [$internal_pmix_args], [[--with-libevent=internal], [--with-hwloc=internal], [--with-libevent=external], [--with-hwloc=external],