Merge pull request #7382 from gpaulsen/topic/v4.0.x/pmix_v3.1.5rc2

Adding PMIx v3.1.5rc2

Author: hppritcha

opal/mca/pmix/pmix3x/pmix/Makefile.am

@@ -11,7 +11,7 @@
 #                         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-2019 Intel, 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$

opal/mca/pmix/pmix3x/pmix/NEWS

@@ -1,5 +1,5 @@
 Copyright (c) 2015-2019 Intel, Inc.  All rights reserved.
-Copyright (c) 2017-2019 IBM Corporation.  All rights reserved.
+Copyright (c) 2017-2020 IBM Corporation.  All rights reserved.
 $COPYRIGHT$
 
 Additional copyrights may follow
@@ -21,6 +21,45 @@ example, a bug might be fixed in the master, and then moved to
 multiple release branches.
 
 
+3.1.6 -- TBD
+----------------------
+
+
+3.1.5 -- 14 Feb 2020
+----------------------
+NOTE: The signature of the PMIx_Allocation_request has changed
+in accordance with an Errata update of the PMIx v3 Standard
+- PR #1413/#1465: Remove unnecessary error log
+- PR #1433: Return the correct status from PMIx_Publish
+- PR #1445: Sync. with master to fix 'get' of data for unknown namespace
+  Includes the following PRs from master
+  - PR #1382: dstore: fixed truncate key-names while restoring 
+  - PR #1405: Fix xnspace dmodex and add verbose debug
+  - PR #1406: Resolve request for job-level data
+  - PR #1407/#1409/#1411: Fix dmodex across nspaces
+  - PR #1434/#1436: Cleanup handling of info arrays
+  - PR #1435: Cleanup example and remove debug
+  - PR #1437: Update blocking Allocation_request signature
+  - PR #1440: Fix 'get' of data for unknown namespace
+  - PR #1442: Fix fences with namespaces where no local processes are running
+- PR #1472: Initialize nlocal and local in the tracker
+- PR #1487: Sync. with master to fix info array and cross-version issues
+- PR #1493/#1497/#1501/#1505/#1589: Info array and Cross-version fixes
+- PR #1511/#1517/#1520/#1523/#1534/#1565: Fix pmix tests
+- PR #1530: Improve handling of servers piror to v3.1.5
+- PR #1531: Update transfer from hash to dstore
+- PR #1538: Fix singleton initialization
+- PR #1547: Add missing PMIx_IOF_deregister function
+- PR #1554/#1591: Fix memory leak on namespace deregister
+- PR #1561: Configury fix for reproducible builds
+- PR #1579: Protect pthread setpshared calls
+- PR #1587: Fix to gds/dstore configure logic
+- PR #1610: Adjust hotel timeout to be in whole seconds
+- PR #1613: dstore: Fix cache size calculation
+- PR #1622: Fix multiple occurrences of unaligned access in pmix tests
+- PR #1620: Re-address the collective tracker problem
+
+
 3.1.4 -- 9 Aug 2019
 ----------------------
 - PR #1342: Fix if_linux_ipv6_open interface filter

opal/mca/pmix/pmix3x/pmix/VERSION

@@ -4,6 +4,8 @@
 # Copyright (c) 2013      Mellanox Technologies, Inc.
 #                         All rights reserved.
 # Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
+# Copyright (c) 2020      IBM Corporation.  All rights reserved.
+
 
 # This is the VERSION file for PMIx, describing the precise
 # version of PMIx in this distribution.  The various components of
@@ -15,22 +17,22 @@
 
 major=3
 minor=1
-release=4
+release=5
 
 # 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=rc2
 
 # 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=gite6837057
+repo_rev=git1fca232
 
 # 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 +46,7 @@ tarball_version=
 
 # The date when this release was created
 
-date="Aug 09, 2019"
+date="Feb 10, 2020"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library
@@ -75,7 +77,7 @@ date="Aug 09, 2019"
 # Version numbers are described in the Libtool current:revision:age
 # format.
 
-libpmix_so_version=4:24:2
+libpmix_so_version=4:25:2
 libpmi_so_version=1:1:0
 libpmi2_so_version=1:0:0
 
@@ -84,4 +86,4 @@ libpmi2_so_version=1:0:0
 # # well.  Yuck; this somewhat breaks the
 # # components-don't-affect-the-build-system abstraction.
 #
-libmca_common_dstore_so_version=1:1:0
+libmca_common_dstore_so_version=1:2:0

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2019 Intel, Inc.  All rights reserved.
+# Copyright (c) 2013-2016 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.

