Merge pull request #2286 from jjhursey/topic/v2.x-pmix-1.2.0

pmix/pmix112: Update to version 1.2.0

Author: hppritcha

.gitignore

@@ -306,6 +306,7 @@ opal/mca/pmix/pmix112/pmix/include/pmix/pmix_common.h
 opal/mca/pmix/pmix112/pmix/include/private/autogen/config.h
 opal/mca/pmix/pmix112/pmix/include/private/autogen/config.h.in
 opal/mca/pmix/pmix112/pmix/include/pmix/autogen/config.h.in
+opal/mca/pmix/pmix112/pmix/include/pmix_version.h
 
 opal/tools/opal-checkpoint/opal-checkpoint
 opal/tools/opal-checkpoint/opal-checkpoint.1

config/ompi_find_mpi_aint_count_offset.m4

@@ -17,6 +17,7 @@
 # Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
 # Copyright (c) 2014      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2015      Intel, Inc. All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -29,7 +30,7 @@ AC_DEFUN([OMPI_FIND_MPI_AINT_COUNT_OFFSET],[
     _OMPI_FIND_MPI_COUNT_TYPE
     _OMPI_FIND_MPI_OFFSET_TYPE
 
-    if test "$ompi_fortran_happy" == "1" && \
+    if test "$ompi_fortran_happy" = "1" && \
        test "$OMPI_TRY_FORTRAN_BINDINGS" -gt "$OMPI_FORTRAN_NO_BINDINGS"; then
         _OMPI_FIND_MPI_INTEGER_KIND
         _OMPI_FIND_MPI_ADDRESS_KIND

config/opal_check_cray_pmi.m4

@@ -13,7 +13,7 @@ dnl                         All rights reserved.
 dnl Copyright (c) 2009-2011 Cisco Systems, Inc.  All rights reserved.
 dnl Copyright (c) 2011-2014 Los Alamos National Security, LLC. All rights
 dnl                         reserved.
-dnl Copyright (c) 2014      Intel, Inc. All rights reserved.
+dnl Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
 dnl Copyright (c) 2014-2015 Research Organization for Information Science
 dnl                         and Technology (RIST). All rights reserved.
 dnl $COPYRIGHT$
