Merge pull request #6608 from ggouaillardet/topic/pmix_refresh

PMIx refresh

Author: ggouaillardet

.gitignore

@@ -382,6 +382,8 @@ opal/mca/pmix/pmix*/pmix/src/include/private/autogen/config.h
 opal/mca/pmix/pmix*/pmix/src/include/frameworks.h
 opal/mca/pmix/pmix*/pmix/src/mca/pinstalldirs/config/pinstall_dirs.h
 opal/mca/pmix/pmix*/pmix/config/autogen_found_items.m4
+opal/mca/pmix/pmix*/pmix/config/mca_library_paths.txt
+opal/mca/pmix/pmix*/pmix/config/test-driver
 opal/mca/pmix/pmix*/pmix/src/include/pmix_config.h
 opal/mca/pmix/pmix*/pmix/src/include/pmix_config.h.in
 opal/mca/pmix/pmix*/pmix/include/pmix_common.h
@@ -400,6 +402,23 @@ opal/mca/pmix/pmix*/pmix/examples/jctrl
 opal/mca/pmix/pmix*/pmix/examples/pub
 opal/mca/pmix/pmix*/pmix/examples/server
 opal/mca/pmix/pmix*/pmix/examples/tool
+opal/mca/pmix/pmix*/pmix/test/run_tests00.pl
+opal/mca/pmix/pmix*/pmix/test/run_tests01.pl
+opal/mca/pmix/pmix*/pmix/test/run_tests02.pl
+opal/mca/pmix/pmix*/pmix/test/run_tests03.pl
+opal/mca/pmix/pmix*/pmix/test/run_tests04.pl
+opal/mca/pmix/pmix*/pmix/test/run_tests05.pl
+opal/mca/pmix/pmix*/pmix/test/run_tests06.pl
+opal/mca/pmix/pmix*/pmix/test/run_tests07.pl
+opal/mca/pmix/pmix*/pmix/test/run_tests08.pl
+opal/mca/pmix/pmix*/pmix/test/run_tests09.pl
+opal/mca/pmix/pmix*/pmix/test/run_tests10.pl
+opal/mca/pmix/pmix*/pmix/test/run_tests11.pl
+opal/mca/pmix/pmix*/pmix/test/run_tests12.pl
+opal/mca/pmix/pmix*/pmix/test/run_tests13.pl
+opal/mca/pmix/pmix*/pmix/test/run_tests14.pl
+opal/mca/pmix/pmix*/pmix/test/run_tests15.pl
+
 
 opal/mca/pmix/ext4x/ext4x.c
 opal/mca/pmix/ext4x/ext4x.h

opal/mca/pmix/pmix4x/pmix/LICENSE

@@ -47,6 +47,8 @@ Copyright (c) 2012      The University of Wisconsin-La Crosse. All rights
                         reserved.
 Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
 Copyright (c) 2011-2014 NVIDIA Corporation.  All rights reserved.
+Copyright (c) 2019      Amazon.com, Inc. or its affiliates.  All Rights
+                        reserved.
 
 $COPYRIGHT$
 

opal/mca/pmix/pmix4x/pmix/Makefile.am

@@ -12,6 +12,8 @@
 # Copyright (c) 2006-2016 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
 # Copyright (c) 2013-2018 Intel, Inc.  All rights reserved.
+# Copyright (c) 2019      Amazon.com, Inc. or its affiliates.  All Rights
+#                         reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -25,6 +27,7 @@ ACLOCAL_AMFLAGS = -I ./config
 
 SUBDIRS = config contrib include src etc bindings
 
+AM_DISTCHECK_CONFIGURE_FLAGS = --disable-dlopen
 
 headers =
 sources =

opal/mca/pmix/pmix4x/pmix/VERSION

@@ -30,7 +30,7 @@ greek=a1
 # command, or with the date (if "git describe" fails) in the form of
 # "date<date>".
 
-repo_rev=git2531c0c3
+repo_rev=gitbde4a8a5
 
 # If tarball_version is not empty, it is used as the version string in
 # the tarball filename, regardless of all other versions listed in
@@ -44,7 +44,7 @@ tarball_version=
 
 # The date when this release was created
 
-date="Apr 09, 2019"
+date="Apr 23, 2019"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library

opal/mca/pmix/pmix4x/pmix/autogen.pl

@@ -4,7 +4,7 @@
 # Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
 # Copyright (c) 2013      Mellanox Technologies, Inc.
 #                         All rights reserved.
-# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+# Copyright (c) 2013-2019 Intel, Inc.  All rights reserved.
 # Copyright (c) 2015      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # Copyright (c) 2015      IBM Corporation.  All rights reserved.
@@ -37,6 +37,9 @@
 # Sanity check file
 my $topdir_file = "include/pmix.h";
 my $dnl_line = "dnl ---------------------------------------------------------------------------";
