Replace hwloc191 with hwloc1110

Fix hwloc compile. Ignore LAMA mapper due to deprecated hwloc functions

Author: Ralph Castain

opal/mca/hwloc/hwloc1110/hwloc/NEWS

@@ -71,6 +71,8 @@ Version 1.11.0
     - Do not drop instruction caches and I/O devices from the output anymore.
   + Fix lstopo path in hwloc-gather-topology after install.
 * Misc
+  + Fix hwloc/cudart.h for machines with multiple PCI domains,
+    thanks to Imre Kerr for reporting the problem.
   + Fix PCI Bridge-specific depth attribute.
   + Fix hwloc_bitmap_intersect() for two infinite bitmaps.
   + Improve the performance of object insertion by cpuset for large

opal/mca/hwloc/hwloc1110/hwloc/README

@@ -16,17 +16,17 @@ release=0
 # requirement is that it must be entirely printable ASCII characters
 # and have no white space.
 
-greek=rc1
+greek=rc2
 
 # The date when this release was created
 
-date="Jun 02, 2015"
+date="Unreleased developer copy"
 
 # 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=${major}.${minor}.${release}${greek}-git
+snapshot=1
+snapshot_version=dev-450-g1cc3012
 
 # The shared library version of hwloc's public library.  This version
 # is maintained in accordance with the "Library Interface Versions"

opal/mca/hwloc/hwloc1110/hwloc/VERSION

@@ -9,7 +9,7 @@ dnl Copyright © 2004-2012 The Regents of the University of California.
 dnl                         All rights reserved.
 dnl Copyright © 2004-2008 High Performance Computing Center Stuttgart,
 dnl                         University of Stuttgart.  All rights reserved.
-dnl Copyright © 2006-2014 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright © 2006-2015 Cisco Systems, Inc.  All rights reserved.
 dnl Copyright © 2012  Blue Brain Project, BBP/EPFL. All rights reserved.
 dnl Copyright © 2012       Oracle and/or its affiliates.  All rights reserved.
 dnl See COPYING in top-level directory.
@@ -80,11 +80,11 @@ EOF])
 
     # Get the version of hwloc that we are installing
     AC_MSG_CHECKING([for hwloc version])
-    HWLOC_VERSION="`$srcdir/config/hwloc_get_version.sh $srcdir/VERSION`"
+    HWLOC_VERSION="`$HWLOC_top_srcdir/config/hwloc_get_version.sh $HWLOC_top_srcdir/VERSION`"
     if test "$?" != "0"; then
         AC_MSG_ERROR([Cannot continue])
     fi
-    HWLOC_RELEASE_DATE="`$srcdir/config/hwloc_get_version.sh $srcdir/VERSION --release-date`"
+    HWLOC_RELEASE_DATE="`$HWLOC_top_srcdir/config/hwloc_get_version.sh $HWLOC_top_srcdir/VERSION --release-date`"
     AC_SUBST(HWLOC_VERSION)
     AC_DEFINE_UNQUOTED([HWLOC_VERSION], ["$HWLOC_VERSION"],
                        [The library version, always available, even in embedded mode, contrary to VERSION])

opal/mca/hwloc/hwloc1110/hwloc/config/hwloc.m4

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2010-2013 Inria.  All rights reserved.
+ * 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/hwloc1110/hwloc/include/hwloc/cuda.h

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2010-2013 Inria.  All rights reserved.
+ * 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/hwloc1110/hwloc/include/hwloc/cudart.h

@@ -2599,7 +2599,7 @@ hwloc_discover(struct hwloc_topology *topology)
       && strcmp(topology->backends->component->name, "xml")) {
     char *value;
     /* add a hwlocVersion */
-    hwloc_obj_add_info(topology->levels[0][0], "hwlocVersion", VERSION);
+    hwloc_obj_add_info(topology->levels[0][0], "hwlocVersion", HWLOC_VERSION);
     /* add a ProcessName */
     value = hwloc_progname(topology);
     if (value) {