Merge pull request #6776 from rhc54/cmr40/pmix

Update to PMIx v3.1.3rc4

Author: gpaulsen

.gitignore

@@ -401,6 +401,24 @@ opal/mca/pmix/ext3x/ext3x_client.c
 opal/mca/pmix/ext3x/ext3x_component.c
 opal/mca/pmix/ext3x/ext3x_server_north.c
 opal/mca/pmix/ext3x/ext3x_server_south.c
+opal/mca/pmix/pmix3x/pmix/config/mca_library_paths.txt
+opal/mca/pmix/pmix3x/pmix/config/test-driver
+opal/mca/pmix/pmix3x/pmix/test/run_tests00.pl
+opal/mca/pmix/pmix3x/pmix/test/run_tests01.pl
+opal/mca/pmix/pmix3x/pmix/test/run_tests02.pl
+opal/mca/pmix/pmix3x/pmix/test/run_tests03.pl
+opal/mca/pmix/pmix3x/pmix/test/run_tests04.pl
+opal/mca/pmix/pmix3x/pmix/test/run_tests05.pl
+opal/mca/pmix/pmix3x/pmix/test/run_tests06.pl
+opal/mca/pmix/pmix3x/pmix/test/run_tests07.pl
+opal/mca/pmix/pmix3x/pmix/test/run_tests08.pl
+opal/mca/pmix/pmix3x/pmix/test/run_tests09.pl
+opal/mca/pmix/pmix3x/pmix/test/run_tests10.pl
+opal/mca/pmix/pmix3x/pmix/test/run_tests11.pl
+opal/mca/pmix/pmix3x/pmix/test/run_tests12.pl
+opal/mca/pmix/pmix3x/pmix/test/run_tests13.pl
+opal/mca/pmix/pmix3x/pmix/test/run_tests14.pl
+opal/mca/pmix/pmix3x/pmix/test/run_tests15.pl
 
 opal/tools/opal-checkpoint/opal-checkpoint
 opal/tools/opal-checkpoint/opal-checkpoint.1

opal/mca/pmix/pmix3x/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/pmix3x/pmix/Makefile.am

@@ -11,7 +11,9 @@
 #                         All rights reserved.
 # 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) 2013-2019 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
 
+AM_DISTCHECK_CONFIGURE_FLAGS = --disable-dlopen
 
 headers =
 sources =

opal/mca/pmix/pmix3x/pmix/NEWS

@@ -1,5 +1,5 @@
 Copyright (c) 2015-2019 Intel, Inc.  All rights reserved.
-Copyright (c) 2017      IBM Corporation.  All rights reserved.
+Copyright (c) 2017-2019 IBM Corporation.  All rights reserved.
 $COPYRIGHT$
 
 Additional copyrights may follow
@@ -21,6 +21,51 @@ example, a bug might be fixed in the master, and then moved to
 multiple release branches.
 
 