+# The text file we'll write at the end that will contain
+# all the mca component directory paths
+my $mca_library_paths_file = "config/mca_library_paths.txt";
 
 # Data structures to fill up with all the stuff we find
 my $mca_found;
@@ -137,6 +140,9 @@ sub mca_process_component {
     push(@{$mca_found->{$framework}->{"components"}},
          $found_component);
 
+    # save the directory for later to create the paths
+    # to all the component libraries
+    push(@subdirs, $cdir);
 }
 
 ##############################################################################
@@ -723,6 +729,15 @@ sub in_tarball {
 print M4 $m4;
 close(M4);
 
+# Remove the old library path file and write the new one
+verbose "==> Writing txt file with all the mca component paths\n";
+unlink($mca_library_paths_file);
+open(M4, ">$mca_library_paths_file") ||
+    my_die "Cannot open $mca_library_paths_file";
+my $paths = join(":", @subdirs);
+print M4 $paths;
+close(M4);
+
 # Run autoreconf
 verbose "==> Running autoreconf\n";
 my $cmd = "autoreconf -ivf --warnings=all,no-obsolete,no-override -I config";

opal/mca/pmix/pmix4x/pmix/config/Makefile.am

@@ -43,7 +43,8 @@ EXTRA_DIST = \
 	pmix_search_libs.m4 \
 	pmix_setup_cc.m4 \
 	pmix_setup_libevent.m4 \
-	pmix_mca_priority_sort.pl
+	pmix_mca_priority_sort.pl \
+	mca_library_paths.txt
 
 
 maintainer-clean-local:

opal/mca/pmix/pmix4x/pmix/config/pmix.m4

@@ -859,6 +859,32 @@ AC_DEFUN([PMIX_SETUP_CORE],[
     AC_SUBST(pmixlibdir)
     AC_SUBST(pmixincludedir)
 
+    ############################################################################
+    # setup "make check"
+    ############################################################################
+    PMIX_BUILT_TEST_PREFIX=$PMIX_top_builddir
+    AC_SUBST(PMIX_BUILT_TEST_PREFIX)
+    # expose the mca component library paths in the build system
+    pathfile=$PMIX_top_srcdir/config/mca_library_paths.txt
+    PMIX_COMPONENT_LIBRARY_PATHS=`cat $pathfile`
+    AC_SUBST(PMIX_COMPONENT_LIBRARY_PATHS)
+    AC_CONFIG_FILES(pmix_config_prefix[test/run_tests00.pl], [chmod +x test/run_tests00.pl])
+    AC_CONFIG_FILES(pmix_config_prefix[test/run_tests01.pl], [chmod +x test/run_tests01.pl])
+    AC_CONFIG_FILES(pmix_config_prefix[test/run_tests02.pl], [chmod +x test/run_tests02.pl])
+    AC_CONFIG_FILES(pmix_config_prefix[test/run_tests03.pl], [chmod +x test/run_tests03.pl])
+    AC_CONFIG_FILES(pmix_config_prefix[test/run_tests04.pl], [chmod +x test/run_tests04.pl])
+    AC_CONFIG_FILES(pmix_config_prefix[test/run_tests05.pl], [chmod +x test/run_tests05.pl])
+    AC_CONFIG_FILES(pmix_config_prefix[test/run_tests06.pl], [chmod +x test/run_tests06.pl])
+    AC_CONFIG_FILES(pmix_config_prefix[test/run_tests07.pl], [chmod +x test/run_tests07.pl])
+    AC_CONFIG_FILES(pmix_config_prefix[test/run_tests08.pl], [chmod +x test/run_tests08.pl])
+    AC_CONFIG_FILES(pmix_config_prefix[test/run_tests09.pl], [chmod +x test/run_tests09.pl])
+    AC_CONFIG_FILES(pmix_config_prefix[test/run_tests10.pl], [chmod +x test/run_tests10.pl])
+    AC_CONFIG_FILES(pmix_config_prefix[test/run_tests11.pl], [chmod +x test/run_tests11.pl])
+    AC_CONFIG_FILES(pmix_config_prefix[test/run_tests12.pl], [chmod +x test/run_tests12.pl])
+    AC_CONFIG_FILES(pmix_config_prefix[test/run_tests13.pl], [chmod +x test/run_tests13.pl])
+    AC_CONFIG_FILES(pmix_config_prefix[test/run_tests14.pl], [chmod +x test/run_tests14.pl])
+    AC_CONFIG_FILES(pmix_config_prefix[test/run_tests15.pl], [chmod +x test/run_tests15.pl])
+
     ############################################################################
     # final output
     ############################################################################
@@ -920,7 +946,7 @@ AC_DEFUN([PMIX_DEFINE_ARGS],[
     AC_ARG_ENABLE([embedded-mode],
         [AC_HELP_STRING([--enable-embedded-mode],
                 [Using --enable-embedded-mode causes PMIx to skip a few configure checks and install nothing.  It should only be used when building PMIx within the scope of a larger package.])])
-    AS_IF([test ! -z "$enable_embedded_mode" && test "$enable_embedded_mode" = "yes"],
+    AS_IF([test "$enable_embedded_mode" = "yes"],
           [pmix_mode=embedded
            pmix_install_primary_headers=no
            AC_MSG_RESULT([yes])],
@@ -1207,6 +1233,24 @@ if test "$WANT_PYTHON_BINDINGS" = "1"; then
     fi
 fi
 
+# see if they want to disable non-RTLD_GLOBAL dlopen
+AC_MSG_CHECKING([if want to support dlopen of non-global namespaces])
+AC_ARG_ENABLE([nonglobal-dlopen],
+              AC_HELP_STRING([--enable-nonglobal-dlopen],
+                             [enable non-global dlopen (default: enabled)]))
+if test "$enable_nonglobal_dlopen" == "no"; then
+    AC_MSG_RESULT([no])
+    pmix_need_libpmix=0
+else
+    AC_MSG_RESULT([yes])
+    pmix_need_libpmix=1
+fi
+
+# if someone enables embedded mode but doesn't want to install the
+# devel headers, then default nonglobal-dlopen to false
+AS_IF([test -z "$enable_nonglobal_dlopen" && test "x$pmix_mode" = "xembedded" && test $WANT_INSTALL_HEADERS -eq 0 && test $pmix_need_libpmix -eq 1],
+      [pmix_need_libpmix=0])
+
 ])dnl
 
 # This must be a standalone routine so that it can be called both by
@@ -1222,6 +1266,7 @@ AC_DEFUN([PMIX_DO_AM_CONDITIONALS],[
         AM_CONDITIONAL([WANT_PRIMARY_HEADERS], [test "x$pmix_install_primary_headers" = "xyes"])
         AM_CONDITIONAL(WANT_INSTALL_HEADERS, test "$WANT_INSTALL_HEADERS" = 1)
         AM_CONDITIONAL(WANT_PMI_BACKWARD, test "$WANT_PMI_BACKWARD" = 1)
+        AM_CONDITIONAL(NEED_LIBPMIX, [test "$pmix_need_libpmix" = "1"])
     ])
     pmix_did_am_conditionals=yes
 ])dnl

opal/mca/pmix/pmix4x/pmix/contrib/make_dist_tarball

@@ -11,7 +11,9 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2008-2018 Cisco Systems, Inc.  All rights reserved
-# Copyright (c) 2015      Intel, Inc.  All rights reserved.
+# Copyright (c) 2015-2019 Intel, Inc.  All rights reserved.
+# Copyright (c) 2019      Amazon.com, Inc. or its affiliates.  All Rights
+#                         reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -108,14 +110,6 @@ if test "$LIBEVENT" != ""; then
     config_args="--with-libevent=$LIBEVENT $config_args"
 fi
 
-# if config_args isn't empty, then add that to the distcheck_flags
-# (because we'll assumedly need those to run configure under "make
-# distcheck").
-if test "$config_args" != ""; then
-    echo "*** Adding to distcheck_flags: $config_args"
-    distcheck_flags="$distcheck_flags AM_DISTCHECK_CONFIGURE_FLAGS=\"$config_args\""
-fi
-
 export DISTCHECK_CONFIGURE_FLAGS=$config_args
 
 #

opal/mca/pmix/pmix4x/pmix/src/include/pmix_globals.h

@@ -121,6 +121,9 @@ typedef uint8_t pmix_cmd_t;
 /* provide a "pretty-print" function for cmds */
 const char* pmix_command_string(pmix_cmd_t cmd);
 
+/* provide a hook to init tool data */
+PMIX_EXPORT extern pmix_status_t pmix_tool_init_info(void);
+
 /* define a set of flags to direct collection
  * of data during operations */
 typedef enum {

opal/mca/pmix/pmix4x/pmix/src/mca/base/help-pmix-mca-base.txt

@@ -10,7 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2008-2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008-2019 Cisco Systems, Inc.  All rights reserved
 # Copyright (c) 2018      Intel, Inc. All rights reserved.
 # $COPYRIGHT$
 #
@@ -60,3 +60,12 @@ all components *except* a and b", while "c,d" specifies the inclusive
 behavior and means "use *only* components c and d."
 
 You cannot mix inclusive and exclusive behavior.
+#
+[failed to add component dir]
+The pmix_mca_base_component_path MCA variable was used to add paths to
+search for PMIX components.  At least one directory failed to add
+properly:
+
+    %s
+
+Check to make sure that this directory exists, is readable, etc.