@@ -50,7 +50,7 @@ AC_DEFUN([OPAL_CHECK_CRAY_PMI_EXPLICIT],[
 #   this logic assumes knowledge about all the dependencies of the Cray PMI library,
 #   something that Cray doesn't generally document
 #
-    AS_IF([test "$enable_static" == "yes"],
+    AS_IF([test "$enable_static" = "yes"],
           [AS_IF([test -d /usr/lib/alps],
                  [AC_MSG_RESULT([Detected presense of /usr/lib/alps])
                   CRAY_PMI_LDFLAGS="$CRAY_PMI_LDFLAGS -L/usr/lib/alps -lalpslli -lalpsutil"

config/opal_check_pmi.m4

@@ -13,9 +13,10 @@
 # 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      Intel, Inc. All rights reserved.
+# Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
 # Copyright (c) 2014-2016 Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2016      IBM Corporation.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -226,11 +227,7 @@ AC_DEFUN([OPAL_CHECK_PMI],[
 
 AC_DEFUN([OPAL_CHECK_PMIX],[
 
-    opal_pmix_ext_CPPFLAGS=
-    opal_pmix_ext_LDFLAGS=
-    opal_pmix_ext_LIBS=
-
-    OPAL_VAR_SCOPE_PUSH([pmix_ext_install_dir])
+    OPAL_VAR_SCOPE_PUSH([opal_external_pmix_save_CPPFLAGS opal_external_pmix_save_LDFLAGS opal_external_pmix_save_LIBS])
 
     AC_ARG_WITH([pmix],
                 [AC_HELP_STRING([--with-pmix(=DIR)],
@@ -245,30 +242,93 @@ AC_DEFUN([OPAL_CHECK_PMIX],[
     AC_MSG_CHECKING([if user requested external PMIx support($with_pmix)])
     AS_IF([test -z "$with_pmix" || test "$with_pmix" = "yes" || test "$with_pmix" = "internal"],
           [AC_MSG_RESULT([no])
-           opal_external_pmix_happy="no"],
+           opal_external_pmix_happy=no],
+
           [AC_MSG_RESULT([yes])
            # check for external pmix lib */
            AS_IF([test "$with_pmix" = "external"],
                  [pmix_ext_install_dir=/usr],
                  [pmix_ext_install_dir=$with_pmix])
-           AC_MSG_CHECKING([if external component can be used])
-           OPAL_CHECK_PACKAGE([opal_pmix_ext],
-                              [pmix.h],
-                              [pmix],
-                              [PMIx_Init],
-                              [],
-                              [$pmix_ext_install_dir],
-                              [],
-                              [AC_MSG_RESULT([PMIx external support will be built])
-                               opal_external_pmix_happy=yes],
-                              [AC_MSG_RESULT([no])
-                               AC_MSG_WARN([External PMIx support was requested but failed])
-                               AC_MSG_WARN([as explained above.])
-                               AC_MSG_ERROR([Cannot continue])])
-          ])
-    AC_SUBST(opal_pmix_ext_CPPFLAGS)
-    AC_SUBST(opal_pmix_ext_LDFLAGS)
-    AC_SUBST(opal_pmix_ext_LIBS)
+
+           # Make sure we have the headers and libs in the correct location
+           OPAL_CHECK_WITHDIR([external-pmix], [$pmix_ext_install_dir/include], [pmix.h])
+           OPAL_CHECK_WITHDIR([external-libpmix], [$pmix_ext_install_dir/lib], [libpmix.*])
+
+           # check the version
+           opal_external_pmix_save_CPPFLAGS=$CPPFLAGS
+           opal_external_pmix_save_LDFLAGS=$LDFLAGS
+           opal_external_pmix_save_LIBS=$LIBS
+
+           # if the pmix_version.h file does not exist, then
+           # this must be from a pre-1.1.5 version
+           AC_MSG_CHECKING([PMIx version])
+           CPPFLAGS="-I$pmix_ext_install_dir/include $CPPFLAGS"
+           AS_IF([test "x`ls $pmix_ext_install_dir/include/pmix_version.h 2> /dev/null`" = "x"],
+                 [AC_MSG_RESULT([version file not found - assuming v1.1.4])
+                  opal_external_pmix_version_found=1
+                  opal_external_pmix_version=114],
+                 [AC_MSG_RESULT([version file found])
+                  opal_external_pmix_version_found=0])
+
+           # 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 3x])
+                  AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
+                                                      #include <pmix_version.h>
+                                                      #if (PMIX_VERSION_MAJOR != 3L)
+                                                      #error "not version 3"
+                                                      #endif
+                                                      ], [])],
+                                    [AC_MSG_RESULT([found])
+                                     opal_external_pmix_version=3X
+                                     opal_external_pmix_version_found=1
+                                     AC_MSG_WARN([This version of Open MPI does not support PMIx version 2.x and later])
+                                     AC_MSG_ERROR([Cannot continue])],
+                                    [AC_MSG_RESULT([not found])])])
+
+           AS_IF([test "$opal_external_pmix_version_found" = "0"],
+                 [AC_MSG_CHECKING([version 2x])
+                  AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
+                                                      #include <pmix_version.h>
+                                                      #if (PMIX_VERSION_MAJOR != 2L)
+                                                      #error "not version 2"
+                                                      #endif
+                                                      ], [])],
+                                    [AC_MSG_RESULT([found])
+                                     opal_external_pmix_version=2X
+                                     opal_external_pmix_version_found=1
+                                     AC_MSG_WARN([This version of Open MPI does not support PMIx version 2.x and later])
+                                     AC_MSG_ERROR([Cannot continue])],
+                                    [AC_MSG_RESULT([not found])])])
+
+           AS_IF([test "$opal_external_pmix_version_found" = "0"],
+                 [AC_MSG_CHECKING([version 1x])
+                  AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
+                                                      #include <pmix_version.h>
+                                                      #if (PMIX_VERSION_MAJOR != 1L)
+                                                      #error "not version 1"
+                                                      #endif
+                                                      ], [])],
+                                    [AC_MSG_RESULT([found])
+                                     opal_external_pmix_version=1X
+                                     opal_external_pmix_version_found=1],
+                                    [AC_MSG_RESULT([not found])])])
+
+           AS_IF([test "x$opal_external_pmix_version" = "x"],
+                 [AC_MSG_WARN([External PMIx support requested, but version])
+                  AC_MSG_WARN([information of the external lib could not])
+                  AC_MSG_WARN([be detected])
+                  AC_MSG_ERROR([cannot continue])])
+
+           CPPFLAGS=$opal_external_pmix_save_CPPFLAGS
+           LDFLAGS=$opal_external_pmix_save_LDFLAGS
+           LIBS=$opal_external_pmix_save_LIBS
+
+           opal_external_pmix_CPPFLAGS="-I$pmix_ext_install_dir/include"
+           opal_external_pmix_LDFLAGS=-L$pmix_ext_install_dir/lib
+           opal_external_pmix_LIBS=-lpmix
+           opal_external_pmix_happy=yes])
 
     OPAL_VAR_SCOPE_POP
 ])

