Update to PMIx v2.1.0alpha

Signed-off-by: Ralph Castain <[email protected]>

Author: Ralph Castain

opal/mca/pmix/pmix2x/pmix/AUTHORS

@@ -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/INSTALL

@@ -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/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
@@ -28,7 +28,7 @@ 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:
 
-     http://pmix.github.io/master/community/help/
+     http://pmix.github.io/pmix/community/help/
 
 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:
@@ -48,7 +48,7 @@ Thanks for your time.
 
 More information is available in the PMIx FAQ:
 
-    http://pmix.github.io/master/faq/
+    http://pmix.github.io/pmix/faq/
 
 We are in early days, so please be patient - info will grow as questions
 are addressed.
@@ -63,7 +63,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
+  (http://pmix.github.io/pmix/faq).  This will eventually be
   supplemented with cohesive installation and user documentation files.
 
 - Systems that have been tested are:
@@ -286,7 +286,7 @@ Common Questions
 Many common questions about building and using PMIx are answered
 on the FAQ:
 
-    http://pmix.github.io/master/faq/
+    http://pmix.github.io/pmix/faq/
 
 ===========================================================================
 
@@ -300,7 +300,7 @@ 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:
 
-     http://pmix.github.io/master/community/help/
+     http://pmix.github.io/pmix/community/help/
 
 Questions and comments should generally be sent to the PMIx mailing
 list ([email protected]).  Because of spam, only

opal/mca/pmix/pmix2x/pmix/VERSION

@@ -13,8 +13,8 @@
 # major, minor, and release are generally combined in the form
 # <major>.<minor>.<release>.
 
-major=3
-minor=0
+major=2
+minor=1
 release=0
 
 # greek is used for alpha or beta release tags.  If it is non-empty,
@@ -30,7 +30,7 @@ greek=
 # command, or with the date (if "git describe" fails) in the form of
 # "date<date>".
 
-repo_rev=gitaa26b56
+repo_rev=git4714f20
 
 # 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="Jun 26, 2017"
+date="Jul 20, 2017"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library

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

@@ -3,6 +3,8 @@
 # Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2013      Los Alamos National Security, LLC.  All rights reserved.
 # Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+# Copyright (c) 2017      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -39,8 +41,11 @@ AC_DEFUN([_PMIX_LIBEVENT_EMBEDDED_MODE],[
     AC_MSG_CHECKING([for libevent])
     AC_MSG_RESULT([assumed available (embedded mode)])
 
-    PMIX_EVENT_HEADER="$with_libevent_header"
-    PMIX_EVENT2_THREAD_HEADER="$with_libevent_header"
+    AS_IF([test -z "$with_libevent_header" || test "$with_libevent_header" = "yes"],
+          [PMIX_EVENT_HEADER="<event.h>"
+           PMIX_EVENT2_THREAD_HEADER="<event2/thread.h>"],
+          [PMIX_EVENT_HEADER="$with_libevent_header"
+           PMIX_EVENT2_THREAD_HEADER="$with_libevent_header"])
 
  ])
 

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

@@ -55,6 +55,19 @@ AC_CONFIG_MACRO_DIR(./config)
 # because it twiddles random bits of autoconf
 PMIX_LOAD_PLATFORM
 
+PMIX_TOP_BUILDDIR="`pwd`"
+AC_SUBST(PMIX_TOP_BUILDDIR)
+cd "$srcdir"
+PMIX_TOP_SRCDIR="`pwd`"
+AC_SUBST(PMIX_TOP_SRCDIR)
+cd "$PMIX_TOP_BUILDDIR"
+
+AC_MSG_NOTICE([builddir: $PMIX_TOP_BUILDDIR])
+AC_MSG_NOTICE([srcdir: $PMIX_TOP_SRCDIR])
+if test "$PMIX_TOP_BUILDDIR" != "$PMIX_TOP_SRCDIR"; then
+    AC_MSG_NOTICE([Detected VPATH build])
+fi
+
 # setup configure options (e.g., show_title and friends)
 PMIX_CONFIGURE_SETUP
 pmix_show_title "Configuring PMIx"

opal/mca/pmix/pmix2x/pmix/examples/alloc.c

