From 344346f27ef0b4819755a222afa2762ff22ab154 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Sat, 15 Feb 2020 08:40:56 -0800 Subject: [PATCH] Provide hooks for PRRTE and PMIx platform files Signed-off-by: Ralph Castain --- config/ompi_setup_prrte.m4 | 8 ++++++++ opal/mca/pmix/pmix4x/configure.m4 | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/config/ompi_setup_prrte.m4 b/config/ompi_setup_prrte.m4 index 593bcd1cff..d57b0d3c86 100644 --- a/config/ompi_setup_prrte.m4 +++ b/config/ompi_setup_prrte.m4 @@ -37,6 +37,11 @@ AC_DEFUN([OMPI_SETUP_PRRTE],[ AC_ARG_ENABLE([internal-rte], [AC_HELP_STRING([--enable-internal-rte], [Enable internal runtime support and provide mpiexec/mpirun (default: enabled)])]) + + AC_ARG_WITH([prrte-platform], + [AC_HELP_STRING([--with-prrte-platform], + [Platform file to use when building the internal PRRTE runtime support])]) + AC_MSG_CHECKING([if RTE support is enabled]) if test "$enable_internal_rte" != "no"; then AC_MSG_RESULT([yes]) @@ -72,6 +77,9 @@ AC_DEFUN([OMPI_SETUP_PRRTE],[ CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"]) AS_IF([test "$with_devel_headers" = "yes"], [opal_prrte_args="--with-devel-headers $opal_prrte_args"]) + if test ! -z $with_prrte_platform && test "$with_prrte_platform" != "yes"; then + opal_prrte_args="$opal_prrte_args --with-platform=$with_prrte_platform" + fi # add the extra libs 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" diff --git a/opal/mca/pmix/pmix4x/configure.m4 b/opal/mca/pmix/pmix4x/configure.m4 index 4e07d0d75a..f977f9c34f 100644 --- a/opal/mca/pmix/pmix4x/configure.m4 +++ b/opal/mca/pmix/pmix4x/configure.m4 @@ -13,7 +13,7 @@ # Copyright (c) 2011-2013 Los Alamos National Security, LLC. # All rights reserved. # Copyright (c) 2010-2017 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2013-2019 Intel, Inc. All rights reserved. +# Copyright (c) 2013-2020 Intel, Inc. All rights reserved. # Copyright (c) 2015-2016 Research Organization for Information Science # and Technology (RIST). All rights reserved. # $COPYRIGHT$ @@ -82,6 +82,10 @@ AC_DEFUN([MCA_opal_pmix_pmix4x_CONFIG],[ AC_ARG_ENABLE([pmix-timing], [AC_HELP_STRING([--enable-pmix-timing], [Enable PMIx timing measurements (default: disabled)])]) + AC_ARG_WITH([pmix-platform], + [AC_HELP_STRING([--with-pmix-platform], + [Platform file to use when building the internal PMIx support])]) + AC_MSG_CHECKING([if PMIx timing is enabled]) if test "$enable_pmix_timing" = "yes"; then AC_MSG_RESULT([yes]) @@ -99,6 +103,9 @@ AC_DEFUN([MCA_opal_pmix_pmix4x_CONFIG],[ CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"]) AS_IF([test "$with_devel_headers" = "yes"], [opal_pmix_pmix4x_args="--with-devel-headers $opal_pmix_pmix4x_args"]) + if test ! -z $with_pmix_platform && test "$with_pix_platform" != "yes"; then + opal_pmix_pmix4x_args="$opal_pmix_pmix4x_args --with-platform=$with_pmix_platform" + fi CPPFLAGS="-I$OPAL_TOP_SRCDIR -I$OPAL_TOP_BUILDDIR -I$OPAL_TOP_SRCDIR/opal/include -I$OPAL_TOP_BUILDDIR/opal/include $CPPFLAGS" OPAL_CONFIG_SUBDIR([$opal_pmix_pmix4x_basedir/openpmix],