Add in hwloc 1.11.0rc1 - will overwrite with final version

Author: Ralph Castain

opal/mca/hwloc/hwloc1110/Makefile.am

@@ -0,0 +1,83 @@
+#
+# Copyright (c) 2011-2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2014-2015 Intel, Inc. All right reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# Due to what might be a bug in Automake, we need to remove stamp-h?
+# files manually.  See
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19418.
+DISTCLEANFILES = \
+    hwloc/include/hwloc/autogen/stamp-h? \
+    hwloc/include/private/autogen/stamp-h?
+
+# Need to include these files so that these directories are carried in
+# the tarball (in case someone invokes autogen.sh on a dist tarball).
+EXTRA_DIST = \
+        hwloc/doc/README.txt \
+        hwloc/tests/README.txt \
+        hwloc/utils/README.txt
+
+SUBDIRS = hwloc
+
+# Headers and sources
+headers = hwloc1110.h
+sources = hwloc1110_component.c
+
+# We only ever build this component statically
+noinst_LTLIBRARIES = libmca_hwloc_hwloc1110.la
+libmca_hwloc_hwloc1110_la_SOURCES = $(headers) $(sources)
+nodist_libmca_hwloc_hwloc1110_la_SOURCES = $(nodist_headers)
+libmca_hwloc_hwloc1110_la_LDFLAGS = -module -avoid-version $(opal_hwloc_hwloc1110_LDFLAGS)
+libmca_hwloc_hwloc1110_la_LIBADD = $(opal_hwloc_hwloc1110_LIBS)
+libmca_hwloc_hwloc1110_la_DEPENDENCIES = \
+    $(HWLOC_top_builddir)/src/libhwloc_embedded.la
+
+# Since the rest of the code base includes the underlying hwloc.h, we
+# also have to install the underlying header files when
+# --with-devel-headers is specified.  hwloc doesn't support this; the
+# least gross way to make this happen is just to list all of hwloc's
+# header files here.  :-(
+headers += \
+        hwloc/include/hwloc.h \
+        hwloc/include/hwloc/bitmap.h \
+        hwloc/include/hwloc/cuda.h \
+        hwloc/include/hwloc/cudart.h \
+        hwloc/include/hwloc/deprecated.h \
+        hwloc/include/hwloc/diff.h \
+        hwloc/include/hwloc/gl.h \
+        hwloc/include/hwloc/helper.h \
+        hwloc/include/hwloc/inlines.h \
+        hwloc/include/hwloc/intel-mic.h \
+        hwloc/include/hwloc/myriexpress.h \
+        hwloc/include/hwloc/nvml.h \
+        hwloc/include/hwloc/opencl.h \
+        hwloc/include/hwloc/openfabrics-verbs.h \
+        hwloc/include/hwloc/plugins.h \
+        hwloc/include/hwloc/rename.h \
+        hwloc/include/private/private.h \
+        hwloc/include/private/debug.h \
+        hwloc/include/private/misc.h \
+        hwloc/include/private/cpuid-x86.h
+nodist_headers = hwloc/include/hwloc/autogen/config.h
+
+if HWLOC_HAVE_LINUX
+headers += \
+        hwloc/include/hwloc/linux.h \
+        hwloc/include/hwloc/linux-libnuma.h
+endif HWLOC_HAVE_LINUX
+
+if HWLOC_HAVE_SCHED_SETAFFINITY
+headers += hwloc/include/hwloc/glibc-sched.h
+endif HWLOC_HAVE_SCHED_SETAFFINITY
+
+# Conditionally install the header files
+if WANT_INSTALL_HEADERS
+opaldir = $(opalincludedir)/$(subdir)
+nobase_opal_HEADERS = $(headers)
+nobase_nodist_opal_HEADERS = $(nodist_headers)
+endif

opal/mca/hwloc/hwloc1110/README-ompi.txt