configure.ac

@@ -253,6 +253,7 @@ m4_ifdef([project_oshmem],
 OPAL_CONFIGURE_OPTIONS
 OPAL_CHECK_OS_FLAVORS
 OPAL_CHECK_CUDA
+OPAL_CHECK_PMIX
 m4_ifdef([project_orte], [ORTE_CONFIGURE_OPTIONS])
 m4_ifdef([project_ompi], [OMPI_CONFIGURE_OPTIONS])
 m4_ifdef([project_oshmem], [OSHMEM_CONFIGURE_OPTIONS])

opal/mca/pmix/external/Makefile.am

@@ -34,15 +34,15 @@ mcacomponentdir = $(opallibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pmix_external_la_SOURCES = $(sources)
 mca_pmix_external_la_CFLAGS =
-mca_pmix_external_la_CPPFLAGS = $(opal_pmix_ext_CPPFLAGS)
-mca_pmix_external_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext_LDFLAGS)
-mca_pmix_external_la_LIBADD = $(opal_pmix_ext_LIBS) \
+mca_pmix_external_la_CPPFLAGS = $(opal_pmix_external_CPPFLAGS)
+mca_pmix_external_la_LDFLAGS = -module -avoid-version $(opal_pmix_external_LDFLAGS)
+mca_pmix_external_la_LIBADD = $(opal_pmix_external_LIBS) \
         $(OPAL_TOP_BUILDDIR)/opal/mca/event/lib@OPAL_LIB_PREFIX@mca_event.la \
         $(OPAL_TOP_BUILDDIR)/opal/mca/hwloc/lib@OPAL_LIB_PREFIX@mca_hwloc.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_pmix_external_la_SOURCES =$(sources)
 libmca_pmix_external_la_CFLAGS =
-libmca_pmix_external_la_CPPFLAGS = $(opal_pmix_ext_CPPFLAGS)
-libmca_pmix_external_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext_LDFLAGS)
-libmca_pmix_external_la_LIBADD = $(opal_pmix_ext_LIBS)
+libmca_pmix_external_la_CPPFLAGS = $(opal_pmix_external_CPPFLAGS)
+libmca_pmix_external_la_LDFLAGS = -module -avoid-version $(opal_pmix_external_LDFLAGS)
+libmca_pmix_external_la_LIBADD = $(opal_pmix_external_LIBS)

opal/mca/pmix/external/configure.m4

