Merge pull request #4989 from jjhursey/update/v3.0.x-to-pmix-2.0.3

v3.0.x: Update to PMIx 2.0.3

Author: bwbarrett

opal/mca/pmix/pmix2x/pmix/NEWS

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
+Copyright (c) 2015-2018 Intel, Inc.  All rights reserved.
 Copyright (c) 2017      IBM Corporation.  All rights reserved.
 $COPYRIGHT$
 
@@ -20,6 +20,43 @@ other, a single NEWS-worthy item might apply to different series. For
 example, a bug might be fixed in the master, and then moved to the
 current release as well as the "stable" bug fix release branch.
 
+2.0.3 -- 23 Feb 2018
+----------------------
+**** NOTE: PMIx_Get in PMIx v2.x will fail when requesting information
+**** on any process whose nspace has not yet been registered with the
+**** PMIx server
+- Fix event notification so all sides of multi-library get notified
+  of other library's existence
+- Update syslog protection to support Mac High Sierra OS
+- Remove usock component - unable to support v1.x clients due
+  to datatype differences
+- Cleanup security handshake
+- Cleanup separation of PMI-1/2 libraries and PMIx symbols
+- Protect against overly-large messages
+- Update data buffer APIs to support cross-version operations
+- Protect receive callbacks from NULL and/or empty buffers as this
+  can occur when the peer on a connection disappears.
+- Fix tool connection search so it properly descends into the directory
+  tree while searching for the server's contact file.
+- Fix store_local so it doesn't reject a new nspace as that can happen
+  when working with tools
+- Ensure we always complete PMIx_Finalize - don't return if something
+  goes wrong in the middle of the procedure
+- Fix several tool connection issues
+- Fix a mismatch in data type on an MCA param
+
+
+2.0.2 -- 19 Oct 2017
+----------------------
+- Update RPM spec file (rpmbuild -ta, and --rebuild fixes) (PR #523)
+- Support singletons in PMI-1/PMI-2 (PR #537)
+- Provide missing implementation support for arrays of pmix_value_t's (PR #531)
+- Remove unsupported assembly code for MIPS and ARM processors
+  prior to v6 (PR #547)
+- Fix path separator for PMIx configuration files (PR #547)
+- Add configure option to enable/disable the default value for the
+  show-load-errors MCA param (PR #547)
+
 
 2.0.1 -- 24 Aug. 2017
 ----------------------
@@ -90,6 +127,15 @@ current release as well as the "stable" bug fix release branch.
   and to themselves
 
 
+1.2.4 -- 13 Oct. 2017
+----------------------
+- Silence some unnecessary warning messages (PR #487)
+- Coverity fix - TOCTOU (PR #465)
+- automake 1.13 configure fix (PR #486)
+- Update RPM spec file (rpmbuild -ta, and --rebuild fixes) (PR #523)
+- Support singletons in PMI-1/PMI-2 (PR #537)
+
+
 1.2.3 -- 24 Aug. 2017
 ----------------------
 - Resolve visibility issues for public APIs (PR #451)

opal/mca/pmix/pmix2x/pmix/README

@@ -15,7 +15,7 @@ Copyright (c) 2007      Myricom, Inc.  All rights reserved.
 Copyright (c) 2008      IBM Corporation.  All rights reserved.
 Copyright (c) 2010      Oak Ridge National Labs.  All rights reserved.
 Copyright (c) 2011      University of Houston. All rights reserved.
-Copyright (c) 2013-2015 Intel, Inc. All rights reserved
+Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
 $COPYRIGHT$
 
 Additional copyrights may follow
@@ -128,6 +128,32 @@ INSTALLATION OPTIONS
   --disable-shared; enabling static libraries and disabling shared
   libraries are two independent options.
 
+ --disable-show-load-errors-by-default
+   Set the default value of the mca_base_component_show_load_errors MCA
+   variable: the --enable form of this option sets the MCA variable to
+   true, the --disable form sets the MCA variable to false.  The MCA
+   mca_base_component_show_load_errors variable can still be overridden
+   at run time via the usual MCA-variable-setting mechanisms; this
+   configure option simply sets the default value.
+
+   The --disable form of this option is intended for PMIx packagers
+   who tend to enable support for many different types of networks and
+   systems in their packages.  For example, consider a packager who
+   includes support for both the FOO and BAR networks in their PMIx
+   package, both of which require support libraries (libFOO.so and
+   libBAR.so).  If an end user only has BAR hardware, they likely only
+   have libBAR.so available on their systems -- not libFOO.so.
+   Disabling load errors by default will prevent the user from seeing
+   potentially confusing warnings about the FOO components failing to
+   load because libFOO.so is not available on their systems.
+
+   Conversely, system administrators tend to build a PMIx that is
+   targeted at their specific environment, and contains few (if any)
+   components that are not needed.  In such cases, they might want
+   their users to be warned that the FOO network components failed to
+   load (e.g., if libFOO.so was mistakenly unavailable), and thus
+   some PMIx calls might unexpectedly return "not supported".
+
 --with-platform=FILE
   Load configure options for the build from FILE.  Options on the
   command line that are not in FILE are also used.  Options on the

opal/mca/pmix/pmix2x/pmix/VERSION

@@ -15,22 +15,22 @@
 
 major=2
 minor=0
-release=1
+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=rc1
+greek=
 
 # 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=gitda9b50e
+repo_rev=gitf2bdb4a
 
 # 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="Aug 14, 2017"
+date="Mar 05, 2018"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library
@@ -75,4 +75,6 @@ date="Aug 14, 2017"
 # Version numbers are described in the Libtool current:revision:age
 # format.
 
-libpmix_so_version=3:1:1
+libpmix_so_version=3:3:1
+libpmi_so_version=1:0:0
+libpmi2_so_version=1:0:0

opal/mca/pmix/pmix2x/pmix/config/distscript.sh

@@ -54,3 +54,14 @@ touch -r "${srcdir}/VERSION" "${distdir}/VERSION"
 
 echo "*** Updated VERSION file with repo rev: $repo_rev"
 echo "*** (via dist-hook / config/distscript.sh)"
+
+#
+# Update pmix.spec:%{version} with the main version
+#
+PMIX_SPEC=contrib/pmix.spec
+perl -pi -e 's/^Version:.*/Version: '$PMIX_REPO_REV'/' -- "${distdir}/$PMIX_SPEC"
+touch -r "${srcdir}/$PMIX_VERSION" "${distdir}/$PMIX_VERSION"
+
+echo "*** Updated $PMIX_SPEC file with repo rev: $PMIX_REPO_REV"
+echo "*** (via dist-hook / config/distscript.sh)"
+

opal/mca/pmix/pmix2x/pmix/config/pmix.m4

@@ -156,18 +156,6 @@ AC_DEFUN([PMIX_SETUP_CORE],[
     AC_SUBST(PMIX_RENAME)
     AC_CONFIG_FILES(pmix_config_prefix[include/pmix_rename.h])
 
-    # Add any extra lib?
-    AC_ARG_WITH([pmix-extra-lib],
-                AC_HELP_STRING([--with-pmix-extra-lib=LIB],
-                               [Link the output PMIx library to this extra lib (used in embedded mode)]))
-    AC_MSG_CHECKING([for extra lib])
-    AS_IF([test ! -z "$with_pmix_extra_lib"],
-          [AC_MSG_RESULT([$with_pmix_extra_lib])
-           PMIX_EXTRA_LIB=$with_pmix_extra_lib],
-          [AC_MSG_RESULT([no])
-           PMIX_EXTRA_LIB=])
-    AC_SUBST(PMIX_EXTRA_LIB)
-
     # GCC specifics.
     if test "x$GCC" = "xyes"; then
         PMIX_GCC_CFLAGS="-Wall -Wmissing-prototypes -Wundef"
@@ -698,6 +686,32 @@ AC_DEFUN([PMIX_SETUP_CORE],[
 
     pmix_show_title "Modular Component Architecture (MCA) setup"
 
+    #
+    # Do we want to show component load error messages by default?
+    #
+
+    AC_MSG_CHECKING([for default value of mca_base_component_show_load_errors])
+    AC_ARG_ENABLE([show-load-errors-by-default],
+                  [AC_HELP_STRING([--enable-show-load-errors-by-default],
+                                  [Set the default value for the MCA parameter
+                                   mca_base_component_show_load_errors (but can be
+                                   overridden at run time by the usual
+                                   MCA-variable-setting mechansism).  This MCA variable
+                                   controls whether warnings are displayed when an MCA
+                                   component fails to load at run time due to an error.
+                                   (default: enabled, meaning that
+                                   mca_base_component_show_load_errors is enabled
+                                   by default])])
+    if test "$enable_show_load_errors_by_default" = "no" ; then
+        PMIX_SHOW_LOAD_ERRORS_DEFAULT=0
+        AC_MSG_RESULT([disabled by default])
+    else
+        PMIX_SHOW_LOAD_ERRORS_DEFAULT=1
+        AC_MSG_RESULT([enabled by default])
+    fi
+    AC_DEFINE_UNQUOTED(PMIX_SHOW_LOAD_ERRORS_DEFAULT, $PMIX_SHOW_LOAD_ERRORS_DEFAULT,
+                       [Default value for mca_base_component_show_load_errors MCA variable])
+
     AC_MSG_CHECKING([for subdir args])
     PMIX_CONFIG_SUBDIR_ARGS([pmix_subdir_args])
     AC_MSG_RESULT([$pmix_subdir_args])

opal/mca/pmix/pmix2x/pmix/config/pmix_check_package.m4

@@ -12,7 +12,7 @@
 #                         All rights reserved.
 # Copyright (c) 2012-2015 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2012      Oracle and/or its affiliates.  All rights reserved.
-# Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+# Copyright (c) 2014      Intel, Inc. All rights reserved.
 # Copyright (c) 2017      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$

opal/mca/pmix/pmix2x/pmix/config/pmix_config_asm.m4

@@ -959,8 +959,8 @@ AC_DEFUN([PMIX_CONFIG_ASM],[
 
         ia64-*)
             pmix_cv_asm_arch="IA64"
-            PMIX_ASM_SUPPORT_64BIT=1
-            PMIX_GCC_INLINE_ASSIGN='"mov %0=r0\n;;\n" : "=&r"(ret)'
+            PMIX_CHECK_SYNC_BUILTINS([pmix_cv_asm_builtin="BUILTIN_SYNC"],
+                          [AC_MSG_ERROR([No atomic primitives available for $host])])
             ;;
 	aarch64*)
             pmix_cv_asm_arch="ARM64"
@@ -993,20 +993,16 @@ AC_DEFUN([PMIX_CONFIG_ASM],[
         armv5*linux*|armv4*linux*|arm-*-linux-gnueabi)
             # uses Linux kernel helpers for some atomic operations
             pmix_cv_asm_arch="ARM"
-            PMIX_ASM_SUPPORT_64BIT=0
-            PMIX_ASM_ARM_VERSION=5
-            CCASFLAGS="$CCASFLAGS -march=armv7-a"
-            AC_DEFINE_UNQUOTED([PMIX_ASM_ARM_VERSION], [$PMIX_ASM_ARM_VERSION],
-                               [What ARM assembly version to use])
-            PMIX_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
+            PMIX_CHECK_SYNC_BUILTINS([pmix_cv_asm_builtin="BUILTIN_SYNC"],
+                          [AC_MSG_ERROR([No atomic primitives available for $host])])
             ;;
 
         mips-*|mips64*)
             # Should really find some way to make sure that we are on
             # a MIPS III machine (r4000 and later)
             pmix_cv_asm_arch="MIPS"
-            PMIX_ASM_SUPPORT_64BIT=1
-            PMIX_GCC_INLINE_ASSIGN='"or %0,[$]0,[$]0" : "=&r"(ret)'
+            PMIX_CHECK_SYNC_BUILTINS([pmix_cv_asm_builtin="BUILTIN_SYNC"],
+                          [AC_MSG_ERROR([No atomic primitives available for $host])])
             ;;
 
         powerpc-*|powerpc64-*|powerpcle-*|powerpc64le-*|rs6000-*|ppc-*)

opal/mca/pmix/pmix2x/pmix/config/pmix_functions.m4

@@ -13,7 +13,7 @@ dnl                         All rights reserved.
 dnl Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserved.
 dnl Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
 dnl Copyright (c) 2009-2016 Cisco Systems, Inc.  All rights reserved.
-dnl Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+dnl Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
 dnl Copyright (c) 2017      Research Organization for Information Science
 dnl                         and Technology (RIST). All rights reserved.
 dnl

opal/mca/pmix/pmix2x/pmix/config/pmix_setup_cc.m4

@@ -16,7 +16,7 @@ dnl Copyright (c) 2012-2017 Los Alamos National Security, LLC. All rights
 dnl                         reserved.
 dnl Copyright (c) 2015      Research Organization for Information Science
 dnl                         and Technology (RIST). All rights reserved.
-dnl Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
+dnl Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl
 dnl Additional copyrights may follow

opal/mca/pmix/pmix2x/pmix/configure.ac

@@ -224,6 +224,8 @@ AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION'])
 
 . $srcdir/VERSION
 AC_SUBST([libpmix_so_version])
+AC_SUBST([libpmi_so_version])
+AC_SUBST([libpmi2_so_version])
 
 AC_CONFIG_FILES(pmix_config_prefix[contrib/Makefile]
                 pmix_config_prefix[examples/Makefile]