Skip to content

Commit 2a87b74

Browse files
bwbarrettbwbarrett
committed
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. Note: The cherry-pick to v5.0.x does not update the submodule branches to master. Instead, it resumes tracking the HEAD of the PMIx 4.1 and PRRTE 2.0 branches. Signed-off-by: Brian Barrett <bbarrett@amazon.com> (cherry picked from commit 2367176) Signed-off-by: Brian Barrett <bbarrett@amazon.com>
1 parent 139abf5 commit 2a87b74

File tree

4 files changed

+23
-25
lines changed

4 files changed

+23
-25
lines changed

‎3rd-party/openpmix

Submodule openpmix updated 120 files

‎3rd-party/prrte

Submodule prrte updated 130 files

‎config/ompi_setup_prrte.m4

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ AC_DEFUN([_OMPI_SETUP_PRRTE_INTERNAL], [
147147
148148
internal_prrte_CPPFLAGS=
149149
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/\""
150-
internal_prrte_libs=
151150
152151
# Set --enable-prte-prefix-by-default to the deprecated options,
153152
# if they were specified. Otherwise, set it to enabled if the
@@ -159,19 +158,19 @@ AC_DEFUN([_OMPI_SETUP_PRRTE_INTERNAL], [
159158
[internal_prrte_args="$internal_prrte_args --enable-prte-prefix-by-default"])
160159
161160
AS_IF([test "$opal_libevent_mode" = "internal"],
162-
[internal_prrte_args="$internal_prrte_args --with-libevent-header=$opal_libevent_header"
163-
internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_libevent_CPPFLAGS"
164-
internal_prrte_libs="$internal_prrte_libs $opal_libevent_LIBS"])
161+
[internal_prrte_args="$internal_prrte_args --with-libevent --disable-libevent-lib-checks"
162+
internal_prrte_args="$internal_prrte_args --with-libevent-extra-libs=\"$opal_libevent_LIBS\""
163+
internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_libevent_CPPFLAGS"])
165164
166165
AS_IF([test "$opal_hwloc_mode" = "internal"],
167-
[internal_prrte_args="$internal_prrte_args --with-hwloc-header=$opal_hwloc_header"
168-
internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_hwloc_CPPFLAGS"
169-
internal_prrte_libs="$internal_prrte_libs $opal_hwloc_LIBS"])
166+
[internal_prrte_args="$internal_prrte_args --disable-hwloc-lib-checks"
167+
internal_prrte_args="$internal_prrte_args --with-hwloc-extra-libs=\"$opal_hwloc_LIBS\""
168+
internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_hwloc_CPPFLAGS"])
170169
171170
AS_IF([test "$opal_pmix_mode" = "internal"],
172-
[internal_prrte_args="$internal_prrte_args --with-pmix-header=$opal_pmix_header"
173-
internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_pmix_CPPFLAGS"
174-
internal_prrte_libs="$internal_prrte_libs $opal_pmix_LIBS"])
171+
[internal_prrte_args="$internal_prrte_args --disable-pmix-lib-checks"
172+
internal_prrte_args="$internal_prrte_args --with-pmix-extra-libs=\"$opal_pmix_LIBS\""
173+
internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_pmix_CPPFLAGS"])
175174
176175
AC_MSG_CHECKING([if PMIx version is 4.0.0 or greater])
177176
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <pmix_version.h>]],
@@ -190,8 +189,6 @@ AC_DEFUN([_OMPI_SETUP_PRRTE_INTERNAL], [
190189
AC_MSG_WARN([--without-prrte option.])
191190
AC_MSG_ERROR([Cannot continue])])
192191
193-
# add the extra libs
194-
internal_prrte_args="$internal_prrte_args --with-prte-extra-lib=\"$internal_prrte_libs\" --with-prte-extra-ltlib=\"$internal_prrte_libs\""
195192
AS_IF([test "$with_ft" != "no"],
196193
[internal_prrte_args="--enable-prte-ft $internal_prrte_args"],
197194
[])

‎config/opal_config_pmix.m4

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ dnl application when opal is built as a static library.
6464
dnl * CPPFLAGS, LDFLAGS - Updated opal_pmix_CPPFLAGS and
6565
dnl opal_pmix_LDFLAGS.
6666
AC_DEFUN([OPAL_CONFIG_PMIX], [
67-
OPAL_VAR_SCOPE_PUSH([external_pmix_happy internal_pmix_happy internal_pmix_args internal_pmix_libs internal_pmix_CPPFLAGS])
67+
OPAL_VAR_SCOPE_PUSH([external_pmix_happy internal_pmix_happy internal_pmix_args internal_pmix_wrapper_libs internal_pmix_CPPFLAGS])
6868
6969
opal_show_subtitle "Configuring PMIx"
7070
@@ -87,21 +87,20 @@ AC_DEFUN([OPAL_CONFIG_PMIX], [
8787
# desired.
8888
8989
internal_pmix_args="--without-tests-examples --enable-pmix-binaries --disable-pmix-backward-compatibility --disable-visibility"
90-
internal_pmix_libs=
90+
internal_pmix_wrapper_libs=
9191
internal_pmix_CPPFLAGS=
9292
9393
AS_IF([test "$opal_libevent_mode" = "internal"],
94-
[internal_pmix_args="$internal_pmix_args --with-libevent=cobuild"
95-
internal_pmix_CPPFLAGS="$internal_pmix_CPPFLAGS $opal_libevent_CPPFLAGS"
96-
internal_pmix_libs="$internal_pmix_libs $opal_libevent_LIBS"])
94+
[internal_pmix_args="$internal_pmix_args --with-libevent --disable-libevent-lib-checks"
95+
internal_pmix_args="$internal_pmix_args --with-libevent-extra-libs=\"$opal_libevent_LIBS\""
96+
internal_pmix_wrapper_libs="$internal_pmix_wrapper_libs \"$opal_libevent_WRAPPER_LIBS\""
97+
internal_pmix_CPPFLAGS="$internal_pmix_CPPFLAGS $opal_libevent_CPPFLAGS"])
9798
9899
AS_IF([test "$opal_hwloc_mode" = "internal"],
99-
[internal_pmix_args="$internal_pmix_args --with-hwloc=cobuild"
100-
internal_pmix_CPPFLAGS="$internal_pmix_CPPFLAGS $opal_hwloc_CPPFLAGS"
101-
internal_pmix_libs="$internal_pmix_libs $opal_hwloc_LIBS"])
102-
103-
AS_IF([test ! -z "$internal_pmix_libs"],
104-
[internal_pmix_args="$internal_pmix_args --with-pmix-extra-lib=\"$internal_pmix_libs\""])
100+
[internal_pmix_args="$internal_pmix_args --disable-hwloc-lib-checks"
101+
internal_pmix_args="$internal_pmix_args --with-hwloc-extra-libs=\"$opal_hwloc_LIBS\""
102+
internal_pmix_wrapper_libs="$internal_pmix_wrapper_libs \"$opal_hwloc_WRAPPER_LIBS\""
103+
internal_pmix_CPPFLAGS="$internal_pmix_CPPFLAGS $opal_hwloc_CPPFLAGS"])
105104
106105
if test "$WANT_DEBUG" = "1"; then
107106
internal_pmix_args="$internal_pmix_args --enable-debug"
@@ -114,6 +113,8 @@ AC_DEFUN([OPAL_CONFIG_PMIX], [
114113
OPAL_SUBDIR_ENV_CLEAN([opal_pmix_configure])
115114
AS_IF([test -n "$internal_pmix_CPPFLAGS"],
116115
[OPAL_SUBDIR_ENV_APPEND([CPPFLAGS], [$internal_pmix_CPPFLAGS])])
116+
AS_IF([test -n "$internal_pmix_wrapper_libs"],
117+
[inernal_pmix_args="$internal_pmix_args --with-wrapper-libs=\"$internal_pmix_wrapper_libs\""])
117118
PAC_CONFIG_SUBDIR_ARGS([3rd-party/openpmix], [$internal_pmix_args],
118119
[[--with-libevent=internal], [--with-hwloc=internal],
119120
[--with-libevent=external], [--with-hwloc=external],

0 commit comments

Comments
 (0)