opal/mca/pmix/pmix3x/pmix/config/c_get_alignment.m4

@@ -11,7 +11,7 @@ dnl                         University of Stuttgart.  All rights reserved.
 dnl Copyright (c) 2004-2005 The Regents of the University of California.
 dnl                         All rights reserved.
 dnl Copyright (c) 2009      Sun Microsystems, Inc.  All rights reserved.
-dnl Copyright (c) 2014-2019 Intel, Inc.  All rights reserved.
+dnl Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
 dnl Copyright (c) 2015-2019 Research Organization for Information Science
 dnl                         and Technology (RIST).  All rights reserved.
 dnl $COPYRIGHT$

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

@@ -15,7 +15,7 @@
 #                         and Technology (RIST).  All rights reserved.
 # Copyright (c) 2015      Los Alamos National Security, LLC. All rights
 #                         reserved.
-# Copyright (c) 2017-2019 Intel, Inc.  All rights reserved.
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow

opal/mca/pmix/pmix3x/pmix/config/pmix.m4

@@ -17,7 +17,7 @@ dnl Copyright (c) 2009      Los Alamos National Security, LLC.  All rights
 dnl                         reserved.
 dnl Copyright (c) 2009-2011 Oak Ridge National Labs.  All rights reserved.
 dnl Copyright (c) 2011-2013 NVIDIA Corporation.  All rights reserved.
-dnl Copyright (c) 2013-2019 Intel, Inc.  All rights reserved.
+dnl Copyright (c) 2013-2020 Intel, Inc.  All rights reserved.
 dnl Copyright (c) 2015-2019 Research Organization for Information Science
 dnl                         and Technology (RIST).  All rights reserved.
 dnl Copyright (c) 2016      Mellanox Technologies, Inc.