@@ -18,6 +18,7 @@
 #                         and Technology (RIST). All rights reserved.
 # Copyright (c) 2014-2015 Mellanox Technologies, Inc.
 #                         All rights reserved.
+# Copyright (c) 2016      IBM Corporation.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -30,16 +31,41 @@
 AC_DEFUN([MCA_opal_pmix_external_CONFIG],[
     AC_CONFIG_FILES([opal/mca/pmix/external/Makefile])
 
-    AC_REQUIRE([OPAL_CHECK_PMIX])
-
     AS_IF([test "$opal_external_pmix_happy" = "yes"],
-          [AS_IF([test "$opal_event_external_want" != "yes" || test "$opal_hwloc_external_support" != "yes"],
+          [AS_IF([test "$opal_event_external_support" != "yes"],
                  [AC_MSG_WARN([EXTERNAL PMIX SUPPORT REQUIRES USE OF EXTERNAL LIBEVENT])
-                  AC_MSG_WARN([AND EXTERNAL HWLOC LIBRARIES. THESE LIBRARIES MUST POINT])
-                  AC_MSG_WARN([TO THE SAME ONES USED TO BUILD PMIX OR ELSE UNPREDICTABLE])
-                  AC_MSG_WARN([BEHAVIOR MAY RESULT])
+                  AC_MSG_WARN([LIBRARY. THIS LIBRARY MUST POINT TO THE SAME ONE USED])
+                  AC_MSG_WARN([TO BUILD PMIX OR ELSE UNPREDICTABLE BEHAVIOR MAY RESULT])
+                  AC_MSG_ERROR([PLEASE CORRECT THE CONFIGURE COMMAND LINE AND REBUILD])])
+           AS_IF([test "$opal_hwloc_external_support" != "yes"],
+                 [AC_MSG_WARN([EXTERNAL PMIX SUPPORT REQUIRES USE OF EXTERNAL HWLOC])
+                  AC_MSG_WARN([LIBRARY THIS LIBRARY MUST POINT TO THE SAME ONE USED ])
+                  AC_MSG_WARN([TO BUILD PMIX OR ELSE UNPREDICTABLE BEHAVIOR MAY RESULT])
                   AC_MSG_ERROR([PLEASE CORRECT THE CONFIGURE COMMAND LINE AND REBUILD])])
-           external_WRAPPER_EXTRA_CPPFLAGS='-I${includedir}/openmpi/$opal_pmix_external_basedir/pmix -I${includedir}/openmpi/$opal_pmix_external_basedir/pmix/include'
-           $1],
+
+           # check for the 1.1.4 version
+           AC_MSG_CHECKING([if external component is version 1.1.4 or compatible])
+           AS_IF([test "$opal_external_pmix_version" = "11" ||
+                  test "$opal_external_pmix_version" = "114" ||
+                  test "$opal_external_pmix_version" = "1X"],
+                 [AC_MSG_RESULT([yes])
+                  opal_pmix_external_11_happy=yes],
+                 [AC_MSG_RESULT([no])
+                  opal_pmix_external_11_happy=no])
+
+           AS_IF([test "$opal_pmix_external_11_happy" = "yes"],
+                 [$1
+                  # need to set the wrapper flags for static builds
+                  pmix_external_WRAPPER_EXTRA_LDFLAGS=$opal_external_pmix_LDFLAGS
+                  pmix_external_WRAPPER_EXTRA_LIBS=$opal_external_pmix_LIBS],
+                 [$2])],
           [$2])
+
+    opal_pmix_external_CPPFLAGS=$opal_external_pmix_CPPFLAGS
+    opal_pmix_external_LDFLAGS=$opal_external_pmix_LDFLAGS
+    opal_pmix_external_LIBS=$opal_external_pmix_LIBS
+
+    AC_SUBST([opal_pmix_external_CPPFLAGS])
+    AC_SUBST([opal_pmix_external_LDFLAGS])
+    AC_SUBST([opal_pmix_external_LIBS])
 ])dnl

opal/mca/pmix/pmix112/configure.m4

@@ -16,6 +16,7 @@
 # Copyright (c) 2013-2015 Intel, Inc. All rights reserved.
 # Copyright (c) 2015-2016 Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2016      IBM Corporation.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -38,7 +39,19 @@ AC_DEFUN([MCA_opal_pmix_pmix112_CONFIG],[
     opal_pmix_pmix112_save_LDFLAGS=$LDFLAGS
     opal_pmix_pmix112_save_LIBS=$LIBS
 
-    opal_pmix_pmix112_args="--enable-embedded-mode --with-pmix-symbol-prefix=opal_pmix_pmix112_ --with-libevent-header=\\\"opal/mca/event/$opal_event_base_include\\\" --with-hwloc-header=\\\"$opal_hwloc_base_include\\\""
+    AC_ARG_ENABLE([pmix-dstore],
+                  [AC_HELP_STRING([--enable-pmix-dstore],
+                                  [Enable PMIx shared memory data store (default: disabled)])])
+    AC_MSG_CHECKING([if PMIx shared memory data store is enabled])
+    if test "$enable_pmix3_dstore" == "yes"; then
+        AC_MSG_RESULT([yes])
+        opal_pmix_pmix_sm_flag=--enable-dstore
+    else
+        AC_MSG_RESULT([no (disabled)])
+        opal_pmix_pmix_sm_flag=--disable-dstore
+    fi
+
+    opal_pmix_pmix112_args="--enable-embedded-mode --with-pmix-symbol-prefix=opal_pmix_pmix112_ $opal_pmix_pmix_sm_flag --with-libevent-header=\\\"opal/mca/event/$opal_event_base_include\\\" --with-hwloc-header=\\\"$opal_hwloc_base_include\\\""
     AS_IF([test "$enable_debug" = "yes"],
           [opal_pmix_pmix112_args="--enable-debug $opal_pmix_pmix112_args"
            CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS -g"],

opal/mca/pmix/pmix112/pmix/Makefile.am

@@ -11,7 +11,7 @@
 #                         All rights reserved.
 # Copyright (c) 2006-2015 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
-# Copyright (c) 2013-2015 Intel, Inc. All rights reserved
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -34,6 +34,7 @@ dist_pmixdata_DATA =
 if ! PMIX_EMBEDDED_MODE
 dist_pmixdata_DATA += contrib/pmix-valgrind.supp
 
+
 man_MANS = \
         man/man3/pmix_init.3 \
         man/man3/pmix_finalize.3 \
@@ -59,6 +60,11 @@ include src/server/Makefile.am
 include src/sec/Makefile.am
 include src/common/Makefile.am
 
+if WANT_DSTORE
+include src/sm/Makefile.am
+include src/dstore/Makefile.am
+endif
+
 if PMIX_EMBEDDED_MODE
 noinst_LTLIBRARIES = libpmix.la
 libpmix_la_SOURCES = $(headers) $(sources)

opal/mca/pmix/pmix112/pmix/NEWS

@@ -1,4 +1,5 @@
 Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+Copyright (c) 2016      IBM Corporation.  All rights reserved.
 $COPYRIGHT$
 
 Additional copyrights may follow
@@ -20,8 +21,27 @@ 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.
 
 
-Master (not on release branches yet)
-------------------------------------
+1.2.0
+-----
+- Add shared memory data storage (dstore) option. Default: enabled
+  Configure option: --disable-dstore
+- PMIx_Commit performance improvements
+- Disable errhandler support
+- Keep job info in the shared memory dstore
+- PMIx_Get performance and memory improvements
+
+
+
+1.1.5
+-----
+- Add pmix_version.h to support direct detection of PMIx library version
+- Fix support for Solaris 10 by using abstract version of strnlen
+- Fix native security module for Solaris by using getpeerucred in
+  that environment
+- Ensure man pages don't get installed in embedded builds
+- Pass temporary directory locations in info keys instead of
+  the environment
+
 
 1.1.4
 -----