Merge pull request #4406 from rhc54/topic/update

 Sync to PMIx master (now v3.0)

Author: Ralph Castain

opal/mca/event/external/configure.m4

@@ -2,9 +2,10 @@
 #
 # Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2013      Los Alamos National Security, LLC.  All rights reserved.
-# Copyright (c) 2015      Research Organization for Information Science
+# Copyright (c) 2015-2017 Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 #
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -95,9 +96,17 @@ AC_DEFUN([MCA_opal_event_external_CONFIG],[
            AS_IF([test "$with_libevent" != "external" && test "$with_libevent" != "yes"],
                  [opal_event_dir=$with_libevent
                   AC_MSG_RESULT([$opal_event_dir])
-                  OPAL_CHECK_WITHDIR([libevent], [$with_libdir],
+                  OPAL_CHECK_WITHDIR([libevent], [$opal_event_dir],
                                      [include/event.h])
-                 ],
+                  AS_IF([test -z "$with_libevent_libdir" || test "$with_libevent_libdir" = "yes"],
+                        [AS_IF([test -d "$with_libevent/lib64"],
+                               [opal_event_libdir="$with_libevent/lib64"],
+                               [AS_IF([test -d "$with_libevent/lib"],
+                                      [opal_event_libdir="$with_libevent/lib"],
+                                      [AC_MSG_WARN([libevent library were neither found under:])
+                                       AC_MSG_WARN([    $with_libevent/lib64])
+                                       AC_MSG_WARN([    $with_libevent/lib])
+                                       AC_MSG_ERROR([Cannot continue])])])])],
                  [AC_MSG_RESULT([(default search paths)])])
            AS_IF([test ! -z "$with_libevent_libdir" && test "$with_libevent_libdir" != "yes"],
                  [opal_event_libdir="$with_libevent_libdir"])

opal/mca/pmix/pmix3x/configure.m4

@@ -53,13 +53,19 @@ AC_DEFUN([MCA_opal_pmix_pmix3x_CONFIG],[
         opal_pmix_pmix3x_timing_flag=--disable-pmix-timing
     fi
 
-    opal_pmix_pmix3x_args="$opal_pmix_pmix3x_timing_flag --without-tests-examples --disable-pmix-backward-compatibility --disable-visibility --enable-embedded-libevent --with-libevent-header=\\\"opal/mca/event/$opal_event_base_include\\\""
+    opal_pmix_pmix3x_args="$opal_pmix_pmix3x_timing_flag --without-tests-examples --disable-pmix-binaries --disable-pmix-backward-compatibility --disable-visibility --enable-embedded-libevent --with-libevent-header=\\\"opal/mca/event/$opal_event_base_include\\\""
     AS_IF([test "$enable_debug" = "yes"],
           [opal_pmix_pmix3x_args="--enable-debug $opal_pmix_pmix3x_args"
            CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS -g"],
           [opal_pmix_pmix3x_args="--disable-debug $opal_pmix_pmix3x_args"
            CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"])
-    AS_IF([test "$enable_install_libpmix" != "yes"],
+    AS_IF([test "$enable_install_libpmix" == "yes"],
+          [AS_IF([test "$opal_event_external_want" != "yes"],
+                 [AC_MSG_WARN([Installing the embedded PMIx library as a separate])
+                  AC_MSG_WARN([standalone library requires that OMPI be configured])
+                  AC_MSG_WARN([against an external version of libevent.])
+                  AC_MSG_ERROR([Cannot continue])])
+           opal_pmix_pmix3x_args="--with-pmix-extra-lib=\"$opal_event_libdir/libevent.la $opal_event_libdir/libevent_pthreads.la\" $opal_pmix_pmix3x_args"],
           [opal_pmix_pmix3x_args="--with-pmix-symbol-rename=OPAL_MCA_PMIX2X_ --enable-embedded-mode $opal_pmix_pmix3x_args"])
     AS_IF([test "$with_devel_headers" = "yes"],
           [opal_pmix_pmix3x_args="--with-devel-headers  $opal_pmix_pmix3x_args"])

opal/mca/pmix/pmix3x/pmix/NEWS

@@ -25,8 +25,44 @@ Master (not on release branches yet)
 ------------------------------------
 
 
-2.0.0
-------
+2.1.0 -- 26 Oct 2017
+----------------------
+**** 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 logi to support default install paths (PR #541)
+- Debounce "unreachable" notifications for tools when they disconnect (PR #544)
+
+
+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
+----------------------
+- Protect PMIX_INFO_FREE macro from NULL data arrays
+- Added attributes to support HWLOC shared memory regions
+- Fixed several syntax errors in configure code
+- Fixed several visibility errors
+- Correctly return status from PMIx_Fence operation
+- Restore tool connection support and implement search
+  operations to discover rendezvous files
+
+
+2.0.0 -- 22 Jun 2017
+----------------------
 **** 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:

opal/mca/pmix/pmix3x/pmix/VERSION

@@ -30,7 +30,7 @@ greek=
 # command, or with the date (if "git describe" fails) in the form of
 # "date<date>".
 
-repo_rev=gitd74c321
+repo_rev=gitffa464b
 
 # 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="Oct 14, 2017"
+date="Oct 26, 2017"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library

opal/mca/pmix/pmix3x/pmix/autogen.pl

@@ -254,7 +254,7 @@ (\$\@)
 
     foreach my $framework (@frameworks) {
         # There is no common framework object
-        if ($framework ne "common") {
+        if ($framework ne "common" and $framework ne "src") {
             my $framework_name = "pmix_${framework}_base_framework";
             $framework_array_output .= "    &$framework_name,\n";
             $framework_decl_output .= "extern pmix_mca_base_framework_t $framework_name;\n";
@@ -269,7 +269,7 @@ (\$\@)
 #ifndef $ifdef_string
 #define $ifdef_string
 
-#include <pmix/mca/base/mca_base_framework.h>
+#include <src/mca/base/pmix_mca_base_framework.h>
 
 $framework_decl_output
 static pmix_mca_base_framework_t *pmix_frameworks[] = {

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

@@ -123,6 +123,24 @@ AC_DEFUN([PMIX_SETUP_CORE],[
     AC_DEFINE_UNQUOTED([PMIX_RELEASE_VERSION], [$PMIX_RELEASE_VERSION],
                        [The library release version is always available, contrary to VERSION])
 
+    PMIX_GREEK_VERSION="`$PMIX_top_srcdir/config/pmix_get_version.sh $PMIX_top_srcdir/VERSION --greek`"
+    if test "$?" != "0"; then
+        AC_MSG_ERROR([Cannot continue])
+    fi
+    AC_SUBST(PMIX_GREEK_VERSION)
+
+    PMIX_REPO_REV="`$PMIX_top_srcdir/config/pmix_get_version.sh $PMIX_top_srcdir/VERSION --repo-rev`"
+    if test "$?" != "0"; then
+        AC_MSG_ERROR([Cannot continue])
+    fi
+    AC_SUBST(PMIX_REPO_REV)
+
+    PMIX_RELEASE_DATE="`$PMIX_top_srcdir/config/pmix_get_version.sh $PMIX_top_srcdir/VERSION --release-date`"
+    if test "$?" != "0"; then
+        AC_MSG_ERROR([Cannot continue])
+    fi
+    AC_SUBST(PMIX_RELEASE_DATE)
+
     # Debug mode?
     AC_MSG_CHECKING([if want pmix maintainer support])
     pmix_debug=
@@ -175,6 +193,21 @@ AC_DEFUN([PMIX_SETUP_CORE],[
            PMIX_EXTRA_LIB=])
     AC_SUBST(PMIX_EXTRA_LIB)
 
+    #
+    # Package/brand string
+    #
+    AC_MSG_CHECKING([if want package/brand string])
+    AC_ARG_WITH([pmix-package-string],
+         [AC_HELP_STRING([--with-pmix-package-string=STRING],
+                         [Use a branding string throughout PMIx])])
+    if test "$with_pmix_package_string" = "" || test "$with_pmix_package_string" = "no"; then
+        with_package_string="PMIx $PMIX_CONFIGURE_USER@$PMIX_CONFIGURE_HOST Distribution"
+    fi
+    AC_DEFINE_UNQUOTED([PMIX_PACKAGE_STRING], ["$with_package_string"],
+         [package/branding string for PMIx])
+    AC_MSG_RESULT([$with_package_string])
+
+
     # GCC specifics.
     if test "x$GCC" = "xyes"; then
         PMIX_GCC_CFLAGS="-Wall -Wmissing-prototypes -Wundef"
@@ -794,6 +827,10 @@ AC_DEFUN([PMIX_SETUP_CORE],[
         pmix_config_prefix[src/Makefile]
         pmix_config_prefix[src/util/keyval/Makefile]
         pmix_config_prefix[src/mca/base/Makefile]
+        pmix_config_prefix[src/tools/pevent/Makefile]
+        pmix_config_prefix[src/tools/pinfo/Makefile]
+        pmix_config_prefix[src/tools/plookup/Makefile]
+        pmix_config_prefix[src/tools/pps/Makefile]
         )
 
     # publish any embedded flags so external wrappers can use them
@@ -1059,6 +1096,25 @@ else
 fi
 
 AM_CONDITIONAL([WANT_INSTALL_HEADERS], [test $WANT_INSTALL_HEADERS -eq 1])
+
+#
+# Do we want to install binaries?
+#
+AC_MSG_CHECKING([if want to disable binaries])
+AC_ARG_ENABLE(pmix-binaries,
+              AC_HELP_STRING([--enable-pmix-binaries],
+                             [enable PMIx tools]))
+if test "$enable_pmix_binaries" = "no"; then
+    AC_MSG_RESULT([no])
+    WANT_PMIX_BINARIES=0
+else
+    AC_MSG_RESULT([yes])
+    WANT_PMIX_BINARIES=1
+fi
+
+AM_CONDITIONAL([PMIX_INSTALL_BINARIES], [test $WANT_PMIX_BINARIES -eq 1])
+
+
 ])dnl
 
 # This must be a standalone routine so that it can be called both by

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

@@ -22,7 +22,7 @@ AC_DEFUN([PMIX_CHECK_COMPILER_VERSION_ID],
     PMIX_CHECK_COMPILER(FAMILYID)
     PMIX_CHECK_COMPILER_STRINGIFY(FAMILYNAME)
     PMIX_CHECK_COMPILER(VERSION)
-    PMIX_CHECK_COMPILER_STRINGIFY(VERSION_STR)
+    PMIX_CHECK_COMPILER_STRING(VERSION_STR)
 ])dnl
 
 
@@ -31,10 +31,11 @@ AC_DEFUN([PMIX_CHECK_COMPILER], [
     AC_CACHE_CHECK([for compiler $lower], pmix_cv_compiler_[$1],
     [
             CPPFLAGS_orig=$CPPFLAGS
-            CPPFLAGS="-I${top_pmix_srcdir}/src/include $CPPFLAGS"
+            CPPFLAGS="-I${top_srcdir}/src/include $CPPFLAGS"
             AC_TRY_RUN([
 #include <stdio.h>
 #include <stdlib.h>
+#include "pmix_portable_platform.h"
 
 int main (int argc, char * argv[])
 {
@@ -57,16 +58,51 @@ int main (int argc, char * argv[])
                        [The compiler $lower which PMIx was built with])
 ])dnl
 
+AC_DEFUN([PMIX_CHECK_COMPILER_STRING], [
+    lower=m4_tolower($1)
+    AC_CACHE_CHECK([for compiler $lower], pmix_cv_compiler_[$1],
+    [
+            CPPFLAGS_orig=$CPPFLAGS
+            CPPFLAGS="-I${top_srcdir}/src/include $CPPFLAGS"
+            AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include "pmix_portable_platform.h"
+
+int main (int argc, char * argv[])
+{
+    FILE * f;
+    f=fopen("conftestval", "w");
+    if (!f) exit(1);
+    fprintf (f, "%s", PLATFORM_COMPILER_$1);
+    return 0;
+}
+            ], [
+                eval pmix_cv_compiler_$1=`cat conftestval`;
+            ], [
+                eval pmix_cv_compiler_$1=UNKNOWN
+            ], [
+                eval pmix_cv_compiler_$1=UNKNOWN
+            ])
+            CPPFLAGS=$CPPFLAGS_orig
+    ])
+    AC_DEFINE_UNQUOTED([PMIX_BUILD_PLATFORM_COMPILER_$1], $pmix_cv_compiler_[$1],
+                       [The compiler $lower which PMIx was built with])
+])dnl
+
+
+
 
 AC_DEFUN([PMIX_CHECK_COMPILER_STRINGIFY], [
     lower=m4_tolower($1)
     AC_CACHE_CHECK([for compiler $lower], pmix_cv_compiler_[$1],
     [
             CPPFLAGS_orig=$CPPFLAGS
-            CPPFLAGS="-I${top_pmix_srcdir}/src/include $CPPFLAGS"
+            CPPFLAGS="-I${top_srcdir}/src/include $CPPFLAGS"
             AC_TRY_RUN([
 #include <stdio.h>
 #include <stdlib.h>
+#include "pmix_portable_platform.h"
 
 int main (int argc, char * argv[])
 {

opal/mca/pmix/pmix3x/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-2016 Intel, Inc.  All rights reserved.
+dnl Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
 dnl Copyright (c) 2017      Research Organization for Information Science
 dnl                         and Technology (RIST). All rights reserved.
 dnl
@@ -102,21 +102,21 @@ PMIX_CONFIGURE_DATE="`date`"
 # Save these details so that they can be used in pmix_info later
 #
 AC_SUBST(PMIX_CONFIGURE_USER)
+AC_DEFINE_UNQUOTED([PMIX_CONFIGURE_USER], "$PMIX_CONFIGURE_USER",
+                   [User who built PMIx])
 AC_SUBST(PMIX_CONFIGURE_HOST)
-AC_SUBST(PMIX_CONFIGURE_DATE)])dnl
+AC_DEFINE_UNQUOTED([PMIX_CONFIGURE_HOST], "$PMIX_CONFIGURE_HOST",
+                   [Hostname where PMIx was built])
+AC_SUBST(PMIX_CONFIGURE_DATE)
+AC_DEFINE_UNQUOTED([PMIX_CONFIGURE_DATE], "$PMIX_CONFIGURE_DATE",
+                   [Date when PMIx was built])
+])dnl
 
 dnl #######################################################################
 dnl #######################################################################
 dnl #######################################################################
 
 AC_DEFUN([PMIX_BASIC_SETUP],[
-#
-# Save some stats about this build
-#
-
-PMIX_CONFIGURE_USER="`whoami`"
-PMIX_CONFIGURE_HOST="`(hostname || uname -n) 2> /dev/null | sed 1q`"
-PMIX_CONFIGURE_DATE="`date`"
 
 #
 # Make automake clean emacs ~ files for "make clean"

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

@@ -0,0 +1,41 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2014      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# PMIX_SET_MCA_PREFIX([mca_prefix]
+#
+# This macro sets a prefix for the MCA parameter system.  Specifically,
+# OMPI_MCA_<foo> becomes <mca_prefix>_<foo>
+#
+# --------------------------------------------------------
+AC_DEFUN([PMIX_SET_MCA_PREFIX],[
+    AS_IF([test "$pmix_mca_prefix_set" = "yes"],
+          [AC_MSG_WARN([PMIX mca prefix was already set!])
+           AC_MSG_WARN([This is a configury programming error])
+           AC_MSG_ERROR([Cannot continue])])
+
+    MCA_PREFIX=$1
+    pmix_mca_prefix_set=yes
+    AC_DEFINE_UNQUOTED([PMIX_MCA_PREFIX], ["$MCA_PREFIX"], [MCA prefix string for envars])
+])dnl
+
+#
+# Set the MCA cmd line identifier - i.e., change "-mca" to "-<foo>"
+#
+AC_DEFUN([PMIX_SET_MCA_CMD_LINE_ID],[
+    AS_IF([test "$pmix_mca_cmd_id_set" = "yes"],
+          [AC_MSG_WARN([PMIX mca cmd line id was already set!])
+           AC_MSG_WARN([This is a configury programming error])
+           AC_MSG_ERROR([Cannot continue])])
+
+    MCA_CMD_LINE_ID=$1
+    pmix_mca_cmd_id_set=yes
+    AC_DEFINE_UNQUOTED([PMIX_MCA_CMD_LINE_ID], ["$MCA_CMD_LINE_ID"], [MCA cmd line identifier])
+])dnl