From 677ce0a69fdec15db537c134d6e4231d896450b0 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Wed, 6 Feb 2019 17:15:44 -0800 Subject: [PATCH 1/2] Update PMIx configure logic in the embedded component PMIx is removing the --enable-embedded-libevent and --enable-embedded-hwloc flags as they are confusing users. Instead, we will use the --enable-embedded-mode to handle both of these options. Update the embedded configury to handle it. Signed-off-by: Ralph Castain --- opal/mca/pmix/pmix4x/configure.m4 | 11 +---------- opal/mca/pmix/pmix4x/pmix/config/pmix_setup_hwloc.m4 | 6 +----- .../pmix/pmix4x/pmix/config/pmix_setup_libevent.m4 | 6 +----- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/opal/mca/pmix/pmix4x/configure.m4 b/opal/mca/pmix/pmix4x/configure.m4 index 3a649fa2d8..60de20e9b0 100644 --- a/opal/mca/pmix/pmix4x/configure.m4 +++ b/opal/mca/pmix/pmix4x/configure.m4 @@ -37,10 +37,6 @@ AC_DEFUN([MCA_opal_pmix_pmix4x_CONFIG],[ opal_pmix_pmix4x_save_LDFLAGS=$LDFLAGS opal_pmix_pmix4x_save_LIBS=$LIBS - AC_ARG_ENABLE([install-libpmix], - [AC_HELP_STRING([--enable-install-libpmix], - [Enable a native PMIx library and headers in the OMPI install location (default: disabled)])]) - AC_ARG_ENABLE([pmix-timing], [AC_HELP_STRING([--enable-pmix-timing], [Enable PMIx timing measurements (default: disabled)])]) @@ -53,17 +49,12 @@ AC_DEFUN([MCA_opal_pmix_pmix4x_CONFIG],[ opal_pmix_pmix4x_timing_flag=--disable-pmix-timing fi - opal_pmix_pmix4x_args="$opal_pmix_pmix4x_timing_flag --without-tests-examples --disable-pmix-binaries --disable-pmix-backward-compatibility --disable-visibility --enable-embedded-libevent --with-libevent-header=\\\"opal/mca/event/$opal_event_base_include\\\" --enable-embedded-hwloc --with-hwloc-header=\\\"$opal_hwloc_base_include\\\"" + opal_pmix_pmix4x_args="$opal_pmix_pmix4x_timing_flag --without-tests-examples --with-pmix-symbol-rename=OPAL_MCA_PMIX4X_ --disable-pmix-binaries --disable-pmix-backward-compatibility --disable-visibility --enable-embedded-mode --with-libevent-header=\\\"opal/mca/event/$opal_event_base_include\\\" --with-hwloc-header=\\\"$opal_hwloc_base_include\\\"" AS_IF([test "$enable_debug" = "yes"], [opal_pmix_pmix4x_args="--enable-debug $opal_pmix_pmix4x_args" CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS -g"], [opal_pmix_pmix4x_args="--disable-debug $opal_pmix_pmix4x_args" CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"]) - AC_MSG_CHECKING([if want to install standalone libpmix]) - AS_IF([test "$enable_install_libpmix" = "yes"], - [AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no]) - opal_pmix_pmix4x_args="--with-pmix-symbol-rename=OPAL_MCA_PMIX4X_ --enable-embedded-mode $opal_pmix_pmix4x_args"]) AS_IF([test "$with_devel_headers" = "yes"], [opal_pmix_pmix4x_args="--with-devel-headers $opal_pmix_pmix4x_args"]) CPPFLAGS="-I$OPAL_TOP_SRCDIR -I$OPAL_TOP_BUILDDIR -I$OPAL_TOP_SRCDIR/opal/include -I$OPAL_TOP_BUILDDIR/opal/include $CPPFLAGS" diff --git a/opal/mca/pmix/pmix4x/pmix/config/pmix_setup_hwloc.m4 b/opal/mca/pmix/pmix4x/pmix/config/pmix_setup_hwloc.m4 index 8f6ed75176..a17313259a 100644 --- a/opal/mca/pmix/pmix4x/pmix/config/pmix_setup_hwloc.m4 +++ b/opal/mca/pmix/pmix4x/pmix/config/pmix_setup_hwloc.m4 @@ -17,11 +17,7 @@ AC_DEFUN([PMIX_HWLOC_CONFIG],[ [AC_HELP_STRING([--with-hwloc-header=HEADER], [The value that should be included in C files to include hwloc.h])]) - AC_ARG_ENABLE([embedded-hwloc], - [AC_HELP_STRING([--enable-embedded-hwloc], - [Enable use of locally embedded hwloc])]) - - AS_IF([test "$enable_embedded_hwloc" = "yes"], + AS_IF([test "$pmix_mode" = "embedded"], [_PMIX_HWLOC_EMBEDDED_MODE], [_PMIX_HWLOC_EXTERNAL]) diff --git a/opal/mca/pmix/pmix4x/pmix/config/pmix_setup_libevent.m4 b/opal/mca/pmix/pmix4x/pmix/config/pmix_setup_libevent.m4 index 2348a87aac..949af1cfd5 100644 --- a/opal/mca/pmix/pmix4x/pmix/config/pmix_setup_libevent.m4 +++ b/opal/mca/pmix/pmix4x/pmix/config/pmix_setup_libevent.m4 @@ -19,11 +19,7 @@ AC_DEFUN([PMIX_LIBEVENT_CONFIG],[ [AC_HELP_STRING([--with-libevent-header=HEADER], [The value that should be included in C files to include event.h])]) - AC_ARG_ENABLE([embedded-libevent], - [AC_HELP_STRING([--enable-embedded-libevent], - [Enable use of locally embedded libevent])]) - - AS_IF([test "$enable_embedded_libevent" = "yes"], + AS_IF([test "$pmix_mode" = "embedded"], [_PMIX_LIBEVENT_EMBEDDED_MODE], [_PMIX_LIBEVENT_EXTERNAL]) From 43244cf66eee8f0442e78dfec42772141e9a9f40 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Wed, 6 Feb 2019 17:17:34 -0800 Subject: [PATCH 2/2] Ignore generated file Signed-off-by: Ralph Castain --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 107ff62ec1..20e41c2c32 100644 --- a/.gitignore +++ b/.gitignore @@ -199,6 +199,8 @@ ompi/mca/rte/orte/mpirun.1 ompi/mca/sharedfp/addproc/mca_sharedfp_addproc_control +ompi/mca/topo/treematch/config.h + ompi/mpi/c/profile/p*.c ompi/mpi/fortran/configure-fortran-output.h