Merge pull request open-mpi#1182 from rhc54/cmr10/hwloc

Update to latest nightly tarball of hwloc 1.9.1

Author: rhc54

opal/mca/hwloc/hwloc191/hwloc/NEWS

@@ -17,14 +17,6 @@ bug fixes (and other actions) for each version of hwloc since version
 in v0.9.1).
 
 
-Version 1.9.2
--------------
-* Fix some build failures in private/misc.h.
-  Thanks to Pavan Balaji and Ralph Castain for the reports.
-* Fix failures to detect X11/Xutil.h on some Solaris platforms.
-  Thanks to Siegmar Gross for reporting the failure.
-
-
 Version 1.9.1
 -------------
 * Fix a crash when the PCI locality is invalid. Attach to the root object

opal/mca/hwloc/hwloc191/hwloc/README

@@ -5,8 +5,8 @@
 # If snapshot=1, then use the value from snapshot_version as the
 # entire hwloc version (i.e., ignore major, minor, release, and
 # greek).  This is only set to 1 when making snapshot tarballs.
-snapshot=0
-snapshot_version=gitclone
+snapshot=1
+snapshot_version=1.9.1-76-g8725d82
 
 # major, minor, and release are generally combined in the form
 # <major>.<minor>.<release>.  If release is zero, then it is omitted.
@@ -22,11 +22,11 @@ release=2
 # requirement is that it must be entirely printable ASCII characters
 # and have no white space.
 
-greek=
+greek=rc1
 
 # The date when this release was created
 
-date="Aug 25, 2014"
+date="Unreleased developer copy"
 
 # The shared library version of hwloc's public library.  This version
 # is maintained in accordance with the "Library Interface Versions"

opal/mca/hwloc/hwloc191/hwloc/VERSION

@@ -1,7 +1,7 @@
 dnl -*- Autoconf -*-
 dnl
 dnl Copyright © 2009-2014 Inria.  All rights reserved.
-dnl Copyright (c) 2009-2012 Université Bordeaux 1
+dnl Copyright (c) 2009-2012, 2015 Université Bordeaux 1
 dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
 dnl                         University Research and Technology
 dnl                         Corporation.  All rights reserved.
@@ -533,15 +533,13 @@ EOF])
          AC_MSG_RESULT([yes])],
         [AC_MSG_RESULT([no])])
 
