Sync to PMIx v3.0rc and add ext4x

config/opal_check_pmi.m4

@@ -13,7 +13,7 @@
 # Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2011-2014 Los Alamos National Security, LLC. All rights
 #                         reserved.
-# Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+# Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
 # Copyright (c) 2014-2018 Research Organization for Information Science
 #                         and Technology (RIST).  All rights reserved.
 # Copyright (c) 2016      IBM Corporation.  All rights reserved.
@@ -311,6 +311,19 @@ AC_DEFUN([OPAL_CHECK_PMIX],[
 
            # if it does exist, then we need to parse it to find
            # the actual release series
+           AS_IF([test "$opal_external_pmix_version_found" = "0"],
+                 [AC_MSG_CHECKING([version 4x])
+                  AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
+                                                      #include <pmix_version.h>
+                                                      #if (PMIX_VERSION_MAJOR != 4L)
+                                                      #error "not version 4"
+                                                      #endif
+                                                      ], [])],
+                                    [AC_MSG_RESULT([found])
+                                     opal_external_pmix_version=4x
+                                     opal_external_pmix_version_found=1],
+                                    [AC_MSG_RESULT([not found])])])
+
            AS_IF([test "$opal_external_pmix_version_found" = "0"],
                  [AC_MSG_CHECKING([version 3x])
                   AC_PREPROC_IFELSE([AC_LANG_PROGRAM([

opal/mca/pmix/ext4x/Makefile.am

@@ -0,0 +1,54 @@
+#
+# Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
+# Copyright (c) 2015      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2015-2018 Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2017      IBM Corporation.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+dist_opaldata_DATA = help-pmix-ext4x.txt
+
+sources = \
+        ext4x.c \
+        ext4x_client.c \
+        ext4x_component.c \
+        ext4x_server_north.c \
+        ext4x_server_south.c \
+        ext4x_local.c
+
+headers = \
+        ext4x.h
+
+
+# Make the output library in this directory, and name it either
+# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
+# (for static builds).
+
+if MCA_BUILD_opal_pmix_ext4x_DSO
+component_noinst =
+component_install = mca_pmix_ext4x.la
+else
+component_noinst = libmca_pmix_ext4x.la
+component_install =
+endif
+
+mcacomponentdir = $(opallibdir)
+mcacomponent_LTLIBRARIES = $(component_install)
+mca_pmix_ext4x_la_SOURCES = $(sources)
+mca_pmix_ext4x_la_CFLAGS = $(opal_pmix_ext4x_CFLAGS)
+mca_pmix_ext4x_la_CPPFLAGS =$(opal_pmix_ext4x_CPPFLAGS)
+mca_pmix_ext4x_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext4x_LDFLAGS)
+mca_pmix_ext4x_la_LIBADD = $(top_builddir)/opal/lib@[email protected] \
+	$(opal_pmix_ext4x_LIBS)
+
+noinst_LTLIBRARIES = $(component_noinst)
+libmca_pmix_ext4x_la_SOURCES =$(sources)
+libmca_pmix_ext4x_la_CFLAGS = $(opal_pmix_ext4x_CFLAGS)
+libmca_pmix_ext4x_la_CPPFLAGS = $(opal_pmix_ext4x_CPPFLAGS)
+libmca_pmix_ext4x_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext4x_LDFLAGS)
+libmca_pmix_ext4x_la_LIBADD = $(opal_pmix_ext4x_LIBS)

opal/mca/pmix/ext4x/configure.m4

@@ -0,0 +1,64 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
+#                         All rights reserved.
+# Copyright (c) 2010-2015 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
+# Copyright (c) 2015-2017 Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2014-2015 Mellanox Technologies, Inc.
+#                         All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# MCA_pmix_ext4x_CONFIG([action-if-found], [action-if-not-found])
+# -----------------------------------------------------------
+AC_DEFUN([MCA_opal_pmix_ext4x_CONFIG],[
+    AC_CONFIG_FILES([opal/mca/pmix/ext4x/Makefile])
+
+    AS_IF([test "$opal_external_pmix_happy" = "yes"],
+          [ # check for the 4.x version
+           AC_MSG_CHECKING([if external component is version 4.x])
+           AS_IF([test "$opal_external_pmix_version" = "4x"],
+                 [AC_MSG_RESULT([yes])
+                  AS_IF([test "$opal_event_external_support" != "yes"],
+                        [AC_MSG_WARN([EXTERNAL PMIX SUPPORT REQUIRES USE OF EXTERNAL LIBEVENT])
+                         AC_MSG_WARN([AND HWLOC LIBRARIES. THESE LIBRARIES MUST POINT TO THE])
+                         AC_MSG_WARN([SAME ONES USED TO BUILD PMIX OR ELSE UNPREDICTABLE])
+                         AC_MSG_WARN([BEHAVIOR MAY RESULT])
+                         AC_MSG_ERROR([PLEASE CORRECT THE CONFIGURE COMMAND LINE AND REBUILD])])
+                  opal_pmix_external_4x_happy=yes],
+                 [AC_MSG_RESULT([no])
+                  opal_pmix_external_4x_happy=no])
+
+           AS_IF([test "$opal_pmix_external_4x_happy" = "yes"],
+                 [$1
+                  # need to set the wrapper flags for static builds
+                  pmix_ext4x_WRAPPER_EXTRA_LDFLAGS=$opal_external_pmix_LDFLAGS
+                  pmix_ext4x_WRAPPER_EXTRA_LIBS=$opal_external_pmix_LIBS],
+                 [$2])],
+          [$2])
+
+    opal_pmix_ext4x_CPPFLAGS=$opal_external_pmix_CPPFLAGS
+    opal_pmix_ext4x_LDFLAGS=$opal_external_pmix_LDFLAGS
+    opal_pmix_ext4x_LIBS=$opal_external_pmix_LIBS
+
+    AC_SUBST([opal_pmix_ext4x_CPPFLAGS])
+    AC_SUBST([opal_pmix_ext4x_LDFLAGS])
+    AC_SUBST([opal_pmix_ext4x_LIBS])
+
+])dnl