Merge pull request #6505 from rhc54/topic/pmxup

Sync to latest PMIx master and silence hwloc warnings

Author: rhc54

opal/mca/hwloc/base/hwloc_base_util.c

@@ -13,10 +13,10 @@
  * Copyright (c) 2011-2018 Cisco Systems, Inc.  All rights reserved
  * Copyright (c) 2012-2017 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) 2015-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
- * Copyright (C) 2018      Mellanox Technologies, Ltd. 
+ * Copyright (C) 2018      Mellanox Technologies, Ltd.
  *                         All rights reserved.
  * Copyright (c) 2018      Amazon.com, Inc. or its affiliates.  All Rights reserved.
  * Copyright (c) 2019 IBM Corporation. All rights reserved.
@@ -1858,8 +1858,9 @@ static void sort_by_dist(hwloc_topology_t topo, char* device_name, opal_list_t *
     hwloc_obj_t root = NULL;
     int depth;
     unsigned i;
-#endif
+#else
     unsigned distances_nr = 0;
+#endif
 
     for (device_obj = hwloc_get_obj_by_type(topo, HWLOC_OBJ_OS_DEVICE, 0); device_obj; device_obj = hwloc_get_next_osdev(topo, device_obj)) {
         if (device_obj->attr->osdev.type == HWLOC_OBJ_OSDEV_OPENFABRICS
@@ -1890,7 +1891,7 @@ static void sort_by_dist(hwloc_topology_t topo, char* device_name, opal_list_t *
 
                 /* find distance matrix for all numa nodes */
 #if HWLOC_API_VERSION < 0x20000
-                distances = hwloc_get_whole_distance_matrix_by_type(topo, HWLOC_OBJ_NODE);
+                distances = (struct hwloc_distances_s*)hwloc_get_whole_distance_matrix_by_type(topo, HWLOC_OBJ_NODE);
                 if (NULL ==  distances) {
                     /* we can try to find distances under group object. This info can be there. */
                     depth = hwloc_get_type_depth(topo, HWLOC_OBJ_NODE);

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=gita1212af2
+repo_rev=git0c93c13f
 
 # 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="Feb 04, 2019"
+date="Mar 19, 2019"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library

opal/mca/pmix/pmix4x/pmix/config/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+# Copyright (c) 2013-2019 Intel, Inc.  All rights reserved.
 # Copyright (c) 2016      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # Copyright (c) 2006-2016 Cisco Systems, Inc.  All rights reserved.
@@ -42,7 +42,6 @@ EXTRA_DIST = \
 	pmix.m4 \
 	pmix_search_libs.m4 \
 	pmix_setup_cc.m4 \
-	pmix_setup_zlib.m4 \
 	pmix_setup_libevent.m4 \
 	pmix_mca_priority_sort.pl
 

opal/mca/pmix/pmix4x/pmix/config/pmix.m4

@@ -18,8 +18,8 @@ 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-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) 2015-2019 Research Organization for Information Science
+dnl                         and Technology (RIST).  All rights reserved.
 dnl Copyright (c) 2016      Mellanox Technologies, Inc.
 dnl                         All rights reserved.
 dnl
@@ -120,9 +120,11 @@ AC_DEFUN([PMIX_SETUP_CORE],[
     pmixmajor=${PMIX_MAJOR_VERSION}L
     pmixminor=${PMIX_MINOR_VERSION}L
     pmixrelease=${PMIX_RELEASE_VERSION}L
+    pmixnumeric=$(printf 0x%4.4x%2.2x%2.2x $PMIX_MAJOR_VERSION $PMIX_MINOR_VERSION $PMIX_RELEASE_VERSION)
     AC_SUBST(pmixmajor)
     AC_SUBST(pmixminor)
     AC_SUBST(pmixrelease)
+    AC_SUBST(pmixnumeric)
     AC_CONFIG_FILES(pmix_config_prefix[include/pmix_version.h])
 
     PMIX_GREEK_VERSION="`$PMIX_top_srcdir/config/pmix_get_version.sh $PMIX_top_srcdir/VERSION --greek`"
@@ -414,7 +416,7 @@ AC_DEFUN([PMIX_SETUP_CORE],[
                       time.h unistd.h dirent.h \
                       crt_externs.h signal.h \
                       ioLib.h sockLib.h hostLib.h limits.h \
-                      sys/statfs.h sys/statvfs.h \
+                      sys/fcntl.h sys/statfs.h sys/statvfs.h \
                       netdb.h ucred.h zlib.h sys/auxv.h \
                       sys/sysctl.h])
 
@@ -752,10 +754,24 @@ AC_DEFUN([PMIX_SETUP_CORE],[
     ##################################
     # Libevent
     ##################################
-    pmix_show_title "Libevent"
+    pmix_show_title "Event libraries"
 
+    PMIX_LIBEV_CONFIG
     PMIX_LIBEVENT_CONFIG
 
+    AS_IF([test $pmix_libevent_support -eq 1 && test $pmix_libev_support -eq 1],
+      [AC_MSG_WARN([Both libevent and libev support have been specified.])
+       AC_MSG_WARN([Only one can be configured against at a time. Please])
+       AC_MSG_WARN([remove one from the configure command line.])
+       AC_MSG_ERROR([Cannot continue])])
+
+    AS_IF([test $pmix_libevent_support -eq 0 && test $pmix_libev_support -eq 0],
+          [AC_MSG_WARN([Either libevent or libev support is required, but neither])
+           AC_MSG_WARN([was found. Please use the configure options to point us])
+           AC_MSG_WARN([to where we can find one or the other library])
+           AC_MSG_ERROR([Cannot continue])])
+
+
     ##################################
     # HWLOC
     ##################################
@@ -764,13 +780,6 @@ AC_DEFUN([PMIX_SETUP_CORE],[
     PMIX_HWLOC_CONFIG
 
 
-    ##################################
-    # ZLIB COMPRESSION
-    ##################################
-    pmix_show_title "ZLIB"
-
-    PMIX_ZLIB_CONFIG
-
     ##################################
     # MCA
     ##################################
@@ -874,6 +883,7 @@ AC_DEFUN([PMIX_SETUP_CORE],[
         pmix_config_prefix[src/tools/pmix_info/Makefile]
         pmix_config_prefix[src/tools/plookup/Makefile]
         pmix_config_prefix[src/tools/pps/Makefile]
+        pmix_config_prefix[src/tools/pattrs/Makefile]
         )
 
     # publish any embedded flags so external wrappers can use them

opal/mca/pmix/pmix4x/pmix/config/pmix_mca.m4

@@ -11,7 +11,7 @@ dnl                         University of Stuttgart.  All rights reserved.
 dnl Copyright (c) 2004-2005 The Regents of the University of California.
 dnl                         All rights reserved.
 dnl Copyright (c) 2010-2015 Cisco Systems, Inc.  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$
 dnl
 dnl Additional copyrights may follow
@@ -262,11 +262,6 @@ AC_DEFUN([PMIX_MCA],[
                                    [MCA_pmix_]mca_framework[_CONFIG](mca_framework),
                                    [MCA_CONFIGURE_FRAMEWORK(mca_framework, 1)])])])
 
-    # note that mca_wrapper_extra_* is a running list, and we take checkpoints at the end of our project
-    pmix_mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags"
-    pmix_mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags"
-    pmix_mca_wrapper_extra_libs="$mca_wrapper_extra_libs"
-
     AC_SUBST(MCA_pmix_FRAMEWORKS)
     AC_SUBST(MCA_pmix_FRAMEWORKS_SUBDIRS)
     AC_SUBST(MCA_pmix_FRAMEWORK_COMPONENT_ALL_SUBDIRS)
@@ -622,14 +617,6 @@ AC_DEFUN([MCA_CONFIGURE_ALL_CONFIG_COMPONENTS],[
                         AC_MSG_WARN([MCA component configure script told me to abort])
                         AC_MSG_ERROR([cannot continue])
                     fi
-
-                    m4_foreach(flags, [LDFLAGS, LIBS],
-                        [[line="`$GREP WRAPPER_EXTRA_]flags[= $infile | cut -d= -f2-`"]
-                            eval "line=$line"
-                            if test -n "$line"; then
-                                $2[_]$3[_WRAPPER_EXTRA_]flags[="$line"]
-                            fi
-                        ])dnl
                 fi
 
                 MCA_PROCESS_COMPONENT($1, $component, $2, $3, $4, $5, $compile_mode)
@@ -754,38 +741,6 @@ AC_MSG_ERROR([*** $1 component $2 was supposed to be direct-called, but
 *** Aborting])
         fi
     fi
-
-    # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and
-    # WRAPPER_EXTRA_LIBS.  If the component doesn't specify it's
-    # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if
-    # component didn't have it's own configure script (in which case,
-    # we know it didn't set LDFLAGS and LIBS because it can't) Don't
-    # have to do this if the component is building dynamically,
-    # because it will link against these (without a dependency from
-    # libmpi.so to these flags)
-    if test "$7" = "static"; then
-        AS_LITERAL_IF([$2],
-            [m4_foreach(flags, [LDFLAGS, LIBS],
-                    [AS_IF([test "$$1_$2_WRAPPER_EXTRA_]flags[" = ""],
-                           [PMIX_FLAGS_APPEND_UNIQ([mca_wrapper_extra_]m4_tolower(flags), [$$1_$2_]flags)],
-                           [PMIX_FLAGS_APPEND_UNIQ([mca_wrapper_extra_]m4_tolower(flags), [$$1_$2_WRAPPER_EXTRA_]flags)])
-                        ])],
-            [m4_foreach(flags, [LDFLAGS, LIBS],
-                    [[str="line=\$$1_$2_WRAPPER_EXTRA_]flags["]
-                      eval "$str"
-                      PMIX_FLAGS_APPEND_UNIQ([mca_wrapper_extra_]m4_tolower(flags), [$line])])])
-    fi
-
-    # if needed, copy over WRAPPER_EXTRA_CPPFLAGS.  Since a configure script
-    # component can never be used in a STOP_AT_FIRST framework, we
-    # don't have to implement the else clause in the literal check...
-    AS_LITERAL_IF([$2],
-        [AS_IF([test "$$1_$2_WRAPPER_EXTRA_CPPFLAGS" != ""],
-           [m4_if(PMIX_EVAL_ARG([MCA_pmix_$1_CONFIGURE_MODE]), [STOP_AT_FIRST], [stop_at_first=1], [stop_at_first=0])
-            AS_IF([test "$7" = "static" && test "$stop_at_first" = "1"],
-              [AS_IF([test "$with_devel_headers" = "yes"],
-                     [PMIX_FLAGS_APPEND_UNIQ([mca_wrapper_extra_cppflags], [$$1_$2_WRAPPER_EXTRA_CPPFLAGS])])],
-              [AC_MSG_WARN([ignoring $1_$2_WRAPPER_EXTRA_CPPFLAGS ($$1_$2_WRAPPER_EXTRA_CPPFLAGS): component conditions not met])])])])
 ])
 
 

opal/mca/pmix/pmix4x/pmix/config/pmix_setup_cc.m4

@@ -16,7 +16,7 @@ dnl Copyright (c) 2012-2017 Los Alamos National Security, LLC. All rights
 dnl                         reserved.
 dnl Copyright (c) 2015-2019 Research Organization for Information Science
 dnl                         and Technology (RIST).  All rights reserved.
-dnl Copyright (c) 2018-2019 Intel, Inc.  All rights reserved.
+dnl Copyright (c) 2018      Intel, Inc. All rights reserved.
 dnl $COPYRIGHT$
 dnl
 dnl Additional copyrights may follow

opal/mca/pmix/pmix4x/pmix/config/pmix_setup_libev.m4

@@ -0,0 +1,96 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2013      Los Alamos National Security, LLC.  All rights reserved.
+# Copyright (c) 2013-2019 Intel, Inc.  All rights reserved.
+# Copyright (c) 2017-2019 Research Organization for Information Science
+#                         and Technology (RIST).  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# MCA_libev_CONFIG([action-if-found], [action-if-not-found])
+# --------------------------------------------------------------------
+AC_DEFUN([PMIX_LIBEV_CONFIG],[
+    PMIX_VAR_SCOPE_PUSH([pmix_libev_dir pmix_libev_libdir pmix_libev_standard_header_location pmix_libev_standard_lib_location])
+
+    AC_ARG_WITH([libev],
+                [AC_HELP_STRING([--with-libev=DIR],
+                                [Search for libev headers and libraries in DIR ])])
+    PMIX_CHECK_WITHDIR([libev], [$with_libev], [include/event.h])
+
+    AC_ARG_WITH([libev-libdir],
+                [AC_HELP_STRING([--with-libev-libdir=DIR],
+                                [Search for libev libraries in DIR ])])
+    PMIX_CHECK_WITHDIR([libev-libdir], [$with_livev_libdir], [libev.*])
+
+    pmix_libev_support=0
+
+    AS_IF([test -n "$with_libev" && test "$with_libev" != "no"],
+          [AC_MSG_CHECKING([for libev in])
+           pmix_check_libev_save_CPPFLAGS="$CPPFLAGS"
+           pmix_check_libeve_save_LDFLAGS="$LDFLAGS"
+           pmix_check_libev_save_LIBS="$LIBS"
+           if test "$with_libev" != "yes"; then
+               pmix_libev_dir=$with_libev/include
+               pmix_libev_standard_header_location=no
+               pmix_libev_standard_lib_location=no
+               AS_IF([test -z "$with_libev_libdir" || test "$with_libev_libdir" = "yes"],
+                     [if test -d $with_libev/lib; then
+                          pmix_libev_libdir=$with_libev/lib
+                      elif test -d $with_libev/lib64; then
+                          pmix_libev_libdir=$with_libev/lib64
+                      else
+                          AC_MSG_RESULT([Could not find $with_libev/lib or $with_libev/lib64])
+                          AC_MSG_ERROR([Can not continue])
+                      fi
+                      AC_MSG_RESULT([$pmix_libev_dir and $pmix_libev_libdir])],
+                     [AC_MSG_RESULT([$with_libev_libdir])])
+           else
+               AC_MSG_RESULT([(default search paths)])
+               pmix_libev_standard_header_location=yes
+               pmix_libev_standard_lib_location=yes
+           fi
+           AS_IF([test ! -z "$with_libev_libdir" && test "$with_libev_libdir" != "yes"],
+                 [pmix_libev_libdir="$with_libev_libdir"
+                  pmix_libev_standard_lib_location=no])
+
+           PMIX_CHECK_PACKAGE([pmix_libev],
+                              [event.h],
+                              [ev],
+                              [event_base_new],
+                              [],
+                              [$pmix_libev_dir],
+                              [$pmix_libev_libdir],
+                              [pmix_libev_support=1],
+                              [pmix_libev_support=0])
+           CPPFLAGS="$pmix_check_libev_save_CPPFLAGS"
+           LDFLAGS="$pmix_check_libev_save_LDFLAGS"
+           LIBS="$pmix_check_libev_save_LIBS"])
+
+    AS_IF([test $pmix_libev_support -eq 1],
+          [LIBS="$LIBS $pmix_libev_LIBS"
+
+           AS_IF([test "$pmix_libev_standard_header_location" != "yes"],
+                 [CPPFLAGS="$CPPFLAGS $pmix_libev_CPPFLAGS"])
+           AS_IF([test "$pmix_libev_standard_lib_location" != "yes"],
+                 [LDFLAGS="$LDFLAGS $pmix_libev_LDFLAGS"])])
+
+    AC_MSG_CHECKING([will libev support be built])
+    if test $pmix_libev_support -eq 1; then
+        AC_MSG_RESULT([yes])
+        PMIX_EVENT_HEADER="<event.h>"
+        AC_DEFINE_UNQUOTED([PMIX_EVENT_HEADER], [$PMIX_EVENT_HEADER],
+                           [Location of event.h])
+        PMIX_SUMMARY_ADD([[External Packages]],[[libev]],[libev],[$pmix_libev_dir])
+    else
+        AC_MSG_RESULT([no])
+    fi
+
+    AC_DEFINE_UNQUOTED([PMIX_HAVE_LIBEV], [$pmix_libev_support], [Whether we are building against libev])
+
+    PMIX_VAR_SCOPE_POP
+])dnl