@@ -0,0 +1,35 @@
+Applied the following patches from the upstream hwloc 1.9 branch after
+the v1.9.1 release:
+
+All relevant commits up to open-mpi/hwloc@4e23b12 (i.e., the HEAD as
+of 27 March 2015).  "Relevant" commits are defined as those that
+included files that are embedded in the Open MPI tree (e.g., updates
+to files in docs/, utils/, etc. aren't relevant because they are not
+embedded in the Open MPI tree).  To be specific, the following commits
+have been cherry-picked over to Open MPI:
+
+* open-mpi/hwloc@7c03216 v1.9.1 released, doing 1.9.2rc1 now
+* open-mpi/hwloc@b35ced8 misc.h: Fix hwloc_strncasecmp() build under strict flags on BSD
+* open-mpi/hwloc@d8c3f3d misc.h: Fix hwloc_strncasecmp() with some icc
+* open-mpi/hwloc@f705a23 Use gcc's __asm__ version of the asm extension, which can be used in all standards
+* open-mpi/hwloc@307726a configure: fix the check for X11/Xutil.h
+* open-mpi/hwloc@ec58c05 errors: improve the advice to send hwloc-gather-topology files in the OS error message
+* open-mpi/hwloc@35c743d NEWS update
+* open-mpi/hwloc@868170e API: clearly state that os_index isn't unique while logical_index is
+* open-mpi/hwloc@851532d x86 and OSF: Don't forget to set NUMA node nodeset
+* open-mpi/hwloc@790aa2e cpuid-x86: Fix duplicate asm labels in case of heavy inlining on x86-32
+* open-mpi/hwloc@dd09aa5 debug: fix an overzealous assertion about the parent cpuset vs its children
+* open-mpi/hwloc@769b9b5 core: fix the merging of identical objects in presence of Misc objects
+* open-mpi/hwloc@71da0f1 core: reorder children in merge_useless_child() as well
+* open-mpi/hwloc@c9cef07 hpux: improve hwloc_hpux_find_ldom() looking for NUMA node
+* open-mpi/hwloc@cdffea6 x86: use ulong for cache sizes, uint won't be enough in the near future
+* open-mpi/hwloc@55b0676 x86: use Group instead of Misc for unknown x2apic levels
+* open-mpi/hwloc@7764ce5 synthetic: Misc levels are not allowed in the synthetic description
+* open-mpi/hwloc@5b2dce1 error: point to the FAQ when displaying the big OS error message
+* open-mpi/hwloc@c7bd9e6 pci: fix SR-IOV VF vendor/device names
+* open-mpi/hwloc@a0f72ef distances: when we fail to insert an intermediate group, don't try to group further above
+* open-mpi/hwloc@e419811 AIX: Fix PU os_index
+* open-mpi/hwloc@08ab793 groups: add complete sets when inserting distance/pci groups
+* open-mpi/hwloc@c66e714 core: only update root->complete sets if insert succeeds
+* open-mpi/hwloc@01da9b9 bitmap: fix a corner case in hwloc_bitmap_isincluded() with infinite sets
+* open-mpi/hwloc@e7b192b pci: fix bridge depth

opal/mca/hwloc/hwloc1110/configure.m4

