Merge pull request #7589 from rhc54/topic/env

Update PMIx and PRRTE, plus PRRTE config integration

Author: rhc54

config/ompi_setup_prrte.m4

@@ -24,7 +24,7 @@
 #
 
 AC_DEFUN([OMPI_SETUP_PRRTE],[
-    OPAL_VAR_SCOPE_PUSH([opal_prrte_save_CPPFLAGS opal_prrte_save_CFLAGS opal_prrte_save_LDFLAGS opal_prrte_save_LIBS opal_prrte_args opal_prrte_save_enable_dlopen opal_prrte_save_enable_mca_dso opal_prrte_save_enable_mca_static opal_prrte_extra_libs opal_prrte_extra_ltlibs opal_prrte_extra_ldflags])
+    OPAL_VAR_SCOPE_PUSH([opal_prrte_save_CPPFLAGS opal_prrte_save_CFLAGS opal_prrte_save_LDFLAGS opal_prrte_save_LIBS opal_prrte_args opal_prrte_save_enable_dlopen opal_prrte_save_enable_mca_dso opal_prrte_save_enable_mca_static opal_prrte_extra_libs opal_prrte_extra_ltlibs opal_prrte_extra_ldflags opal_prrte_save_with_libevent opal_prrte_save_with_hwloc opal_prrte_save_with_pmix])
 
     opal_prrte_save_CFLAGS=$CFLAGS
     opal_prrte_save_CPPFLAGS=$CPPFLAGS
@@ -33,6 +33,9 @@ AC_DEFUN([OMPI_SETUP_PRRTE],[
     opal_prrte_save_enable_dlopen=enable_dlopen
     opal_prrte_save_enable_mca_dso=enable_mca_dso
     opal_prrte_save_enable_mca_static=enable_mca_static
+    opal_prrte_save_with_libevent=with_libevent
+    opal_prrte_save_with_hwloc=with_hwloc
+    opal_prrte_save_with_pmix=with_pmix
 
     AC_ARG_ENABLE([internal-rte],
                   [AC_HELP_STRING([--enable-internal-rte],
@@ -62,26 +65,35 @@ AC_DEFUN([OMPI_SETUP_PRRTE],[
         opal_prrte_extra_libs=$OMPI_TOP_BUILDDIR/opal/libopen-pal.la
         opal_prrte_extra_ltlibs=$OMPI_TOP_BUILDDIR/opal/libopen-pal.la
 
-        if test "$opal_event_external_support" = "yes"; then
-            opal_prrte_extra_libs="$opal_prrte_extra_libs $opal_event_external_LIBS"
-            opal_prrte_extra_ltlibs="$opal_prrte_extra_ltlibs $opal_event_external_LIBS"
+        if test -z $with_libevent || test "$with_libevent" = "internal" || test "$with_libevent" = "yes"; then
+            opal_prrte_libevent_arg="--with-libevent-header=$OMPI_TOP_SRCDIR/opal/mca/event/event.h"
+        else
+            if test "$with_libevent" = "external"; then
+                opal_prrte_libevent_arg="--with-libevent"
+            else
+                opal_prrte_libevent_arg="--with-libevent=$with_libevent"
+            fi
         fi
-        # specifying --with-libevent-header causes prrte to ignore the with_libevent and with_libevent_libdir options
-        opal_prrte_libevent_arg="--with-libevent-header=$OMPI_TOP_SRCDIR/opal/mca/event/event.h"
 
-        if test "$opal_hwloc_external_support" = "yes"; then
-            opal_prrte_extra_libs="$opal_prrte_extra_libs $opal_hwloc_external_LIBS"
-            opal_prrte_extra_ltlibs="$opal_prrte_extra_ltlibs $opal_hwloc_external_LIBS"
+        if test -z $with_hwloc || test "$with_hwloc" = "internal" || test "$with_hwloc" = "yes"; then
+               opal_prrte_hwloc_arg="--with-hwloc-header=$OMPI_TOP_SRCDIR/opal/mca/hwloc/hwloc-internal.h"
+        else
+            if test "$with_hwloc" = "external"; then
+                opal_prrte_hwloc_arg="--with-hwloc"
+            else
+                opal_prrte_hwloc_arg="--with-hwloc=$with_hwloc"
+            fi
         fi
-        # specifying --with-hwloc-header causes prrte to ignore the with_hwloc and with_hwloc_libdir options
-        opal_prrte_hwloc_arg="--with-hwloc-header=$OMPI_TOP_SRCDIR/opal/mca/hwloc/hwloc-internal.h"
 
-        if test "$opal_external_pmix_happy" = "yes"; then
-            opal_prrte_extra_libs="$opal_prrte_extra_libs $opal_pmix_external_LIBS"
-            opal_prrte_extra_ltlibs="$opal_prrte_extra_ltlibs $opal_pmix_external_LIBS"
+        if test -z $with_pmix || test "$with_pmix" = "internal" || test "$with_pmix" = "yes"; then
+            opal_prrte_pmix_arg="--with-pmix-header=$OMPI_TOP_SRCDIR/opal/mca/pmix/pmix-internal.h"
+        else
+            if test "$with_pmix" = "external"; then
+                opal_prrte_pmix_arg="--with-pmix"
+            else
+                opal_prrte_pmix_arg="--with-pmix=$with_pmix"
+            fi
         fi
-        # specifying --with-pmix-header causes prrte to ignore the with_pmix and with_pmix_libdir options
-        opal_prrte_pmix_arg="--with-pmix-header=$OMPI_TOP_SRCDIR/opal/mca/pmix/pmix-internal.h"
 
         if test -z $enable_prte_prefix_by_default || test "$enable_prte_prefix_by_default" = "yes" ||
            test "$enable_orterun_prefix_given" = "yes"; then

config/opal_config_asm.m4

@@ -18,6 +18,7 @@ dnl                         reserved.
 dnl Copyright (c) 2017      Amazon.com, Inc. or its affiliates.  All Rights
 dnl                         reserved.
 dnl Copyright (c) 2020      Google, LLC. All rights reserved.
+dnl Copyright (c) 2020      Intel, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl
 dnl Additional copyrights may follow
@@ -833,7 +834,7 @@ AC_DEFUN([OPAL_CHECK_ASM_GNU_STACKEXEC], [
 int testfunc() {return 0; }
 EOF
              OPAL_LOG_COMMAND([$CC $CFLAGS -c conftest.c -o conftest.$OBJEXT],
-                 [$OBJDUMP -x conftest.$OBJEXT | $GREP '\.note\.GNU-stack' > /dev/null && opal_cv_asm_gnu_stack_result=yes],
+                 [$OBJDUMP -x conftest.$OBJEXT 2>&1 | $GREP '\.note\.GNU-stack' &> /dev/null && opal_cv_asm_gnu_stack_result=yes],
                  [OPAL_LOG_MSG([the failed program was:], 1)
                   OPAL_LOG_FILE([conftest.c])
                   opal_cv_asm_gnu_stack_result=no])

opal/mca/base/mca_base_var.c

@@ -13,7 +13,7 @@
  * Copyright (c) 2008-2018 Cisco Systems, Inc.  All rights reserved
  * Copyright (c) 2012-2018 Los Alamos National Security, LLC. All rights
  *                         reserved.
- * Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
+ * Copyright (c) 2014-2020 Intel, Inc.  All rights reserved.
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2017      IBM Corporation. All rights reserved.
@@ -290,6 +290,13 @@ int mca_base_var_init(void)
             return ret;
         }
 
+        /* We may need this later */
+        home = (char*)opal_home_directory();
+        if (NULL == home) {
+            opal_output(0, "Error: Unable to get the user home directory\n");
+            return OPAL_ERROR;
+        }
+
         /* Set this before we register the parameter, below */
 
         mca_base_var_initialized = true;
@@ -412,16 +419,11 @@ int mca_base_var_cache_files(bool rel_path_search)
     }
 
 #if OPAL_WANT_HOME_CONFIG_FILES
-    /* We may need this later */
-    home = (char*)opal_home_directory();
-    if (NULL == home) {
-        opal_output(0, "Error: Unable to get the user home directory\n");
-        return OPAL_ERROR;
+    if (NULL == getenv("OPAL_USER_PARAMS_GIVEN")) {
+        opal_asprintf(&mca_base_var_files, "%s"OPAL_PATH_SEP".openmpi" OPAL_PATH_SEP
+                 "mca-params.conf%c%s" OPAL_PATH_SEP "openmpi-mca-params.conf",
+                 home, ',', opal_install_dirs.sysconfdir);
     }
-
-    opal_asprintf(&mca_base_var_files, "%s"OPAL_PATH_SEP".openmpi" OPAL_PATH_SEP
-             "mca-params.conf%c%s" OPAL_PATH_SEP "openmpi-mca-params.conf",
-             home, ',', opal_install_dirs.sysconfdir);
 #else
     opal_asprintf(&mca_base_var_files, "%s" OPAL_PATH_SEP "openmpi-mca-params.conf",
              opal_install_dirs.sysconfdir);