Merge pull request #5695 from rhc54/topic/pmix4

Update master to PMIx v4

Author: Ralph Castain

.gitignore

@@ -391,12 +391,12 @@ opal/mca/pmix/pmix*/pmix/examples/pub
 opal/mca/pmix/pmix*/pmix/examples/server
 opal/mca/pmix/pmix*/pmix/examples/tool
 
-opal/mca/pmix/ext3x/ext3x.c
-opal/mca/pmix/ext3x/ext3x.h
-opal/mca/pmix/ext3x/ext3x_client.c
-opal/mca/pmix/ext3x/ext3x_component.c
-opal/mca/pmix/ext3x/ext3x_server_north.c
-opal/mca/pmix/ext3x/ext3x_server_south.c
+opal/mca/pmix/ext4x/ext4x.c
+opal/mca/pmix/ext4x/ext4x.h
+opal/mca/pmix/ext4x/ext4x_client.c
+opal/mca/pmix/ext4x/ext4x_component.c
+opal/mca/pmix/ext4x/ext4x_server_north.c
+opal/mca/pmix/ext4x/ext4x_server_south.c
 
 opal/tools/opal-checkpoint/opal-checkpoint
 opal/tools/opal-checkpoint/opal-checkpoint.1

config/opal_check_pmi.m4

@@ -337,12 +337,25 @@ 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 or above"
+                                                             #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 or above])
                          AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
                                                       #include <pmix_version.h>
-                                                      #if (PMIX_VERSION_MAJOR < 3L)
-                                                      #error "not version 3 or above"
+                                                      #if (PMIX_VERSION_MAJOR != 3L)
+                                                      #error "not version 3"
                                                       #endif
                                                       ], [])],
                                            [AC_MSG_RESULT([found])

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-2018 Mellanox Technologies Ltd. All rights reserved.
@@ -531,7 +531,7 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided,
     /* we want to go first */
     OBJ_CONSTRUCT(&info, opal_list_t);
     kv = OBJ_NEW(opal_value_t);
-    kv->key = strdup(OPAL_PMIX_EVENT_ORDER_PREPEND);
+    kv->key = strdup(OPAL_PMIX_EVENT_HDLR_PREPEND);
     opal_list_append(&info, &kv->super);
     /* give it a name so we can distinguish it */
     kv = OBJ_NEW(opal_value_t);
@@ -660,7 +660,7 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided,
     opal_pmix.commit();
     OMPI_TIMING_NEXT("commit");
 #if (OPAL_ENABLE_TIMING)
-    if (OMPI_TIMING_ENABLED && !opal_pmix_base_async_modex && 
+    if (OMPI_TIMING_ENABLED && !opal_pmix_base_async_modex &&
             opal_pmix_collect_all_data) {
         if (OMPI_SUCCESS != (ret = opal_pmix.fence(NULL, 0))) {
             error = "timing: pmix-barrier-1 failed";

opal/mca/pmix/ext3x/Makefile.am

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+# 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.
@@ -38,19 +38,6 @@ component_noinst = libmca_pmix_ext3x.la
 component_install =
 endif
 
-#
-# Generate ext3x sources from the pmix3x component
-#
-$(nodist_headers):
-	pmix3xname=`echo $@ | sed -e s/ext3x/pmix3x/g` ; \
-	$(SED) 's/pmix3x/ext3x/g' $(top_srcdir)/opal/mca/pmix/pmix3x/$$pmix3xname > $@
-
-$(sources): $(nodist_headers)
-
-$(nodist_sources): $(nodist_headers)
-	pmix3xname=`echo $@ | sed -e s/ext3x/pmix3x/g` ; \
-	$(SED) 's/pmix3x/ext3x/g' $(top_srcdir)/opal/mca/pmix/pmix3x/$$pmix3xname > $@
-
 mcacomponentdir = $(opallibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pmix_ext3x_la_SOURCES = $(sources)