@@ -0,0 +1,170 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
+#
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+#
+# Priority
+#
+AC_DEFUN([MCA_opal_hwloc_hwloc1110_PRIORITY], [90])
+
+#
+# Force this component to compile in static-only mode
+#
+AC_DEFUN([MCA_opal_hwloc_hwloc1110_COMPILE_MODE], [
+    AC_MSG_CHECKING([for MCA component $2:$3 compile mode])
+    $4="static"
+    AC_MSG_RESULT([$$4])
+])
+
+# Include hwloc m4 files
+m4_include(opal/mca/hwloc/hwloc1110/hwloc/config/hwloc.m4)
+m4_include(opal/mca/hwloc/hwloc1110/hwloc/config/hwloc_pkg.m4)
+m4_include(opal/mca/hwloc/hwloc1110/hwloc/config/hwloc_check_attributes.m4)
+m4_include(opal/mca/hwloc/hwloc1110/hwloc/config/hwloc_check_visibility.m4)
+m4_include(opal/mca/hwloc/hwloc1110/hwloc/config/hwloc_check_vendor.m4)
+m4_include(opal/mca/hwloc/hwloc1110/hwloc/config/hwloc_components.m4)
+
+# MCA_hwloc_hwloc1110_POST_CONFIG()
+# ---------------------------------
+AC_DEFUN([MCA_opal_hwloc_hwloc1110_POST_CONFIG],[
+    OPAL_VAR_SCOPE_PUSH([opal_hwloc_hwloc1110_basedir])
+
+    # If we won, then do all the rest of the setup
+    AS_IF([test "$1" = "1" && test "$opal_hwloc_hwloc1110_support" = "yes"],
+          [
+           # Set this variable so that the framework m4 knows what
+           # file to include in opal/mca/hwloc/hwloc.h
+           opal_hwloc_hwloc1110_basedir=opal/mca/hwloc/hwloc1110
+           opal_hwloc_base_include="$opal_hwloc_hwloc1110_basedir/hwloc1110.h"
+
+           # Add some stuff to CPPFLAGS so that the rest of the source
+           # tree can be built
+           file=$opal_hwloc_hwloc1110_basedir/hwloc
+           CPPFLAGS="$CPPFLAGS -I$OPAL_TOP_SRCDIR/$file/include"
+           AS_IF([test "$OPAL_TOP_BUILDDIR" != "$OPAL_TOP_SRCDIR"],
+                 [CPPFLAGS="$CPPFLAGS -I$OPAL_TOP_BUILDDIR/$file/include"])
+           unset file
+          ])
+    OPAL_VAR_SCOPE_POP
+
+    # This must be run unconditionally
+    HWLOC_DO_AM_CONDITIONALS
+])dnl
+
+
+# MCA_hwloc_hwloc1110_CONFIG([action-if-found], [action-if-not-found])
+# --------------------------------------------------------------------
+AC_DEFUN([MCA_opal_hwloc_hwloc1110_CONFIG],[
+    # Hwloc needs to know if we have Verbs support
+    AC_REQUIRE([OPAL_CHECK_VERBS_DIR])
+
+    AC_CONFIG_FILES([opal/mca/hwloc/hwloc1110/Makefile])
+
+    OPAL_VAR_SCOPE_PUSH([HWLOC_VERSION opal_hwloc_hwloc1110_save_CPPFLAGS opal_hwloc_hwloc1110_save_LDFLAGS opal_hwloc_hwloc1110_save_LIBS opal_hwloc_hwloc1110_save_cairo opal_hwloc_hwloc1110_save_xml opal_hwloc_hwloc1110_basedir opal_hwloc_hwloc1110_file opal_hwloc_hwloc1110_save_cflags CPPFLAGS_save LIBS_save])
+
+    # default to this component not providing support
+    opal_hwloc_hwloc1110_basedir=opal/mca/hwloc/hwloc1110
+    opal_hwloc_hwloc1110_support=no
+
+    if test "$with_hwloc" = "internal" -o "$with_hwloc" = "" -o "$with_hwloc" = "yes"; then
+        opal_hwloc_hwloc1110_save_CPPFLAGS=$CPPFLAGS
+        opal_hwloc_hwloc1110_save_LDFLAGS=$LDFLAGS
+        opal_hwloc_hwloc1110_save_LIBS=$LIBS
+
+        # Run the hwloc configuration - set the prefix to minimize
+        # the chance that someone will use the internal symbols
+        HWLOC_SET_SYMBOL_PREFIX([opal_hwloc1110_])
+
+        # save XML or graphical options
+        opal_hwloc_hwloc1110_save_cairo=$enable_cairo
+        opal_hwloc_hwloc1110_save_xml=$enable_xml
+        opal_hwloc_hwloc1110_save_static=$enable_static
+        opal_hwloc_hwloc1110_save_shared=$enable_shared
+        opal_hwloc_hwloc1110_save_plugins=$enable_plugins
+
+        # never enable hwloc's graphical option
+        enable_cairo=no
+
+        # never enable hwloc's plugin system
+        enable_plugins=no
+        enable_static=yes
+        enable_shared=no
+
+        # Override -- disable hwloc's libxml2 support, but enable the
+        # native hwloc XML support
+        enable_libxml2=no
+        enable_xml=yes
+
+        # hwloc checks for compiler visibility, and its needs to do
+        # this without "picky" flags.
+        opal_hwloc_hwloc1110_save_cflags=$CFLAGS
+        CFLAGS=$OPAL_CFLAGS_BEFORE_PICKY
+        HWLOC_SETUP_CORE([opal/mca/hwloc/hwloc1110/hwloc], 
+                  [AC_MSG_CHECKING([whether hwloc configure succeeded])
+                   AC_MSG_RESULT([yes])
+                   HWLOC_VERSION="internal v`$srcdir/$opal_hwloc_hwloc1110_basedir/hwloc/config/hwloc_get_version.sh $srcdir/$opal_hwloc_hwloc1110_basedir/hwloc/VERSION`"
+
+                   # Build flags for our Makefile.am
+                   opal_hwloc_hwloc1110_LDFLAGS='$(HWLOC_EMBEDDED_LDFLAGS)'
+                   opal_hwloc_hwloc1110_LIBS='$(OPAL_TOP_BUILDDIR)/'"$opal_hwloc_hwloc1110_basedir"'/hwloc/src/libhwloc_embedded.la $(HWLOC_EMBEDDED_LIBS)'
+                   opal_hwloc_hwloc1110_support=yes
+
+                   AC_DEFINE_UNQUOTED([HWLOC_HWLOC1110_HWLOC_VERSION], 
+                       ["$HWLOC_VERSION"], 
+                       [Version of hwloc])
+
+                   # Do we have verbs support?
+                   CPPFLAGS_save=$CPPFLAGS
+                   AS_IF([test "$opal_want_verbs" = "yes"],
+                         [CPPFLAGS="-I$opal_verbs_dir/include $CPPFLAGS"])
+                   AC_CHECK_HEADERS([infiniband/verbs.h])
+                   CPPFLAGS=$CPPFLAGS_save
+                  ],
+                  [AC_MSG_CHECKING([whether hwloc configure succeeded])
+                   AC_MSG_RESULT([no])
+                   opal_hwloc_hwloc1110_support=no])
+        CFLAGS=$opal_hwloc_hwloc1110_save_cflags
+
+        # Restore some env variables, if necessary
+        AS_IF([test -n "$opal_hwloc_hwloc1110_save_cairo"],
+              [enable_cairo=$opal_hwloc_hwloc1110_save_cairo])
+        AS_IF([test -n "$opal_hwloc_hwloc1110_save_xml"],
+              [enable_xml=$opal_hwloc_hwloc1110_save_xml])
+        AS_IF([test -n "$opal_hwloc_hwloc1110_save_static"],
+              [enable_static=$opal_hwloc_hwloc1110_save_static])
+        AS_IF([test -n "$opal_hwloc_hwloc1110_save_shared"],
+              [enable_shared=$opal_hwloc_hwloc1110_save_shared])
+        AS_IF([test -n "$opal_hwloc_hwloc1110_save_plugins"],
+              [enable_plugins=$opal_hwloc_hwloc1110_save_shared])
+       
+        CPPFLAGS=$opal_hwloc_hwloc1110_save_CPPFLAGS
+        LDFLAGS=$opal_hwloc_hwloc1110_save_LDFLAGS
+        LIBS=$opal_hwloc_hwloc1110_save_LIBS
+
+        AC_SUBST([opal_hwloc_hwloc1110_CFLAGS])
+        AC_SUBST([opal_hwloc_hwloc1110_CPPFLAGS])
+        AC_SUBST([opal_hwloc_hwloc1110_LDFLAGS])
+        AC_SUBST([opal_hwloc_hwloc1110_LIBS])
+
+        # Finally, add some flags to the wrapper compiler so that our
+        # headers can be found.
+        hwloc_hwloc1110_WRAPPER_EXTRA_LDFLAGS="$HWLOC_EMBEDDED_LDFLAGS"
+        hwloc_hwloc1110_WRAPPER_EXTRA_LIBS="$HWLOC_EMBEDDED_LIBS"
+        hwloc_hwloc1110_WRAPPER_EXTRA_CPPFLAGS='-I${includedir}/openmpi/'"$opal_hwloc_hwloc1110_basedir/hwloc/include"
+    fi
+
+    # Done!
+    AS_IF([test "$opal_hwloc_hwloc1110_support" = "yes"],
+          [$1],
+          [$2])
+
+    OPAL_VAR_SCOPE_POP
+])dnl

opal/mca/hwloc/hwloc1110/hwloc/AUTHORS

@@ -0,0 +1,8 @@
+Cédric Augonnet <[email protected]>
+Jérôme Clet-Ortega <[email protected]>
+Ludovic Courtès <[email protected]>
+Brice Goglin <[email protected]>
+Nathalie Furmento <[email protected]>
+Samuel Thibault <[email protected]>
+Jeff Squyres <[email protected]>
+Alexey Kardashevskiy <[email protected]>

opal/mca/hwloc/hwloc1110/hwloc/COPYING

@@ -0,0 +1,28 @@
+Copyright © 2009 CNRS
+Copyright © 2009 inria.  All rights reserved.
+Copyright © 2009 Université Bordeaux
+Copyright © 2009 Cisco Systems, Inc.  All rights reserved.
+Copyright © 2012 Blue Brain Project, EPFL. All rights reserved.
+See COPYING in top-level directory.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.