-    AC_MSG_CHECKING([for working _syscall3])
+    AC_MSG_CHECKING([for working syscall])
     AC_LINK_IFELSE([
       AC_LANG_PROGRAM([[
-          #include <linux/unistd.h>
-          #include <errno.h>
-          #define __NR_hwloc_test 123
-          _syscall3(int, hwloc_test, int, param1, int, param2, int, param3);
-        ]], [[ hwloc_test(1, 2, 3); ]])],
-        [AC_DEFINE([HWLOC_HAVE__SYSCALL3], [1], [Define to 1 if the _syscall3 macro works])
+          #include <unistd.h>
+          #include <sys/syscall.h>
+          ]], [[syscall(1, 2, 3);]])],
+        [AC_DEFINE([HWLOC_HAVE_SYSCALL], [1], [Define to 1 if function `syscall' is available])
          AC_MSG_RESULT([yes])],
         [AC_MSG_RESULT([no])])
 
@@ -929,8 +927,11 @@ EOF])
              # lstopo needs more
              AC_CHECK_HEADERS([X11/Xutil.h],
                 [AC_CHECK_HEADERS([X11/keysym.h],
-                    [AC_DEFINE([HWLOC_HAVE_X11_KEYSYM], [1], [Define to 1 if X11 headers including Xutil.h and keysym.h are available.])])
-                     AC_SUBST([HWLOC_X11_LIBS], ["-lX11"])
+                    [AC_DEFINE([HWLOC_HAVE_X11_KEYSYM], [1], [Define to 1 if X11 headers including Xutil.h and keysym.h are available.])
+                     HWLOC_X11_CPPFLAGS="$X_CFLAGS"
+                     AC_SUBST([HWLOC_X11_CPPFLAGS])
+                     HWLOC_X11_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+                     AC_SUBST([HWLOC_X11_LIBS])])
                 ], [], [#include <X11/Xlib.h>])
             ])
          ])

opal/mca/hwloc/hwloc191/hwloc/config/hwloc.m4

@@ -676,9 +676,8 @@ HWLOC_DECLSPEC int hwloc_topology_ignore_type_keep_structure(hwloc_topology_t to
 /** \brief Ignore all objects that do not bring any structure.
  *
  * Ignore all objects that do not bring any structure:
- * Each ignored object should have a single children or be the only child of its parent.
- * I/O objects may not be ignored, topology flags should be used to configure
- * their discovery instead.
+ * This is equivalent to calling hwloc_topology_ignore_type_keep_structure()
+ * for all object types.
  */
 HWLOC_DECLSPEC int hwloc_topology_ignore_all_keep_structure(hwloc_topology_t topology);
 
@@ -693,6 +692,10 @@ enum hwloc_topology_flags_e {
    * Gather all resources, even if some were disabled by the administrator.
    * For instance, ignore Linux Cpusets and gather all processors and memory nodes,
    * and ignore the fact that some resources may be offline.
+   *
+   * When this flag is not set, PUs that are disallowed are not added to the topology.
+   * Parent objects (package, core, cache, etc.) are added only if some of their children are allowed.
+   * NUMA nodes are always added but their available memory is set to 0 when disallowed.
    * \hideinitializer
    */
   HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM = (1UL<<0),
@@ -1196,7 +1199,7 @@ HWLOC_DECLSPEC const char * hwloc_obj_type_string (hwloc_obj_type_t type) __hwlo
  * Attributes that are not specified in the string (for instance "Group"
  * without a depth, or "L2Cache" without a cache type) are set to -1.
  *
- * \p typeattrd is only filled if the size specified in \p typeattrsize
+ * \p typeattrp is only filled if the size specified in \p typeattrsize
  * is large enough. It is currently only used for caches, and the required
  * size is at least the size of hwloc_obj_cache_type_t.
  *

opal/mca/hwloc/hwloc191/hwloc/include/hwloc.h

@@ -1,7 +1,7 @@
 /*
  * Copyright © 2009 CNRS
- * Copyright © 2009-2011 inria.  All rights reserved.
- * Copyright © 2009-2012 Université Bordeaux 1
+ * Copyright © 2009-2015 Inria.  All rights reserved.
+ * Copyright © 2009-2012 Université Bordeaux
  * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
  */
@@ -332,10 +332,14 @@ HWLOC_DECLSPEC int hwloc_bitmap_isequal (hwloc_const_bitmap_t bitmap1, hwloc_con
  */
 HWLOC_DECLSPEC int hwloc_bitmap_compare_first(hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) __hwloc_attribute_pure;
 
-/** \brief Compare bitmaps \p bitmap1 and \p bitmap2 using their highest index.
+/** \brief Compare bitmaps \p bitmap1 and \p bitmap2 in lexicographic order.
  *
- * Higher most significant bit is higher.
+ * Lexicographic comparison of bitmaps, starting for their highest indexes.
+ * Compare last indexes first, then second, etc.
  * The empty bitmap is considered lower than anything.
+ *
+ * \note This is different from the non-existing hwloc_bitmap_compare_last()
+ * which would only compare the highest index of each bitmap.
  */
 HWLOC_DECLSPEC int hwloc_bitmap_compare(hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) __hwloc_attribute_pure;
 

opal/mca/hwloc/hwloc191/hwloc/include/hwloc/bitmap.h

@@ -1,6 +1,6 @@
 /*
- * Copyright © 2010-2013 Inria.  All rights reserved.
- * Copyright © 2010-2011 Université Bordeaux 1
+ * Copyright © 2010-2015 Inria.  All rights reserved.
+ * Copyright © 2010-2011 Université Bordeaux
  * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
  */
@@ -49,7 +49,7 @@ hwloc_cuda_get_device_pci_ids(hwloc_topology_t topology __hwloc_attribute_unused
 {
   CUresult cres;
 
-#ifdef CU_DEVICE_ATTRIBUTE_PCI_DOMAIN_ID
+#if CUDA_VERSION >= 4000
   cres = cuDeviceGetAttribute(domain, CU_DEVICE_ATTRIBUTE_PCI_DOMAIN_ID, cudevice);
   if (cres != CUDA_SUCCESS) {
     errno = ENOSYS;

opal/mca/hwloc/hwloc191/hwloc/include/hwloc/cuda.h

@@ -1,6 +1,6 @@
 /*
- * Copyright © 2010-2013 Inria.  All rights reserved.
- * Copyright © 2010-2011 Université Bordeaux 1
+ * Copyright © 2010-2015 Inria.  All rights reserved.
+ * Copyright © 2010-2011 Université Bordeaux
  * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
  */
@@ -23,6 +23,7 @@
 #include <hwloc/linux.h>
 #endif
 
+#include <cuda.h> /* for CUDA_VERSION */
 #include <cuda_runtime_api.h>
 
 
@@ -56,7 +57,7 @@ hwloc_cudart_get_device_pci_ids(hwloc_topology_t topology __hwloc_attribute_unus
     return -1;
   }
 
-#ifdef CU_DEVICE_ATTRIBUTE_PCI_DOMAIN_ID
+#if CUDA_VERSION >= 4000
   *domain = prop.pciDomainID;
 #else
   *domain = 0;

opal/mca/hwloc/hwloc191/hwloc/include/hwloc/cudart.h

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2014 Inria.  All rights reserved.
+ * Copyright © 2013-2015 Inria.  All rights reserved.
  * See COPYING in top-level directory.
  */
 
@@ -336,7 +336,7 @@ hwloc_plugin_check_namespace(const char *pluginname __hwloc_attribute_unused, co
     static int verboseenv_value = 0;
     if (!verboseenv_checked) {
       char *verboseenv = getenv("HWLOC_PLUGINS_VERBOSE");
-      verboseenv_value = atoi(verboseenv);
+      verboseenv_value = verboseenv ? atoi(verboseenv) : 0;
       verboseenv_checked = 1;
     }
     if (verboseenv_value)
@@ -383,6 +383,8 @@ HWLOC_DECLSPEC int hwloc_pci_find_linkspeed(const unsigned char *config, unsigne
 /** \brief Modify the PCI device object into a bridge and fill its attribute if a bridge is found in the PCI config space.
  *
  * This function requires 64 bytes of common configuration header at the beginning of config.
+ *
+ * Returns -1 and destroys /p obj if bridge fields are invalid.
  */
 HWLOC_DECLSPEC int hwloc_pci_prepare_bridge(hwloc_obj_t obj, const unsigned char *config);
 

opal/mca/hwloc/hwloc191/hwloc/include/hwloc/plugins.h

@@ -39,6 +39,9 @@
 /* Define to 1 if you have the `cpuset_setid' function. */
 #undef HAVE_CPUSET_SETID
 
+/* Define to 1 if you have the <ctype.h> header file. */
+#undef HAVE_CTYPE_H
+
 /* Define to 1 if we have -lcuda */
 #undef HAVE_CUDA
 
@@ -528,6 +531,9 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HWLOC_HAVE_STDINT_H
 
+/* Define to 1 if function `syscall' is available */
+#undef HWLOC_HAVE_SYSCALL
+
 /* Define to 1 if you have the `windows.h' header. */
 #undef HWLOC_HAVE_WINDOWS_H
 
@@ -537,9 +543,6 @@
 /* Define to 1 if you have x86 cpuid */
 #undef HWLOC_HAVE_X86_CPUID
 
-/* Define to 1 if the _syscall3 macro works */
-#undef HWLOC_HAVE__SYSCALL3
-
 /* Define to 1 on HP-UX */
 #undef HWLOC_HPUX_SYS