Merge pull request #5385 from rhc54/cmr30/pmix212

v3.0.x: Update to PMIx v2.1.2

Author: hppritcha

.gitignore

@@ -311,6 +311,7 @@ opal/mca/pmix/pmix*/pmix/src/include/private/autogen/config.h.in
 opal/mca/pmix/pmix*/pmix/src/include/private/autogen/config.h
 opal/mca/hwloc/base/static-components.h.new.extern
 opal/mca/hwloc/base/static-components.h.new.struct
+opal/mca/pmix/pmix2x/pmix/include/pmix_common.h
 opal/mca/pmix/pmix2x/pmix/src/include/frameworks.h
 opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/pinstall_dirs.h
 opal/mca/pmix/pmix2x/pmix/config/autogen_found_items.m4

ompi/errhandler/errcode-internal.h

@@ -14,6 +14,7 @@
  * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
  * Copyright (c) 2012      Los Alamos National Security, LLC.  All rights
  *                         reserved.
+ * Copyright (c) 2018      Intel, Inc. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -69,7 +70,7 @@ static inline int ompi_errcode_get_mpi_code(int errcode)
        it */
     for (i = 0; i < ompi_errcode_intern_lastused; i++) {
         errc = (ompi_errcode_intern_t *)opal_pointer_array_get_item(&ompi_errcodes_intern, i);
-        if (errc->code == errcode) {
+        if (NULL != errc && errc->code == errcode) {
             ret = errc->mpi_code;
             break;
         }

ompi/runtime/ompi_mpi_init.c

@@ -17,7 +17,7 @@
  * Copyright (c) 2008-2009 Sun Microsystems, Inc.  All rights reserved.
  * Copyright (c) 2011      Sandia National Laboratories. All rights reserved.
  * Copyright (c) 2012-2013 Inria.  All rights reserved.
- * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
  * Copyright (c) 2014-2016 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2016      Mellanox Technologies Ltd. All rights reserved.
@@ -392,7 +392,7 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided,
     int32_t expected = OMPI_MPI_STATE_NOT_INITIALIZED;
     int32_t desired  = OMPI_MPI_STATE_INIT_STARTED;
     opal_atomic_wmb();
-    if (!opal_atomic_cmpset_32(&ompi_mpi_state, &expected, desired)) {
+    if (!opal_atomic_cmpset_32(&ompi_mpi_state, expected, desired)) {
         // If we failed to atomically transition ompi_mpi_state from
         // NOT_INITIALIZED to INIT_STARTED, then someone else already
         // did that, and we should return.

opal/mca/hwloc/hwloc1117/hwloc/hwloc.pc.in

@@ -4,7 +4,7 @@ PMIx Authors
 The following cumulative list contains the names and GitHub IDs of
 all individuals who have committed code to the PMIx repository.
 
-Email                           Name                        Affiliation(s)
+GitHub ID                       Name                        Affiliation(s)
 ------------------------------- --------------------------- -------------------
 alinask                         Elena Shipunova             Mellanox
 annu13                          Annapurna Dasari            Intel

opal/mca/pmix/pmix2x/pmix/AUTHORS

@@ -9,7 +9,7 @@ Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
 Copyright (c) 2004-2005 The Regents of the University of California.
                         All rights reserved.
 Copyright (c) 2008-2015 Cisco Systems, Inc.  All rights reserved.
-Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
 $COPYRIGHT$
 
 Additional copyrights may follow
@@ -21,10 +21,10 @@ For More Information
 ====================
 
 This file is a *very* short overview of building and installing
-the PMIx library.  Much more information is available on the
-PMIx web site (e.g., see the FAQ section):
+the PMIx library.  Much more information is available in the
+FAQ section on the PMIx web site:
 
-    http://pmix.github.io/pmix/pmix
+    http://pmix.github.io/pmix/faq
 
 
 Developer Builds

opal/mca/pmix/pmix2x/pmix/INSTALL

@@ -26,7 +26,7 @@ Copyright (c) 2006-2010 Sun Microsystems, Inc.  All rights reserved.
 Copyright (c) 2006-2010 The University of Houston. All rights reserved.
 Copyright (c) 2006-2009 Myricom, Inc.  All rights reserved.
 Copyright (c) 2007-2008 UT-Battelle, LLC. All rights reserved.
-Copyright (c) 2007-2010 IBM Corporation.  All rights reserved.
+Copyright (c) 2007-2018 IBM Corporation.  All rights reserved.
 Copyright (c) 1998-2005 Forschungszentrum Juelich, Juelich Supercomputing
                         Centre, Federal Republic of Germany
 Copyright (c) 2005-2008 ZIH, TU Dresden, Federal Republic of Germany
@@ -36,7 +36,7 @@ Copyright (c) 2008-2009 Institut National de Recherche en
                         Informatique.  All rights reserved.
 Copyright (c) 2007      Lawrence Livermore National Security, LLC.
                         All rights reserved.
-Copyright (c) 2007-2009 Mellanox Technologies.  All rights reserved.
+Copyright (c) 2007-2018 Mellanox Technologies.  All rights reserved.
 Copyright (c) 2006-2010 QLogic Corporation.  All rights reserved.
 Copyright (c) 2008-2010 Oak Ridge National Labs.  All rights reserved.
 Copyright (c) 2006-2010 Oracle and/or its affiliates.  All rights reserved.
@@ -45,7 +45,7 @@ Copyright (c) 2010      ARM ltd.  All rights reserved.
 Copyright (c) 2010-2011 Alex Brick <[email protected]>.  All rights reserved.
 Copyright (c) 2012      The University of Wisconsin-La Crosse. All rights
                         reserved.
-Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
+Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
 Copyright (c) 2011-2014 NVIDIA Corporation.  All rights reserved.
 
 $COPYRIGHT$

opal/mca/pmix/pmix2x/pmix/LICENSE

@@ -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-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -23,7 +23,7 @@
 # via AC_CONFIG_MACRO_DIR in configure.ac.
 ACLOCAL_AMFLAGS = -I ./config
 
-SUBDIRS = config contrib include src
+SUBDIRS = config contrib include src etc
 
 
 headers =
@@ -61,4 +61,3 @@ nroff:
 
 dist-hook:
 	env LS_COLORS= sh "$(top_srcdir)/config/distscript.sh" "$(top_srcdir)" "$(distdir)" "$(PMIX_VERSION)" "$(PMIX_REPO_REV)"
-

opal/mca/pmix/pmix2x/pmix/Makefile.am

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2018 Intel, Inc.  All rights reserved.
+Copyright (c) 2015-2018 Intel, Inc. All rights reserved.
 Copyright (c) 2017      IBM Corporation.  All rights reserved.
 $COPYRIGHT$
 
@@ -20,11 +20,50 @@ 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
+
+2.1.2 -- TBD
+----------------------
+- Added PMIX_VERSION_RELEASE string to pmix_version.h
+- Added PMIX_SPAWNED and PMIX_PARENT_ID keys to all procs
+  started via PMIx_Spawn
+- Fixed faulty compares in PMI/PMI2 tests
+- Fixed bug in direct modex for data on remote node
+- Correctly transfer all cached job info to the client's
+  shared memory region upon first connection
+- Fix potential deadlock in PMIx_server_init in an error case
+- Fix uninitialized variable
+- Fix several memory and file descriptor leaks
+
+
+2.1.1 -- 5 Mar 2018
+----------------------
+- Fix direct modex when receiving new nspace
+- Resolve direct modex of job-level info
+- Fix a bug in attribute configuration checks
+- Fix a couple of bugs in unpacking of direct modex job-level data
+- Correcly handle application setup data during "instant on" launch
+- add a PMIX_BYTE_OBJECT_LOAD convenience macro
+- Fix two early "free" bugs
+- Add an example PMI-1 client program
+
+
+2.1.0 -- 1 Feb 2018
+----------------------
+**** NOTE: This release contains the first implementation of cross-version
+**** support. Servers using v2.1.0 are capable of supporting clients using
+**** PMIx versions v1.2 and above. Clients using v2.1.0 are able to interact
+**** with servers based on v1.2 and above.
+- Added cross-version communication support
+- Enable reporting of contact URI to stdout, stderr, or file (PR #538)
+- Enable support for remote tool connections (PR #540, #542)
+- Cleanup libevent configure logic to support default install paths (PR #541)
+- Debounce "unreachable" notifications for tools when they disconnect (PR #544)
+- Enable the regex generator to support node names that include multiple
+  sets of numbers
+
+
+2.0.3 -- 1 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
@@ -43,7 +82,6 @@ current release as well as the "stable" bug fix release branch.
 - 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
@@ -69,8 +107,8 @@ current release as well as the "stable" bug fix release branch.
   operations to discover rendezvous files
 
 
-2.0.0 -- 22 Jun 2017
-----------------------
+2.0.0
+------
 **** NOTE: This release implements the complete PMIX v2.0 Standard
 **** and therefore includes a number of new APIs and features. These
 **** can be tracked by their RFC's in the RFC repository at:
@@ -127,6 +165,14 @@ current release as well as the "stable" bug fix release branch.
   and to themselves
 
 
+1.2.5 -- 1 Feb 2018
+----------------------
+- Fix cross-version issue when v1.2 client interacts with v2.1 server (PR #564)
+- Update client connection for cross-version support (PR #591)
+- Fix write memory barrier ASM for PowerPC (PR #606)
+- Add protection from overly-large messages
+
+
 1.2.4 -- 13 Oct. 2017
 ----------------------
 - Silence some unnecessary warning messages (PR #487)

opal/mca/pmix/pmix2x/pmix/NEWS

@@ -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-2017 Intel, Inc.  All rights reserved.
+Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
 $COPYRIGHT$
 
 Additional copyrights may follow
@@ -25,13 +25,14 @@ $HEADER$
 ===========================================================================
 
 When submitting questions and problems, be sure to include as much
-extra information as possible.  This web page details all the
-information that we request in order to provide assistance:
+extra information as possible.  The issues template on the
+GitHub repo provides directions:
 
-     http://pmix.github.io/master/community/help/
+     http://github.com/pmix/pmix/issues
 
 The best way to report bugs, send comments, or ask questions is to
-sign up on the PMIx mailing list, which is hosted by GoogleGroups:
+open an issue on the repo. Alternatively, you are welcome to sign
+up for the developer/user mailing list:
 
         [email protected]
 
@@ -48,7 +49,7 @@ Thanks for your time.
 
 More information is available in the PMIx FAQ:
 
-    http://pmix.github.io/master/faq/
+    https://pmix.org/support
 
 We are in early days, so please be patient - info will grow as questions
 are addressed.
@@ -63,7 +64,7 @@ General notes
 
 - The majority of PMIx's documentation is here in this file, the
   included man pages, and on the web site FAQ
-  (http://pmix.github.io/master/faq).  This will eventually be
+  (https://pmix.org/support).  This will eventually be
   supplemented with cohesive installation and user documentation files.
 
 - Systems that have been tested are:
@@ -312,7 +313,7 @@ Common Questions
 Many common questions about building and using PMIx are answered
 on the FAQ:
 
-    http://pmix.github.io/master/faq/
+    https://pmix.org/support
 
 ===========================================================================
 
@@ -323,10 +324,10 @@ Found a bug?  Got a question?  Want to make a suggestion?  Want to
 contribute to PMIx?  Please let us know!
 
 When submitting questions and problems, be sure to include as much
-extra information as possible.  This web page details all the
-information that we request in order to provide assistance:
+extra information as possible. Again, the issues template is your
+friend in this regard!
 
-     http://pmix.github.io/master/community/help/
+     https://github.com/pmix/pmix/issues
 
 Questions and comments should generally be sent to the PMIx mailing
 list ([email protected]).  Because of spam, only
@@ -338,4 +339,4 @@ user's list:
 
      https://groups.google.com/d/forum/pmix
 
-Make today an PMIx day!
+Make today a PMIx day!