open-mpi · rhc54 · Jan 10, 2019 · Jan 10, 2019
diff --git a/opal/mca/pmix/pmix4x/configure.m4 b/opal/mca/pmix/pmix4x/configure.m4
@@ -13,7 +13,7 @@
 # Copyright (c) 2011-2013 Los Alamos National Security, LLC.
 #                         All rights reserved.
 # Copyright (c) 2010-2017 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
+# Copyright (c) 2013-2019 Intel, Inc.  All rights reserved.
 # Copyright (c) 2015-2016 Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
@@ -53,14 +53,14 @@ AC_DEFUN([MCA_opal_pmix_pmix4x_CONFIG],[
         opal_pmix_pmix4x_timing_flag=--disable-pmix-timing
     fi
 
-    opal_pmix_pmix4x_args="$opal_pmix_pmix4x_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\\\""
+    opal_pmix_pmix4x_args="$opal_pmix_pmix4x_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\\\" --enable-embedded-hwloc --with-hwloc-header=\\\"$opal_hwloc_base_include\\\""
     AS_IF([test "$enable_debug" = "yes"],
           [opal_pmix_pmix4x_args="--enable-debug $opal_pmix_pmix4x_args"
            CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS -g"],
           [opal_pmix_pmix4x_args="--disable-debug $opal_pmix_pmix4x_args"
            CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"])
     AC_MSG_CHECKING([if want to install standalone libpmix])
-    AS_IF([test "$enable_install_libpmix" == "yes"],
+    AS_IF([test "$enable_install_libpmix" = "yes"],
           [AC_MSG_RESULT([yes])],
           [AC_MSG_RESULT([no])
            opal_pmix_pmix4x_args="--with-pmix-symbol-rename=OPAL_MCA_PMIX4X_ --enable-embedded-mode $opal_pmix_pmix4x_args"])

diff --git a/opal/mca/pmix/pmix4x/pmix/VERSION b/opal/mca/pmix/pmix4x/pmix/VERSION
@@ -23,14 +23,14 @@ release=0
 # The only requirement is that it must be entirely printable ASCII
 # characters and have no white space.
 
-greek=
+greek=a1
 
 # If repo_rev is empty, then the repository version number will be
 # obtained during "make dist" via the "git describe --tags --always"
 # command, or with the date (if "git describe" fails) in the form of
 # "date<date>".
 
-repo_rev=gitfae0ee7d
+repo_rev=gitb5863c9c
 
 # 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="Dec 28, 2018"
+date="Jan 10, 2019"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library

diff --git a/opal/mca/pmix/pmix4x/pmix/config/pmix.m4 b/opal/mca/pmix/pmix4x/pmix/config/pmix.m4
@@ -17,7 +17,7 @@ dnl Copyright (c) 2009      Los Alamos National Security, LLC.  All rights
 dnl                         reserved.
 dnl Copyright (c) 2009-2011 Oak Ridge National Labs.  All rights reserved.
 dnl Copyright (c) 2011-2013 NVIDIA Corporation.  All rights reserved.
-dnl Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
+dnl Copyright (c) 2013-2019 Intel, Inc.  All rights reserved.
 dnl Copyright (c) 2015-2017 Research Organization for Information Science
 dnl                         and Technology (RIST). All rights reserved.
 dnl Copyright (c) 2016      Mellanox Technologies, Inc.
@@ -415,7 +415,8 @@ AC_DEFUN([PMIX_SETUP_CORE],[
                       crt_externs.h signal.h \
                       ioLib.h sockLib.h hostLib.h limits.h \
                       sys/statfs.h sys/statvfs.h \
-                      netdb.h ucred.h zlib.h sys/auxv.h])
+                      netdb.h ucred.h zlib.h sys/auxv.h \
+                      sys/sysctl.h])
 
     AC_CHECK_HEADERS([sys/mount.h], [], [],
                      [AC_INCLUDES_DEFAULT

diff --git a/opal/mca/pmix/pmix4x/pmix/config/pmix_check_os_flavors.m4 b/opal/mca/pmix/pmix4x/pmix/config/pmix_check_os_flavors.m4
@@ -1,7 +1,7 @@
 dnl -*- shell-script -*-
 dnl
 dnl Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
-dnl Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
+dnl Copyright (c) 2014-2019 Intel, Inc.  All rights reserved.
 dnl Copyright (c) 2014      Research Organization for Information Science
 dnl                         and Technology (RIST). All rights reserved.
 dnl
@@ -57,6 +57,13 @@ AC_DEFUN([PMIX_CHECK_OS_FLAVORS],
                        [$pmix_have_solaris],
                        [Whether or not we have solaris])
 
+    AS_IF([test "$pmix_found_apple" = "yes"],
+          [pmix_have_apple=1],
+          [pmix_have_apple=0])
+    AC_DEFINE_UNQUOTED([PMIX_HAVE_APPLE],
+                       [$pmix_have_apple],
+                       [Whether or not we have apple])
+
     # check for sockaddr_in (a good sign we have TCP)
     AC_CHECK_HEADERS([netdb.h netinet/in.h netinet/tcp.h])
     AC_CHECK_TYPES([struct sockaddr_in],

diff --git a/opal/mca/pmix/pmix4x/pmix/config/pmix_setup_hwloc.m4 b/opal/mca/pmix/pmix4x/pmix/config/pmix_setup_hwloc.m4
@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2013      Los Alamos National Security, LLC.  All rights reserved.
-# Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
+# Copyright (c) 2013-2019 Intel, Inc.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -13,6 +13,43 @@
 # MCA_hwloc_CONFIG([action-if-found], [action-if-not-found])
 # --------------------------------------------------------------------
 AC_DEFUN([PMIX_HWLOC_CONFIG],[
+    AC_ARG_WITH([hwloc-header],
+                [AC_HELP_STRING([--with-hwloc-header=HEADER],
+                                [The value that should be included in C files to include hwloc.h])])
+
+    AC_ARG_ENABLE([embedded-hwloc],
+                  [AC_HELP_STRING([--enable-embedded-hwloc],
+                                  [Enable use of locally embedded hwloc])])
+
+    AS_IF([test "$enable_embedded_hwloc" = "yes"],
+          [_PMIX_HWLOC_EMBEDDED_MODE],
+          [_PMIX_HWLOC_EXTERNAL])
+
+    AC_MSG_CHECKING([hwloc header])
+    AC_DEFINE_UNQUOTED([PMIX_HWLOC_HEADER], [$PMIX_HWLOC_HEADER],
+                       [Location of hwloc.h])
+    AC_MSG_RESULT([$PMIX_HWLOC_HEADER])
+
+    AC_DEFINE_UNQUOTED([PMIX_HAVE_HWLOC], [$pmix_hwloc_support],
+                   [Whether or not we have hwloc support])
+
+    PMIX_SUMMARY_ADD([[External Packages]],[[HWLOC]], [pmix_hwloc], [$pmix_hwloc_support_will_build ($pmix_hwloc_source)])
+])
+
+AC_DEFUN([_PMIX_HWLOC_EMBEDDED_MODE],[
+    AC_MSG_CHECKING([for hwloc])
+    AC_MSG_RESULT([assumed available (embedded mode)])
+
+    AS_IF([test -z "$with_hwloc_header" || test "$with_hwloc_header" = "yes"],
+          [PMIX_HWLOC_HEADER="<hwloc.h>"],
+          [PMIX_HWLOC_HEADER="$with_hwloc_header"])
+
+    pmix_hwloc_support=1
+    pmix_hwloc_source=embedded
+    pmix_hwloc_support_will_build=yes
+ ])
+
+AC_DEFUN([_PMIX_HWLOC_EXTERNAL],[
     PMIX_VAR_SCOPE_PUSH([pmix_hwloc_dir pmix_hwloc_libdir pmix_hwloc_standard_lib_location pmix_hwloc_standard_header_location])
 
     AC_ARG_WITH([hwloc],
@@ -62,18 +99,13 @@ AC_DEFUN([PMIX_HWLOC_CONFIG],[
                            [$pmix_hwloc_libdir],
                            [pmix_hwloc_support=1],
                            [pmix_hwloc_support=0])
-        if test $pmix_hwloc_support = "1"; then
-            LIBS="$LIBS -lhwloc"
-            PMIX_EMBEDDED_LIBS="$PMIX_EMBEDDED_LIBS -lhwloc"
-            if test "$pmix_hwloc_standard_header_location" != "yes"; then
-                PMIX_EMBEDDED_CPPFLAGS="$PMIX_EMBEDDED_CPPFLAGS $pmix_hwloc_CPPFLAGS"
-                CPPFLAGS="$CPPFLAGS $pmix_hwloc_CPPFLAGS"
-            fi
-            if test "$pmix_hwloc_standard_lib_location" != "yes"; then
-                PMIX_EMBEDDED_LDFLAGS="$PMIX_EMBEDDED_LDFLAGS $pmix_hwloc_LDFLAGS"
-                LDFLAGS="$LDFLAGS $pmix_hwloc_LDFLAGS"
-            fi
-        fi
+
+        AS_IF([test "$pmix_hwloc_standard_header_location" != "yes"],
+              [PMIX_FLAGS_APPEND_UNIQ(CPPFLAGS, $pmix_hwloc_CPPFLAGS)])
+
+        AS_IF([test "$pmix_hwloc_standard_lib_location" != "yes"],
+              [PMIX_FLAGS_APPEND_UNIQ(LIBS, $pmix_hwloc_LIBS)
+               PMIX_FLAGS_APPEND_UNIQ(LDFLAGS, $pmix_hwloc_LDFLAGS)])
     fi
 
     if test ! -z "$with_hwloc" && test "$with_hwloc" != "no" && test "$pmix_hwloc_support" != "1"; then
@@ -98,11 +130,16 @@ AC_DEFUN([PMIX_HWLOC_CONFIG],[
     AC_MSG_CHECKING([will hwloc support be built])
     if test "$pmix_hwloc_support" != "1"; then
         AC_MSG_RESULT([no])
+        pmix_hwloc_source=none
+        pmix_hwloc_support_will_build=no
     else
         AC_MSG_RESULT([yes])
+        pmix_hwloc_source=$pmix_hwloc_dir
+        pmix_hwloc_support_will_build=yes
     fi
 
-    AC_DEFINE_UNQUOTED([PMIX_HAVE_HWLOC], [$pmix_hwloc_support],
-                       [Whether or not we have hwloc support])
+    # Set output variables
+    PMIX_HWLOC_HEADER="<hwloc.h>"
+
     PMIX_VAR_SCOPE_POP
 ])dnl
diff --git a/opal/mca/pmix/pmix4x/pmix/config/pmix_setup_libevent.m4 b/opal/mca/pmix/pmix4x/pmix/config/pmix_setup_libevent.m4
@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2013      Los Alamos National Security, LLC.  All rights reserved.
-# Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
+# Copyright (c) 2013-2019 Intel, Inc.  All rights reserved.
 # Copyright (c) 2017      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
@@ -35,6 +35,8 @@ AC_DEFUN([PMIX_LIBEVENT_CONFIG],[
     AC_DEFINE_UNQUOTED([PMIX_EVENT2_THREAD_HEADER], [$PMIX_EVENT2_THREAD_HEADER],
                        [Location of event2/thread.h])
     AC_MSG_RESULT([$PMIX_EVENT2_THREAD_HEADER])
+
+    PMIX_SUMMARY_ADD([[External Packages]],[[Libevent]], [pmix_libevent], [yes ($pmix_libevent_source)])
 ])
 
 AC_DEFUN([_PMIX_LIBEVENT_EMBEDDED_MODE],[
@@ -47,6 +49,7 @@ AC_DEFUN([_PMIX_LIBEVENT_EMBEDDED_MODE],[
           [PMIX_EVENT_HEADER="$with_libevent_header"
            PMIX_EVENT2_THREAD_HEADER="$with_libevent_header"])
 
+    pmix_libevent_source=embedded
  ])
 
 AC_DEFUN([_PMIX_LIBEVENT_EXTERNAL],[
@@ -138,6 +141,7 @@ AC_DEFUN([_PMIX_LIBEVENT_EXTERNAL],[
     # Set output variables
     PMIX_EVENT_HEADER="<event.h>"
     PMIX_EVENT2_THREAD_HEADER="<event2/thread.h>"
+    pmix_libevent_source=$pmix_event_dir
 
     PMIX_VAR_SCOPE_POP
 ])dnl
diff --git a/opal/mca/pmix/pmix4x/pmix/contrib/pmix.spec b/opal/mca/pmix/pmix4x/pmix/contrib/pmix.spec
@@ -12,7 +12,7 @@
 # Copyright (c) 2006-2016 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2013      Mellanox Technologies, Inc.
 #                         All rights reserved.
-# Copyright (c) 2015-2018 Intel, Inc.  All rights reserved.
+# Copyright (c) 2015-2019 Intel, Inc.  All rights reserved.
 # Copyright (c) 2015      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
@@ -192,7 +192,7 @@
 
 Summary: An extended/exascale implementation of PMI
 Name: %{?_name:%{_name}}%{!?_name:pmix}
-Version: 4.0.0
+Version: 4.0.0a1
 Release: 1%{?dist}
 License: BSD
 Group: Development/Libraries

diff --git a/opal/mca/pmix/pmix4x/pmix/examples/Makefile.am b/opal/mca/pmix/pmix4x/pmix/examples/Makefile.am
@@ -11,13 +11,14 @@
 #                         All rights reserved.
 # Copyright (c) 2006-2010 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
-# Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
+# Copyright (c) 2013-2019 Intel, Inc.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
 #
 # $HEADER$
 #
+headers = examples.h
 
 AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_builddir)/src/include -I$(top_builddir)/include -I$(top_builddir)/include/pmix
 
@@ -28,64 +29,64 @@ if !WANT_HIDDEN
 noinst_PROGRAMS += server
 endif
 
-client_SOURCES = client.c
+client_SOURCES = client.c examples.h
 client_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
 client_LDADD =  $(top_builddir)/src/libpmix.la
 
-client2_SOURCES = client2.c
+client2_SOURCES = client2.c examples.h
 client2_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
 client2_LDADD =  $(top_builddir)/src/libpmix.la
 
-debugger_SOURCES = debugger.c
+debugger_SOURCES = debugger.c examples.h
 debugger_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
 debugger_LDADD =  $(top_builddir)/src/libpmix.la
 
-debuggerd_SOURCES = debuggerd.c
+debuggerd_SOURCES = debuggerd.c examples.h
 debuggerd_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
 debuggerd_LDADD =  $(top_builddir)/src/libpmix.la
 
-alloc_SOURCES = alloc.c
+alloc_SOURCES = alloc.c examples.h
 alloc_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
 alloc_LDADD =  $(top_builddir)/src/libpmix.la
 
-jctrl_SOURCES = jctrl.c
+jctrl_SOURCES = jctrl.c examples.h
 jctrl_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
 jctrl_LDADD =  $(top_builddir)/src/libpmix.la
 
-dmodex_SOURCES = dmodex.c
+dmodex_SOURCES = dmodex.c examples.h
 dmodex_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
 dmodex_LDADD =  $(top_builddir)/src/libpmix.la
 
-dynamic_SOURCES = dynamic.c
+dynamic_SOURCES = dynamic.c examples.h
 dynamic_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
 dynamic_LDADD = $(top_builddir)/src/libpmix.la
 
-fault_SOURCES = fault.c
+fault_SOURCES = fault.c examples.h
 fault_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
 fault_LDADD = $(top_builddir)/src/libpmix.la
 
-pub_SOURCES = pub.c
+pub_SOURCES = pub.c examples.h
 pub_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
 pub_LDADD = $(top_builddir)/src/libpmix.la
 
-pubi_SOURCES = pubi.c
+pubi_SOURCES = pubi.c examples.h
 pubi_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
 pubi_LDADD = $(top_builddir)/src/libpmix.la
 
-tool_SOURCES = tool.c
+tool_SOURCES = tool.c examples.h
 tool_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
 tool_LDADD = $(top_builddir)/src/libpmix.la
 
-group_SOURCES = group.c
+group_SOURCES = group.c examples.h
 group_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
 group_LDADD = $(top_builddir)/src/libpmix.la
 
-asyncgroup_SOURCES = asyncgroup.c
+asyncgroup_SOURCES = asyncgroup.c examples.h
 asyncgroup_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
 asyncgroup_LDADD = $(top_builddir)/src/libpmix.la
 
 if !WANT_HIDDEN
-server_SOURCES = server.c
+server_SOURCES = server.c examples.h
 server_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
 server_LDADD = $(top_builddir)/src/libpmix.la
 endif