Skip to content

Commit 344346f

Browse files
committed
Provide hooks for PRRTE and PMIx platform files
Signed-off-by: Ralph Castain <rhc@pmix.org>
1 parent 4bdb5a8 commit 344346f

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

config/ompi_setup_prrte.m4

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ AC_DEFUN([OMPI_SETUP_PRRTE],[
3737
AC_ARG_ENABLE([internal-rte],
3838
[AC_HELP_STRING([--enable-internal-rte],
3939
[Enable internal runtime support and provide mpiexec/mpirun (default: enabled)])])
40+
41+
AC_ARG_WITH([prrte-platform],
42+
[AC_HELP_STRING([--with-prrte-platform],
43+
[Platform file to use when building the internal PRRTE runtime support])])
44+
4045
AC_MSG_CHECKING([if RTE support is enabled])
4146
if test "$enable_internal_rte" != "no"; then
4247
AC_MSG_RESULT([yes])
@@ -72,6 +77,9 @@ AC_DEFUN([OMPI_SETUP_PRRTE],[
7277
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"])
7378
AS_IF([test "$with_devel_headers" = "yes"],
7479
[opal_prrte_args="--with-devel-headers $opal_prrte_args"])
80+
if test ! -z $with_prrte_platform && test "$with_prrte_platform" != "yes"; then
81+
opal_prrte_args="$opal_prrte_args --with-platform=$with_prrte_platform"
82+
fi
7583
# add the extra libs
7684
opal_prrte_args="$opal_prrte_args --with-prrte-extra-lib=$OMPI_TOP_BUILDDIR/opal/libopen-pal.la --with-prrte-extra-ltlib=$OMPI_TOP_BUILDDIR/opal/libopen-pal.la"
7785

opal/mca/pmix/pmix4x/configure.m4

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
1414
# All rights reserved.
1515
# Copyright (c) 2010-2017 Cisco Systems, Inc. All rights reserved.
16-
# Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
16+
# Copyright (c) 2013-2020 Intel, Inc. All rights reserved.
1717
# Copyright (c) 2015-2016 Research Organization for Information Science
1818
# and Technology (RIST). All rights reserved.
1919
# $COPYRIGHT$
@@ -82,6 +82,10 @@ AC_DEFUN([MCA_opal_pmix_pmix4x_CONFIG],[
8282
AC_ARG_ENABLE([pmix-timing],
8383
[AC_HELP_STRING([--enable-pmix-timing],
8484
[Enable PMIx timing measurements (default: disabled)])])
85+
AC_ARG_WITH([pmix-platform],
86+
[AC_HELP_STRING([--with-pmix-platform],
87+
[Platform file to use when building the internal PMIx support])])
88+
8589
AC_MSG_CHECKING([if PMIx timing is enabled])
8690
if test "$enable_pmix_timing" = "yes"; then
8791
AC_MSG_RESULT([yes])
@@ -99,6 +103,9 @@ AC_DEFUN([MCA_opal_pmix_pmix4x_CONFIG],[
99103
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"])
100104
AS_IF([test "$with_devel_headers" = "yes"],
101105
[opal_pmix_pmix4x_args="--with-devel-headers $opal_pmix_pmix4x_args"])
106+
if test ! -z $with_pmix_platform && test "$with_pix_platform" != "yes"; then
107+
opal_pmix_pmix4x_args="$opal_pmix_pmix4x_args --with-platform=$with_pmix_platform"
108+
fi
102109
CPPFLAGS="-I$OPAL_TOP_SRCDIR -I$OPAL_TOP_BUILDDIR -I$OPAL_TOP_SRCDIR/opal/include -I$OPAL_TOP_BUILDDIR/opal/include $CPPFLAGS"
103110

104111
OPAL_CONFIG_SUBDIR([$opal_pmix_pmix4x_basedir/openpmix],

0 commit comments

Comments
 (0)