+3.1.3 -- TBD
+----------------------
+- PR #1096: Restore PMIX_NUM_SLOTS for backward compatibility
+- PR #1106: Automatically generate PMIX_NUMERIC_VERSION
+- PR #1143: Fix tool connection handshake for tools that are registered
+  clients
+- PR #1163: Fix a compiler warning in atomics on POWER arch
+- PR #1162: Fix race condition when clients fail while in a PMIx
+  collective operation
+- PR #1166: Fix a regression in spinlock atomics
+- PR #1159: Fix missing pointer update when shared memory segment
+  was re-attached
+- PR #1180: Remove dependency on C++ compiler for thread detection
+- PR #1180: Add detection for Flex when building in non-tarball situations
+- PR #1165: Add dependency on libevent-devel to rpm spec file
+- PR #1188: Link libpmix.so to MCA component libraries
+- PR #1194: Ensure any cached notifications arrive after registration completes
+- PR #1205: Add "make check" support
+- PR #1209: Update configure logic for clock_gettime
+- PR #1213/#1217/#1221: Add configure option "--enable-nonglobal-dlopen"
+  If the MCA component libraries should link back to libpmix.so
+- PR #1231: SPEC: Allow splitting PMIx in pmix and pmix-libpmi packages
+- PR #1222: Fix case of multiple launcher calls in job script
+- PR #1237: Avoid double-free of collective tracker
+- PR #1237: Ensure all participants are notified of fence complete
+- PR #1237: Ensure all participants are notified of connect and disconnect complete
+- PR #1250: Fix PMIx_server_finalize hang (rare)
+- PR #1271: PTL/usock doesn't support tools
+- PR #1280: Fix the PTL connection establishment protocol
+- PR #1280: Fix tool connection in psec/handshake mode
+- PR #1289: Avoid output_verbose overhead when it won't print
+- PR #1296: Allow setup_fork to proceed even if gdds and pnet don't contribute
+- PR #1296: Allow servers to pass NULL module
+- PR #1297: Provide internal blocking ability to the register/deregister fns
+- PR #1298: Add dummy handshake component to psec framework for testing
+- PR #1303: Allow jobs to not specify proc-level info
+- PR #1304: Provide proc data in cases where host does not
+- PR #1305: Add some more values that can be computed
+- PR #1308: Add missing tool rendezvous file
+- PR #1309: Fix potential integer overflow in regex
+- PR #1311: Work around memory bug in older gcc compilers
+- PR #1321: Provide memory op hooks in user-facing macros
+- PR #1329: Add -fPIC to static builds
+
+
 3.1.2 -- 24 Jan 2019
 ----------------------
  - Fix a bug in macro identifying system events

opal/mca/pmix/pmix3x/pmix/VERSION

@@ -15,22 +15,22 @@
 
 major=3
 minor=1
-release=2
+release=3
 
 # greek is used for alpha or beta release tags.  If it is non-empty,
 # it will be appended to the version number.  It does not have to be
 # numeric.  Common examples include a1 (alpha release 1), b1 or (beta release 1).
 # The only requirement is that it must be entirely printable ASCII
 # characters and have no white space.
 
-greek=
+greek=rc4
 
 # If repo_rev is empty, then the repository version number will be
 # obtained during "make dist" via the "git describe --tags --always"
 # command, or with the date (if "git describe" fails) in the form of
 # "date<date>".
 
-repo_rev=git0f7075f7
+repo_rev=git5e6ec324
 
 # 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="Jan 24, 2019"
+date="Jun 25, 2019"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library
@@ -75,7 +75,7 @@ date="Jan 24, 2019"
 # Version numbers are described in the Libtool current:revision:age
 # format.
 
-libpmix_so_version=4:22:2
+libpmix_so_version=4:23:2
 libpmi_so_version=1:0:0
 libpmi2_so_version=1:0:0
 

opal/mca/pmix/pmix3x/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/pmix3x/pmix/config/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2013-2019 Intel, Inc.  All rights reserved.
 # Copyright (c) 2016      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # Copyright (c) 2006-2016 Cisco Systems, Inc.  All rights reserved.
@@ -44,7 +44,8 @@ EXTRA_DIST = \
 	pmix_setup_cc.m4 \
 	pmix_setup_zlib.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/pmix3x/pmix/config/distscript.sh

@@ -11,11 +11,11 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2015      Research Organization for Information Science
-#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2015-2019 Research Organization for Information Science
+#                         and Technology (RIST).  All rights reserved.
 # Copyright (c) 2015      Los Alamos National Security, LLC. All rights
 #                         reserved.
-# Copyright (c) 2017      Intel, Inc. All rights reserved.
+# Copyright (c) 2017-2019 Intel, Inc.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -42,7 +42,7 @@ fi
 # Otherwise, use what configure told us, at the cost of allowing one
 # or two corner cases in (but otherwise VPATH builds won't work).
 repo_rev=$PMIX_REPO_REV
-if test -d .git ; then
+if test -e .git ; then
     repo_rev=$(config/pmix_get_version.sh VERSION --repo-rev)
 fi