@@ -785,6 +785,15 @@ AC_DEFUN([PMIX_SETUP_CORE],[
 
     PMIX_ZLIB_CONFIG
 
+    ##################################
+    # Dstore Locking
+    ##################################
+
+    pmix_show_title "Dstore Locking"
+
+    PMIX_CHECK_DSTOR_LOCK
+
+
     ##################################
     # MCA
     ##################################
@@ -823,13 +832,6 @@ AC_DEFUN([PMIX_SETUP_CORE],[
 
     PMIX_MCA
 
-    ##################################
-    # Dstore Locking
-    ##################################
-
-    pmix_show_title "Dstore Locking"
-
-    PMIX_CHECK_DSTOR_LOCK
 
     ############################################################################
     # final compiler config

opal/mca/pmix/pmix3x/pmix/config/pmix_check_compiler_version.m4

@@ -1,7 +1,7 @@
 dnl -*- shell-script -*-
 dnl
 dnl Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
-dnl Copyright (c) 2013-2019 Intel, Inc.  All rights reserved.
+dnl Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
 dnl Copyright (c) 2019      Research Organization for Information Science
 dnl                         and Technology (RIST).  All rights reserved.
 dnl

opal/mca/pmix/pmix3x/pmix/config/pmix_check_icc.m4

@@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
 dnl                         University of Stuttgart.  All rights reserved.
 dnl Copyright (c) 2004-2005 The Regents of the University of California.
 dnl                         All rights reserved.
-dnl Copyright (c) 2014-2019 Intel, Inc.  All rights reserved.
+dnl Copyright (c) 2014      Intel, Inc. All rights reserved.
 dnl Copyright (c) 2016-2019 Research Organization for Information Science
 dnl                         and Technology (RIST).  All rights reserved.
 dnl $COPYRIGHT$

opal/mca/pmix/pmix3x/pmix/config/pmix_check_lock.m4

@@ -5,7 +5,7 @@ dnl                         All rights reserved.
 dnl Copyright (c) 2017      IBM Corporation.  All rights reserved.
 dnl Copyright (c) 2017      Research Organization for Information Science
 dnl                         and Technology (RIST). All rights reserved.
-dnl Copyright (c) 2017      Intel, Inc. All rights reserved.
+dnl Copyright (c) 2017-2020 Intel, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl
 dnl Additional copyrights may follow
@@ -14,35 +14,61 @@ dnl $HEADER$
 dnl
 
 AC_DEFUN([PMIX_CHECK_DSTOR_LOCK],[
+
+    PMIX_VAR_SCOPE_PUSH(orig_libs pmix_prefer_write_nonrecursive)
+
     orig_libs=$LIBS
     LIBS="-lpthread $LIBS"
 
-    _x_ac_pthread_lock_found="0"
-    _x_ac_fcntl_lock_found="0"
+    _x_ac_pthread_lock_found=0
+    _x_ac_fcntl_lock_found=0
+    pmix_prefer_write_nonrecursive=0
 
-    AC_CHECK_MEMBERS([struct flock.l_type],
-    [
-        AC_DEFINE([HAVE_FCNTL_FLOCK], [1],
-        [Define to 1 if you have the locking by fcntl.])
-        _x_ac_fcntl_lock_found="1"
-    ], [], [#include <fcntl.h>])
+    AC_CHECK_MEMBER([struct flock.l_type],
+                    [pmix_fcntl_flock_happy=yes
+                     _x_ac_fcntl_lock_found=1],
+                    [pmix_fcntl_flock_happy=no],
+                    [#include <fcntl.h>])
 
     if test "$DSTORE_PTHREAD_LOCK" = "1"; then
+
+        AC_MSG_CHECKING([pthread_process_shared])
+        AC_EGREP_CPP([yes],
+                     [#include <pthread.h>
+                      #ifdef PTHREAD_PROCESS_SHARED
+                        yes
+                      #endif
+                     ],
+                     [AC_MSG_RESULT(yes)
+                      pmix_pthread_process_shared=yes],
+                     [AC_MSG_RESULT(no)
+                      pmix_pthread_process_shared=no])
+
         AC_CHECK_FUNC([pthread_rwlockattr_setkind_np],
-            [AC_EGREP_HEADER([PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP],
-                    [pthread.h],[
-                        AC_DEFINE([HAVE_PTHREAD_SETKIND], [1],
-                            [Define to 1 if you have the `pthread_rwlockattr_setkind_np` function.])])])
+                      [pmix_pthread_rwlockattr_setkind_np=yes
+                       AC_EGREP_CPP([yes],
+                                    [#include <pthread.h>
+                                     #ifdef PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP
+                                       yes
+                                     #endif
+                                    ],
+                                    [pmix_pthread_rwlock_prefer_writer_nonrecursive_np=yes],
+                                    [pmix_pthread_rwlock_prefer_writer_nonrecursive_np=no])],
+            [pmix_pthread_rwlockattr_setkind_np=no])
 
         AC_CHECK_FUNC([pthread_rwlockattr_setpshared],
-            [AC_EGREP_HEADER([PTHREAD_PROCESS_SHARED],
-                    [pthread.h],[
-                        AC_DEFINE([HAVE_PTHREAD_SHARED], [1],
-                            [Define to 1 if you have the `PTHREAD_PROCESS_SHARED` definition.
-                        ])
-                        _x_ac_pthread_lock_found="1"
-            ])
-        ])
+                      [pmix_pthread_rwlockattr_setpshared=yes
+                       AS_IF([test "$pmix_pthread_process_shared" = "yes"],
+                            [_x_ac_pthread_lock_found=1]]),
+                      [pmix_pthread_rwlockattr_setpshared=no])
+
+        AC_CHECK_FUNC([pthread_mutexattr_setpshared],
+                      [pmix_pthread_mutexattr_setpshared=yes],
+                      [pmix_pthread_mutexattr_setpshared=no])
+
+        AS_IF([test "$pmix_pthread_rwlockattr_setkind_np" = "yes" && test "$pmix_pthread_rwlock_prefer_writer_nonrecursive_np" = "yes"],
+              [pmix_prefer_write_nonrecursive=1],
+              [pmix_prefer_write_nonrecursive=0])
 
         if test "$_x_ac_pthread_lock_found" = "0"; then
             if test "$_x_ac_fcntl_lock_found" = "1"; then
@@ -57,6 +83,12 @@ AC_DEFUN([PMIX_CHECK_DSTOR_LOCK],[
         fi
     fi
     LIBS="$orig_libs"
+
+    AC_DEFINE_UNQUOTED([PMIX_PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP],
+                       [$pmix_prefer_write_nonrecursive],
+                       [Whether or not we found the optional write_nonrecursive_np flag])
     AM_CONDITIONAL([HAVE_DSTORE_PTHREAD_LOCK], [test "$_x_ac_pthread_lock_found" = "1"])
     AM_CONDITIONAL([HAVE_DSTORE_FCNTL_LOCK], [test "$_x_ac_fcntl_lock_found" = "1"])
+
+    PMIX_VAR_SCOPE_POP
 ])