@@ -208,7 +208,7 @@ int main(int argc, char **argv)
          * query the status of the allocation request */
         usleep(10);
         PMIX_QUERY_CREATE(query, 1);
-        PMIX_ARGV_APPEND(query[0].keys, PMIX_QUERY_ALLOC_STATUS);
+        PMIX_ARGV_APPEND(rc, query[0].keys, PMIX_QUERY_ALLOC_STATUS);
         PMIX_INFO_CREATE(query[0].qualifiers, 1);
         PMIX_INFO_LOAD(&query[0].qualifiers[0], PMIX_ALLOC_ID, myallocation, PMIX_STRING);
         mydata.active = true;

opal/mca/pmix/pmix2x/pmix/examples/debugger.c

@@ -267,8 +267,8 @@ int main(int argc, char **argv)
          * so we know if the RM can stop-on-exec, or only supports stop-in-init */
         nq = 1;
         PMIX_QUERY_CREATE(query, nq);
-        PMIX_ARGV_APPEND(query[0].keys, PMIX_QUERY_SPAWN_SUPPORT);
-        PMIX_ARGV_APPEND(query[0].keys, PMIX_QUERY_DEBUG_SUPPORT);
+        PMIX_ARGV_APPEND(rc, query[0].keys, PMIX_QUERY_SPAWN_SUPPORT);
+        PMIX_ARGV_APPEND(rc, query[0].keys, PMIX_QUERY_DEBUG_SUPPORT);
         /* setup the caddy to retrieve the data */
         myquery_data.info = NULL;
         myquery_data.ninfo = 0;
@@ -333,7 +333,7 @@ int main(int argc, char **argv)
             PMIX_APP_CREATE(app, napps);
             /* setup the executable */
             app[0].cmd = strdup("client");
-            PMIX_ARGV_APPEND(app[0].argv, "./client");
+            PMIX_ARGV_APPEND(rc, app[0].argv, "./client");
             getcwd(cwd, 1024);  // point us to our current directory
             app[0].cwd = strdup(cwd);
             app[0].maxprocs = 2;
@@ -359,7 +359,7 @@ int main(int argc, char **argv)
             /* setup the debugger */
             PMIX_APP_CREATE(debugger, 1);
             debugger[0].cmd = strdup("./debuggerd");
-            PMIX_ARGV_APPEND(debugger[0].argv, "./debuggerd");
+            PMIX_ARGV_APPEND(rc, debugger[0].argv, "./debuggerd");
             debugger[0].cwd = strdup(cwd);
             /* provide directives so the daemons go where we want, and
              * let the RM know these are debugger daemons */

opal/mca/pmix/pmix2x/pmix/examples/debuggerd.c

@@ -13,7 +13,7 @@
  *                         All rights reserved.
  * Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
- * Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
  * Copyright (c) 2015      Mellanox Technologies, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
@@ -172,7 +172,7 @@ int main(int argc, char **argv)
      * our local target processes */
     nq = 1;
     PMIX_QUERY_CREATE(query, nq);
-    PMIX_ARGV_APPEND(query[0].keys, PMIX_QUERY_LOCAL_PROC_TABLE);
+    PMIX_ARGV_APPEND(rc, query[0].keys, PMIX_QUERY_LOCAL_PROC_TABLE);
     query[0].nqual = 1;
     PMIX_INFO_CREATE(query[0].qualifiers, 1);
     PMIX_INFO_LOAD(&query[0].qualifiers[0], PMIX_NSPACE, val->data.string, PMIX_STRING);  // the nspace we are enquiring about

opal/mca/pmix/pmix2x/pmix/examples/server.c

@@ -28,6 +28,7 @@
 #include <src/include/pmix_config.h>
 #include <pmix_server.h>
 #include <src/include/types.h>
+#include <src/include/pmix_globals.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -48,7 +49,6 @@
 #include "src/util/output.h"
 #include "src/util/printf.h"
 #include "src/util/argv.h"
-#include "src/buffer_ops/buffer_ops.h"
 
 static pmix_status_t connected(const pmix_proc_t *proc, void *server_object,
                                pmix_op_cbfunc_t cbfunc, void *cbdata);