hwloc: add hwloc2x

internal hwloc 2x is used with --with-hwloc=future

Signed-off-by: Gilles Gouaillardet <[email protected]>

opal/mca/hwloc/external/configure.m4

@@ -103,7 +103,8 @@ AC_DEFUN([MCA_opal_hwloc_external_CONFIG],[
     AS_IF([test "$with_hwloc" = "external"], [opal_hwloc_external_want=yes])
     AS_IF([test "$with_hwloc" != "" && \
            test "$with_hwloc" != "no" && \
-           test "$with_hwloc" != "internal"], [opal_hwloc_external_want=yes])
+           test "$with_hwloc" != "internal" && \
+           test "$with_hwloc" != "future"], [opal_hwloc_external_want=yes])
     AS_IF([test "$with_hwloc" = "no"], [opal_hwloc_external_want=no])
 
     # If we still want external support, try it

opal/mca/hwloc/hwloc1116/configure.m4

@@ -88,7 +88,8 @@ AC_DEFUN([MCA_opal_hwloc_hwloc1116_CONFIG],[
 
     # Run the hwloc configuration - if no external hwloc, then set the prefixi
     # to minimize the chance that someone will use the internal symbols
-    AS_IF([test "$opal_hwloc_external" = "no"],
+    AS_IF([test "$opal_hwloc_external" = "no" &&
+           test "$with_hwloc" != "future"],
           [HWLOC_SET_SYMBOL_PREFIX([opal_hwloc1116_])])
 
     # save XML or graphical options

opal/mca/hwloc/hwloc2x/Makefile.am

@@ -0,0 +1,39 @@
+#
+# Copyright (c) 2011-2016 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2014-2015 Intel, Inc. All right reserved.
+# Copyright (c) 2016      Los Alamos National Security, LLC. All rights
+#                         reserved.
+# Copyright (c) 2017      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+EXTRA_DIST = autogen.subdirs
+
+SUBDIRS = hwloc
+DIST_SUBDIRS=hwloc
+
+# Headers and sources
+headers = hwloc2x.h
+sources = hwloc2x_component.c
+
+libs = hwloc/hwloc/libhwloc_embedded.la
+
+# We only ever build this component statically
+noinst_LTLIBRARIES = libmca_hwloc_hwloc2x.la
+libmca_hwloc_hwloc2x_la_SOURCES = $(headers) $(sources)
+nodist_libmca_hwloc_hwloc2x_la_SOURCES = $(nodist_headers)
+libmca_hwloc_hwloc2x_la_LDFLAGS = -module -avoid-version
+libmca_hwloc_hwloc2x_la_LIBADD = $(libs)
+libmca_hwloc_hwloc2x_la_DEPENDENCIES = $(libs)
+
+# 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/hwloc2x/autogen.subdirs

@@ -0,0 +1 @@
+hwloc

opal/mca/hwloc/hwloc2x/configure.m4

@@ -0,0 +1,111 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2009-2017 Cisco Systems, Inc.  All rights reserved
+# Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
+# Copyright (c) 2015-2017 Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2016      Los Alamos National Security, LLC. All rights
+#                         reserved.
+#
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+#
+# Priority
+#
+AC_DEFUN([MCA_opal_hwloc_hwloc2x_PRIORITY], [90])
+
+#
+# Force this component to compile in static-only mode
+#
+AC_DEFUN([MCA_opal_hwloc_hwloc2x_COMPILE_MODE], [
+    AC_MSG_CHECKING([for MCA component $2:$3 compile mode])
+    $4="static"
+    AC_MSG_RESULT([$$4])
+])
+
+# MCA_hwloc_hwloc2x_POST_CONFIG()
+# ---------------------------------
+AC_DEFUN([MCA_opal_hwloc_hwloc2x_POST_CONFIG],[
+    OPAL_VAR_SCOPE_PUSH([opal_hwloc_hwloc2x_basedir])
+
+    # If we won, then do all the rest of the setup
+    AS_IF([test "$1" = "1" && test "$opal_hwloc_hwloc2x_support" = "yes"],
+          [
+           # Set this variable so that the framework m4 knows what
+           # file to include in opal/mca/hwloc/hwloc-internal.h
+           opal_hwloc_hwloc2x_basedir=opal/mca/hwloc/hwloc2x
+           opal_hwloc_base_include="$opal_hwloc_hwloc2x_basedir/hwloc2x.h"
+
+           # Add some stuff to CPPFLAGS so that the rest of the source
+           # tree can be built
+           file=$opal_hwloc_hwloc2x_basedir/hwloc
+           CPPFLAGS="-I$OPAL_TOP_SRCDIR/$file/include $CPPFLAGS"
+           AS_IF([test "$OPAL_TOP_BUILDDIR" != "$OPAL_TOP_SRCDIR"],
+                 [CPPFLAGS="-I$OPAL_TOP_BUILDDIR/$file/include $CPPFLAGS"])
+           unset file
+          ])
+    OPAL_VAR_SCOPE_POP
+])dnl
+
+
+# MCA_hwloc_hwloc2x_CONFIG([action-if-found], [action-if-not-found])
+# --------------------------------------------------------------------
+AC_DEFUN([MCA_opal_hwloc_hwloc2x_CONFIG],[
+    # Hwloc needs to know if we have Verbs support
+    AC_REQUIRE([OPAL_CHECK_VERBS_DIR])
+
+    AC_CONFIG_FILES([opal/mca/hwloc/hwloc2x/Makefile])
+
+    OPAL_VAR_SCOPE_PUSH([HWLOC_VERSION opal_hwloc_hwloc2x_flags opal_hwloc_hwloc2x_save_CPPFLAGS opal_hwloc_hwloc2x_basedir opal_hwloc_hwloc2x_file opal_hwloc_future])
+
+    # default to this component not providing support
+    opal_hwloc_hwloc2x_basedir=opal/mca/hwloc/hwloc2x
+    opal_hwloc_hwloc2x_support=no
+
+    AS_IF([test "$with_hwloc" = "future"],
+          [opal_hwloc_future="yes"],
+          [opal_hwloc_future="no"])
+
+    opal_hwloc_hwloc2x_save_CPPFLAGS=$CPPFLAGS
+
+    # Run the hwloc configuration - if no external hwloc, then set the prefixi
+    # to minimize the chance that someone will use the internal symbols
+
+    opal_hwloc_hwloc2x_flags="--enable-embedded-mode --with-hwloc-symbol-prefix=opal_hwloc2x_ --disable-cairo --disable-pugins --enable-static --enable-xml"
+    AS_IF([test "$opal_check_cuda_happy" = "yes"],
+          [CPPFLAGS="$CPPFLAGS $opal_datatype_cuda_CPPFLAGS",
+           opal_hwloc_hwloc2x_flags="$opal_hwloc_hwloc2x_flags --enable-nvml CPPFLAGS=\"$CPPFLAGS\""]
+          [opal_hwloc_hwloc2x_flags="$opal_hwloc_hwloc2x_flags --disable-nvml"])
+
+    OPAL_CONFIG_SUBDIR([opal/mca/hwloc/hwloc2x/hwloc],
+                       [$opal_hwloc_hwloc2x_flags],
+                       [opal_hwloc_hwloc2x_support="yes"],
+                       [opal_hwloc_hwloc2x_support="no"])
+
+    CPPFLAGS=$opal_hwloc_hwloc2x_save_CPPFLAGS
+
+    # If we are not building the internal hwloc, then indicate that
+    # this component should not be built.  NOTE: we still did all the
+    # above configury so that all the proper GNU Autotools
+    # infrastructure is setup properly (e.g., w.r.t. SUBDIRS=hwloc in
+    # this directory's Makefile.am, we still need the Autotools "make
+    # distclean" infrastructure to work properly).
+    AS_IF([test "$opal_hwloc_future" != "yes"],
+          [AC_MSG_WARN([not using future hwloc; disqualifying this component])
+           opal_hwloc_hwloc2x_support=no])
+
+    # Done!
+    AS_IF([test "$opal_hwloc_hwloc2x_support" = "yes"],
+          [AC_DEFINE_UNQUOTED([HWLOC_SYM_PREFIX],[opal_hwloc2x_])
+           AC_DEFINE_UNQUOTED([HWLOC_SYM_PREFIX_CAPS], [OPAL_HWLOC2X_])
+           AC_DEFINE_UNQUOTED([HWLOC_SYM_TRANSFORM], [1])
+           $1],
+          [$2])
+
+    OPAL_VAR_SCOPE_POP
+])dnl

opal/mca/hwloc/hwloc2x/hwloc/AUTHORS

@@ -0,0 +1,29 @@
+netloc Authors
+==============
+
+The following cumulative list contains the names of most individuals who
+have committed code to the hwloc repository.
+
+Name                         Affiliation(s)
+---------------------------  --------------------
+Cédric Augonnet              University of Bordeaux
+Guillaume Beauchamp          Inria
+Ahmad Boissetri Binzagr      Inria
+Cyril Bordage                Inria
+Nicholas Buroker             UWL
+Jérôme Clet-Ortega           University of Bordeaux
+Ludovic Courtès              Inria
+Nathalie Furmento            CNRS
+Brice Goglin                 Inria
+Joshua Hursey                UWL
+Alexey Kardashevskiy         IBM
+Douglas MacFarland           UWL
+Antoine Rougier              intern from University of Bordeaux
+Jeff Squyres                 Cisco
+Samuel Thibault              University of Bordeaux
+
+Affiliaion abbreviations:
+-------------------------
+Cisco = Cisco Systems, Inc.
+CNRS = Centre national de la recherche scientifique (France)
+UWL = University of Wisconsin-La Crosse

opal/mca/hwloc/hwloc2x/hwloc/COPYING

@@ -0,0 +1,39 @@
+Copyright © 2004-2006 The Trustees of Indiana University and Indiana University Research and Technology Corporation.  All rights reserved.
+Copyright © 2004-2005 The University of Tennessee and The University of Tennessee Research Foundation.  All rights reserved.
+Copyright © 2004-2005 High Performance Computing Center Stuttgart, University of Stuttgart.  All rights reserved.
+Copyright © 2004-2005 The Regents of the University of California. All rights reserved.
+Copyright © 2009      CNRS
+Copyright © 2009-2016 Inria.  All rights reserved.
+Copyright © 2009-2015 Université Bordeaux
+Copyright © 2009-2015 Cisco Systems, Inc.  All rights reserved.
+Copyright © 2009-2012 Oracle and/or its affiliates.  All rights reserved.
+Copyright © 2010      IBM
+Copyright © 2010      Jirka Hladky
+Copyright © 2012      Aleksej Saushev, The NetBSD Foundation
+Copyright © 2012      Blue Brain Project, EPFL. All rights reserved.
+Copyright © 2013-2014 University of Wisconsin-La Crosse. All rights reserved.
+Copyright © 2015      Research Organization for Information Science and Technology (RIST). All rights reserved.
+Copyright © 2015-2016 Intel, Inc.  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.

opal/mca/hwloc/hwloc2x/hwloc/Makefile.am

@@ -0,0 +1,94 @@
+# Copyright © 2009-2016 Inria.  All rights reserved.
+# Copyright © 2009      Université Bordeaux
+# Copyright © 2009-2014 Cisco Systems, Inc.  All rights reserved.
+# See COPYING in top-level directory.
+
+# Note that the -I directory must *exactly* match what was specified
+# via AC_CONFIG_MACRO_DIR in configure.ac.
+ACLOCAL_AMFLAGS = -I ./config
+
+#
+# "make distcheck" requires that tarballs are able to be able to "make
+# dist", so we have to include config/distscript.sh.
+#
+EXTRA_DIST = \
+        README VERSION COPYING AUTHORS \
+        config/hwloc_get_version.sh \
+        config/distscript.sh config/distscript_embedded.sh \
+        autogen.sh
+
+SUBDIRS = include hwloc
+
+if BUILD_NETLOC
+SUBDIRS += netloc
+endif
+
+if HWLOC_BUILD_STANDALONE
+SUBDIRS += utils tests contrib/systemd contrib/misc
+# We need doc/ if HWLOC_BUILD_DOXYGEN, or during make install if HWLOC_INSTALL_DOXYGEN.
+# There's no INSTALL_SUBDIRS, so always enter doc/ and check HWLOC_BUILD/INSTALL_DOXYGEN there
+SUBDIRS += doc
+else
+EXTRA_DIST += utils/netloc/infiniband/netloc_ib_gather_raw.in
+dist-hook:
+	sh "$(top_srcdir)/config/distscript_embedded.sh" "$(top_srcdir)" "$(distdir)" "$(HWLOC_VERSION)"
+endif
+
+# Do not let automake automatically add the non-standalone dirs to the
+# distribution tarball if we're building in embedded mode.
+DIST_SUBDIRS = $(SUBDIRS)
+
+# Only install the pkg file if we're building in standalone mode (and not on Windows)
+if HWLOC_BUILD_STANDALONE
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = hwloc.pc
+if BUILD_NETLOC
+# JMS Need to compare hwloc.pc and netloc.pc -- I think netloc.pc is
+# missing some things.
+# pkgconfig_DATA += netloc.pc Disabled until the netloc API is public
+EXTRA_DIST += netloc.pc
+if BUILD_NETLOCSCOTCH
+pkgconfig_DATA += netlocscotch.pc
+endif BUILD_NETLOCSCOTCH
+endif BUILD_NETLOC
+endif HWLOC_BUILD_STANDALONE
+
+# Only install the valgrind suppressions file if we're building in
+# standalone mode
+if HWLOC_BUILD_STANDALONE
+dist_pkgdata_DATA = contrib/hwloc-valgrind.supp
+endif
+
+# Only install entire visual studio subdirectory if we're building in
+# standalone mode
+if HWLOC_BUILD_STANDALONE
+EXTRA_DIST += contrib/windows
+endif
+
+if HWLOC_BUILD_STANDALONE
+dist-hook:
+	sh "$(top_srcdir)/config/distscript.sh" "$(top_srcdir)" "$(distdir)" "$(HWLOC_VERSION)"
+endif HWLOC_BUILD_STANDALONE
+
+if HWLOC_BUILD_STANDALONE
+if HWLOC_HAVE_WINDOWS
+#
+# Winball specific rules
+#
+install-data-local:
+	sed -e 's/$$/'$$'\015'/ < $(srcdir)/README > $(DESTDIR)$(prefix)/README.txt
+	sed -e 's/$$/'$$'\015'/ < $(srcdir)/NEWS > $(DESTDIR)$(prefix)/NEWS.txt
+	sed -e 's/$$/'$$'\015'/ < $(srcdir)/COPYING > $(DESTDIR)$(prefix)/COPYING.txt
+uninstall-local:
+	rm -f $(DESTDIR)$(prefix)/README.txt $(DESTDIR)$(prefix)/NEWS.txt $(DESTDIR)$(prefix)/COPYING.txt
+endif HWLOC_HAVE_WINDOWS
+endif HWLOC_BUILD_STANDALONE
+
+#
+# Build the documenation and top-level README file
+#
+if HWLOC_BUILD_STANDALONE
+.PHONY: doc readme
+doc readme:
+	$(MAKE) -C doc
+endif HWLOC_BUILD_STANDALONE