Merge pull request #3263 from ggouaillardet/topic/hwloc1116

hwloc: update hwloc to 1.11.6

Author: Ralph Castain

opal/mca/hwloc/hwloc1113/Makefile.am renamed to opal/mca/hwloc/hwloc1116/Makefile.am

@@ -3,6 +3,8 @@
 # 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
@@ -28,16 +30,16 @@ EXTRA_DIST = \
 SUBDIRS = hwloc
 
 # Headers and sources
-headers = hwloc1113.h
-sources = hwloc1113_component.c
+headers = hwloc1116.h
+sources = hwloc1116_component.c
 
 # We only ever build this component statically
-noinst_LTLIBRARIES = libmca_hwloc_hwloc1113.la
-libmca_hwloc_hwloc1113_la_SOURCES = $(headers) $(sources)
-nodist_libmca_hwloc_hwloc1113_la_SOURCES = $(nodist_headers)
-libmca_hwloc_hwloc1113_la_LDFLAGS = -module -avoid-version $(opal_hwloc_hwloc1113_LDFLAGS)
-libmca_hwloc_hwloc1113_la_LIBADD = $(opal_hwloc_hwloc1113_LIBS)
-libmca_hwloc_hwloc1113_la_DEPENDENCIES = \
+noinst_LTLIBRARIES = libmca_hwloc_hwloc1116.la
+libmca_hwloc_hwloc1116_la_SOURCES = $(headers) $(sources)
+nodist_libmca_hwloc_hwloc1116_la_SOURCES = $(nodist_headers)
+libmca_hwloc_hwloc1116_la_LDFLAGS = -module -avoid-version $(opal_hwloc_hwloc1116_LDFLAGS)
+libmca_hwloc_hwloc1116_la_LIBADD = $(opal_hwloc_hwloc1116_LIBS)
+libmca_hwloc_hwloc1116_la_DEPENDENCIES = \
     $(HWLOC_top_builddir)/src/libhwloc_embedded.la
 
 # Since the rest of the code base includes the underlying hwloc.h, we

opal/mca/hwloc/hwloc1113/README-ompi.txt renamed to opal/mca/hwloc/hwloc1116/README-ompi.txt

@@ -17,41 +17,41 @@
 #
 # Priority
 #
-AC_DEFUN([MCA_opal_hwloc_hwloc1113_PRIORITY], [90])
+AC_DEFUN([MCA_opal_hwloc_hwloc1116_PRIORITY], [90])
 
 #
 # Force this component to compile in static-only mode
 #
-AC_DEFUN([MCA_opal_hwloc_hwloc1113_COMPILE_MODE], [
+AC_DEFUN([MCA_opal_hwloc_hwloc1116_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/hwloc1113/hwloc/config/hwloc.m4)
-m4_include(opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_pkg.m4)
-m4_include(opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_check_attributes.m4)
-m4_include(opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_check_visibility.m4)
-m4_include(opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_check_vendor.m4)
-m4_include(opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_components.m4)
-
-# MCA_hwloc_hwloc1113_POST_CONFIG()
+m4_include(opal/mca/hwloc/hwloc1116/hwloc/config/hwloc.m4)
+m4_include(opal/mca/hwloc/hwloc1116/hwloc/config/hwloc_pkg.m4)
+m4_include(opal/mca/hwloc/hwloc1116/hwloc/config/hwloc_check_attributes.m4)
+m4_include(opal/mca/hwloc/hwloc1116/hwloc/config/hwloc_check_visibility.m4)
+m4_include(opal/mca/hwloc/hwloc1116/hwloc/config/hwloc_check_vendor.m4)
+m4_include(opal/mca/hwloc/hwloc1116/hwloc/config/hwloc_components.m4)
+
+# MCA_hwloc_hwloc1116_POST_CONFIG()
 # ---------------------------------
-AC_DEFUN([MCA_opal_hwloc_hwloc1113_POST_CONFIG],[
-    OPAL_VAR_SCOPE_PUSH([opal_hwloc_hwloc1113_basedir])
+AC_DEFUN([MCA_opal_hwloc_hwloc1116_POST_CONFIG],[
+    OPAL_VAR_SCOPE_PUSH([opal_hwloc_hwloc1116_basedir])
 
     # If we won, then do all the rest of the setup
-    AS_IF([test "$1" = "1" && test "$opal_hwloc_hwloc1113_support" = "yes"],
+    AS_IF([test "$1" = "1" && test "$opal_hwloc_hwloc1116_support" = "yes"],
           [
            # Set this variable so that the framework m4 knows what
            # file to include in opal/mca/hwloc/hwloc-internal.h
-           opal_hwloc_hwloc1113_basedir=opal/mca/hwloc/hwloc1113
-           opal_hwloc_base_include="$opal_hwloc_hwloc1113_basedir/hwloc1113.h"
+           opal_hwloc_hwloc1116_basedir=opal/mca/hwloc/hwloc1116
+           opal_hwloc_base_include="$opal_hwloc_hwloc1116_basedir/hwloc1116.h"
 
            # Add some stuff to CPPFLAGS so that the rest of the source
            # tree can be built
-           file=$opal_hwloc_hwloc1113_basedir/hwloc
+           file=$opal_hwloc_hwloc1116_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"])
@@ -64,39 +64,39 @@ AC_DEFUN([MCA_opal_hwloc_hwloc1113_POST_CONFIG],[
 ])dnl
 
 
-# MCA_hwloc_hwloc1113_CONFIG([action-if-found], [action-if-not-found])
+# MCA_hwloc_hwloc1116_CONFIG([action-if-found], [action-if-not-found])
 # --------------------------------------------------------------------
-AC_DEFUN([MCA_opal_hwloc_hwloc1113_CONFIG],[
+AC_DEFUN([MCA_opal_hwloc_hwloc1116_CONFIG],[
     # Hwloc needs to know if we have Verbs support
     AC_REQUIRE([OPAL_CHECK_VERBS_DIR])
 
-    AC_CONFIG_FILES([opal/mca/hwloc/hwloc1113/Makefile])
+    AC_CONFIG_FILES([opal/mca/hwloc/hwloc1116/Makefile])
 
-    OPAL_VAR_SCOPE_PUSH([HWLOC_VERSION opal_hwloc_hwloc1113_save_CPPFLAGS opal_hwloc_hwloc1113_save_LDFLAGS opal_hwloc_hwloc1113_save_LIBS opal_hwloc_hwloc1113_save_cairo opal_hwloc_hwloc1113_save_xml opal_hwloc_hwloc1113_basedir opal_hwloc_hwloc1113_file opal_hwloc_hwloc1113_save_cflags CPPFLAGS_save LIBS_save opal_hwloc_external])
+    OPAL_VAR_SCOPE_PUSH([HWLOC_VERSION opal_hwloc_hwloc1116_save_CPPFLAGS opal_hwloc_hwloc1116_save_LDFLAGS opal_hwloc_hwloc1116_save_LIBS opal_hwloc_hwloc1116_save_cairo opal_hwloc_hwloc1116_save_xml opal_hwloc_hwloc1116_basedir opal_hwloc_hwloc1116_file opal_hwloc_hwloc1116_save_cflags CPPFLAGS_save LIBS_save opal_hwloc_external])
 
     # default to this component not providing support
-    opal_hwloc_hwloc1113_basedir=opal/mca/hwloc/hwloc1113
-    opal_hwloc_hwloc1113_support=no
+    opal_hwloc_hwloc1116_basedir=opal/mca/hwloc/hwloc1116
+    opal_hwloc_hwloc1116_support=no
 
     AS_IF([test "$with_hwloc" = "internal" || test -z "$with_hwloc" || test "$with_hwloc" = "yes"],
           [opal_hwloc_external="no"],
           [opal_hwloc_external="yes"])
 
-    opal_hwloc_hwloc1113_save_CPPFLAGS=$CPPFLAGS
-    opal_hwloc_hwloc1113_save_LDFLAGS=$LDFLAGS
-    opal_hwloc_hwloc1113_save_LIBS=$LIBS
+    opal_hwloc_hwloc1116_save_CPPFLAGS=$CPPFLAGS
+    opal_hwloc_hwloc1116_save_LDFLAGS=$LDFLAGS
+    opal_hwloc_hwloc1116_save_LIBS=$LIBS
 
     # 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"],
-          [HWLOC_SET_SYMBOL_PREFIX([opal_hwloc1113_])])
+          [HWLOC_SET_SYMBOL_PREFIX([opal_hwloc1116_])])
 
     # save XML or graphical options
-    opal_hwloc_hwloc1113_save_cairo=$enable_cairo
-    opal_hwloc_hwloc1113_save_xml=$enable_xml
-    opal_hwloc_hwloc1113_save_static=$enable_static
-    opal_hwloc_hwloc1113_save_shared=$enable_shared
-    opal_hwloc_hwloc1113_save_plugins=$enable_plugins
+    opal_hwloc_hwloc1116_save_cairo=$enable_cairo
+    opal_hwloc_hwloc1116_save_xml=$enable_xml
+    opal_hwloc_hwloc1116_save_static=$enable_static
+    opal_hwloc_hwloc1116_save_shared=$enable_shared
+    opal_hwloc_hwloc1116_save_plugins=$enable_plugins
 
     # never enable hwloc's graphical option
     enable_cairo=no
@@ -113,19 +113,19 @@ AC_DEFUN([MCA_opal_hwloc_hwloc1113_CONFIG],[
 
     # hwloc checks for compiler visibility, and its needs to do
     # this without "picky" flags.
-    opal_hwloc_hwloc1113_save_cflags=$CFLAGS
+    opal_hwloc_hwloc1116_save_cflags=$CFLAGS
     CFLAGS=$OPAL_CFLAGS_BEFORE_PICKY
-    HWLOC_SETUP_CORE([opal/mca/hwloc/hwloc1113/hwloc],
+    HWLOC_SETUP_CORE([opal/mca/hwloc/hwloc1116/hwloc],
               [AC_MSG_CHECKING([whether hwloc configure succeeded])
                AC_MSG_RESULT([yes])
-               HWLOC_VERSION="internal v`$srcdir/$opal_hwloc_hwloc1113_basedir/hwloc/config/hwloc_get_version.sh $srcdir/$opal_hwloc_hwloc1113_basedir/hwloc/VERSION`"
+               HWLOC_VERSION="internal v`$srcdir/$opal_hwloc_hwloc1116_basedir/hwloc/config/hwloc_get_version.sh $srcdir/$opal_hwloc_hwloc1116_basedir/hwloc/VERSION`"
 
                # Build flags for our Makefile.am
-               opal_hwloc_hwloc1113_LDFLAGS='$(HWLOC_EMBEDDED_LDFLAGS)'
-               opal_hwloc_hwloc1113_LIBS='$(OPAL_TOP_BUILDDIR)/'"$opal_hwloc_hwloc1113_basedir"'/hwloc/src/libhwloc_embedded.la $(HWLOC_EMBEDDED_LIBS)'
-               opal_hwloc_hwloc1113_support=yes
+               opal_hwloc_hwloc1116_LDFLAGS='$(HWLOC_EMBEDDED_LDFLAGS)'
+               opal_hwloc_hwloc1116_LIBS='$(OPAL_TOP_BUILDDIR)/'"$opal_hwloc_hwloc1116_basedir"'/hwloc/src/libhwloc_embedded.la $(HWLOC_EMBEDDED_LIBS)'
+               opal_hwloc_hwloc1116_support=yes
 
-               AC_DEFINE_UNQUOTED([HWLOC_HWLOC1113_HWLOC_VERSION],
+               AC_DEFINE_UNQUOTED([HWLOC_HWLOC1116_HWLOC_VERSION],
                    ["$HWLOC_VERSION"],
                    [Version of hwloc])
 
@@ -138,35 +138,35 @@ AC_DEFUN([MCA_opal_hwloc_hwloc1113_CONFIG],[
               ],
               [AC_MSG_CHECKING([whether hwloc configure succeeded])
                AC_MSG_RESULT([no])
-               opal_hwloc_hwloc1113_support=no])
-    CFLAGS=$opal_hwloc_hwloc1113_save_cflags
+               opal_hwloc_hwloc1116_support=no])
+    CFLAGS=$opal_hwloc_hwloc1116_save_cflags
 
     # Restore some env variables, if necessary
-    AS_IF([test -n "$opal_hwloc_hwloc1113_save_cairo"],
-          [enable_cairo=$opal_hwloc_hwloc1113_save_cairo])
-    AS_IF([test -n "$opal_hwloc_hwloc1113_save_xml"],
-          [enable_xml=$opal_hwloc_hwloc1113_save_xml])
-    AS_IF([test -n "$opal_hwloc_hwloc1113_save_static"],
-          [enable_static=$opal_hwloc_hwloc1113_save_static])
-    AS_IF([test -n "$opal_hwloc_hwloc1113_save_shared"],
-          [enable_shared=$opal_hwloc_hwloc1113_save_shared])
-    AS_IF([test -n "$opal_hwloc_hwloc1113_save_plugins"],
-          [enable_plugins=$opal_hwloc_hwloc1113_save_shared])
-
-    CPPFLAGS=$opal_hwloc_hwloc1113_save_CPPFLAGS
-    LDFLAGS=$opal_hwloc_hwloc1113_save_LDFLAGS
-    LIBS=$opal_hwloc_hwloc1113_save_LIBS
-
-    AC_SUBST([opal_hwloc_hwloc1113_CFLAGS])
-    AC_SUBST([opal_hwloc_hwloc1113_CPPFLAGS])
-    AC_SUBST([opal_hwloc_hwloc1113_LDFLAGS])
-    AC_SUBST([opal_hwloc_hwloc1113_LIBS])
+    AS_IF([test -n "$opal_hwloc_hwloc1116_save_cairo"],
+          [enable_cairo=$opal_hwloc_hwloc1116_save_cairo])
+    AS_IF([test -n "$opal_hwloc_hwloc1116_save_xml"],
+          [enable_xml=$opal_hwloc_hwloc1116_save_xml])
+    AS_IF([test -n "$opal_hwloc_hwloc1116_save_static"],
+          [enable_static=$opal_hwloc_hwloc1116_save_static])
+    AS_IF([test -n "$opal_hwloc_hwloc1116_save_shared"],
+          [enable_shared=$opal_hwloc_hwloc1116_save_shared])
+    AS_IF([test -n "$opal_hwloc_hwloc1116_save_plugins"],
+          [enable_plugins=$opal_hwloc_hwloc1116_save_shared])
+
+    CPPFLAGS=$opal_hwloc_hwloc1116_save_CPPFLAGS
+    LDFLAGS=$opal_hwloc_hwloc1116_save_LDFLAGS
+    LIBS=$opal_hwloc_hwloc1116_save_LIBS
+
+    AC_SUBST([opal_hwloc_hwloc1116_CFLAGS])
+    AC_SUBST([opal_hwloc_hwloc1116_CPPFLAGS])
+    AC_SUBST([opal_hwloc_hwloc1116_LDFLAGS])
+    AC_SUBST([opal_hwloc_hwloc1116_LIBS])
 
     # Finally, add some flags to the wrapper compiler so that our
     # headers can be found.
-    hwloc_hwloc1113_WRAPPER_EXTRA_LDFLAGS="$HWLOC_EMBEDDED_LDFLAGS"
-    hwloc_hwloc1113_WRAPPER_EXTRA_LIBS="$HWLOC_EMBEDDED_LIBS"
-    hwloc_hwloc1113_WRAPPER_EXTRA_CPPFLAGS='-I${pkgincludedir}/'"$opal_hwloc_hwloc1113_basedir/hwloc/include"
+    hwloc_hwloc1116_WRAPPER_EXTRA_LDFLAGS="$HWLOC_EMBEDDED_LDFLAGS"
+    hwloc_hwloc1116_WRAPPER_EXTRA_LIBS="$HWLOC_EMBEDDED_LIBS"
+    hwloc_hwloc1116_WRAPPER_EXTRA_CPPFLAGS='-I${pkgincludedir}/'"$opal_hwloc_hwloc1116_basedir/hwloc/include"
 
     # If we are not building the internal hwloc, then indicate that
     # this component should not be built.  NOTE: we still did all the
@@ -176,12 +176,12 @@ AC_DEFUN([MCA_opal_hwloc_hwloc1113_CONFIG],[
     # distclean" infrastructure to work properly).
     AS_IF([test "$opal_hwloc_external" = "yes"],
           [AC_MSG_WARN([using an external hwloc; disqualifying this component])
-           opal_hwloc_hwloc1113_support=no],
+           opal_hwloc_hwloc1116_support=no],
           [AC_DEFINE([HAVE_DECL_HWLOC_OBJ_OSDEV_COPROC], [1])
            AC_DEFINE([HAVE_HWLOC_TOPOLOGY_DUP], [1])])
 
     # Done!
-    AS_IF([test "$opal_hwloc_hwloc1113_support" = "yes"],
+    AS_IF([test "$opal_hwloc_hwloc1116_support" = "yes"],
           [$1],
           [$2])
 

opal/mca/hwloc/hwloc1113/configure.m4 renamed to opal/mca/hwloc/hwloc1116/configure.m4

@@ -9,7 +9,7 @@ ACLOCAL_AMFLAGS = -I ./config
 
 SUBDIRS = src include
 if HWLOC_BUILD_STANDALONE
-SUBDIRS += tests utils contrib/systemd
+SUBDIRS += utils tests contrib/systemd
 # 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

opal/mca/hwloc/hwloc1113/hwloc/AUTHORS renamed to opal/mca/hwloc/hwloc1116/hwloc/AUTHORS

@@ -1,5 +1,5 @@
 Copyright © 2009 CNRS
-Copyright © 2009-2016 Inria.  All rights reserved.
+Copyright © 2009-2017 Inria.  All rights reserved.
 Copyright © 2009-2013 Université Bordeaux
 Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
 
@@ -17,10 +17,51 @@ bug fixes (and other actions) for each version of hwloc since version
 in v0.9.1).
 
 
+Version 1.11.6
+--------------
+* Make the Linux discovery about twice faster, especially on the CPU side,
+  by trying to avoid sysfs file accesses as much as possible.
+* Add support for AMD Family 17h processors (Zen) SMT cores in the Linux
+  and x86 backends.
+* Add the HWLOC_TOPOLOGY_FLAG_THISSYSTEM_ALLOWED_RESOURCES flag (and the
+  HWLOC_THISSYSTEM_ALLOWED_RESOURCES environment variable) for reading the
+  set of allowed resources from the local operating system even if the
+  topology was loaded from XML or synthetic.
+* Fix hwloc_bitmap_set/clr_range() for infinite ranges that do not
+  overlap currently defined ranges in the bitmap.
+* Don't reset the lstopo zoom scale when moving the X11 window.
+* lstopo now has --flags for manually setting topology flags.
+* hwloc_get_depth_type() returns HWLOC_TYPE_DEPTH_UNKNOWN for Misc objects.
+
+
+Version 1.11.5
+--------------
+* Add support for Knights Mill Xeon Phi, thanks to Piotr Luc for the patch.
+* Reenable distance gathering on Solaris, disabled by mistake since v1.0.
+  Thanks to TU Wien for the help.
+* Fix hwloc_get_*obj*_inside_cpuset() functions to ignore objects with
+  empty CPU sets, for instance, CPU-less NUMA nodes such as KNL MCDRAM.
+  Thanks to Nicolas Denoyelle for the report.
+* Fix XML import of multiple distance matrices.
+* Add a FAQ entry about "hwloc is only a structural model, it ignores
+  performance models, memory bandwidth, etc.?"
+
+
 Version 1.11.4
 --------------
+* Add MemoryMode and ClusterMode attributes in the Machine object on KNL.
+  Add doc/examples/get-knl-modes.c for an example of retrieving them.
+  Thanks to Grzegorz Andrejczuk.
 * Fix Linux build with -m32 with respect to libudev.
   Thanks to Paul Hargrove for reporting the issue.
+* Fix build with Visual Studio 2015, thanks to Eloi Gaudry for reporting
+  the issue and providing the patch.
+* Don't forget to display OS device children in the graphical lstopo.
+* Fix a memory leak on Solaris, thanks to Bryon Gloden for the patch.
+* Properly handle realloc() failures, thanks to Bryon Gloden for reporting
+  the issue.
+* Fix lstopo crash in ascii/fig/windows outputs when some objects have a
+  lstopoStyle info attribute.
 
 
 Version 1.11.3

opal/mca/hwloc/hwloc1113/hwloc/COPYING renamed to opal/mca/hwloc/hwloc1116/hwloc/COPYING

@@ -13,20 +13,11 @@ hwloc primarily aims at helping high-performance computing (HPC) applications,
 but is also applicable to any project seeking to exploit code and/or data
 locality on modern computing platforms.
 
-Note that the hwloc project represents the merger of the libtopology project
-from inria and the Portable Linux Processor Affinity (PLPA) sub-project from
-Open MPI. Both of these prior projects are now deprecated. The first hwloc
-release was essentially a "re-branding" of the libtopology code base, but with
-both a few genuinely new features and a few PLPA-like features added in. Prior
-releases of hwloc included documentation about switching from PLPA to hwloc;
-this documentation has been dropped on the assumption that everyone who was
-using PLPA has already switched to hwloc.
-
 hwloc supports the following operating systems:
 
   * Linux (including old kernels not having sysfs topology information, with
- knowledge of cpusets, offline CPUs, ScaleMP vSMP and Kerrighed support) on
- all supported hardware, including Intel Xeon Phi (KNL and KNC, either
+ knowledge of cpusets, ScaleMP vSMP and Kerrighed support, etc.) on all
+ supported hardware, including Intel Xeon Phi (KNL and KNC, either
  standalone or as a coprocessor) and NumaScale NumaConnect.
   * Solaris
   * AIX
@@ -55,14 +46,15 @@ no topology information is available.
 For development and debugging purposes, hwloc also offers the ability to work
 on "fake" topologies:
 
-  * Symmetrical tree of resources generated from a list of level arities
-  * Remote machine simulation through the gathering of Linux sysfs topology
- files
+  * Symmetrical tree of resources generated from a list of level arities, see
+ Synthetic topologies.
+  * Remote machine simulation through the gathering of topology as XML files,
+ see Importing and exporting topologies from/to XML files.
 
 hwloc can display the topology in a human-readable format, either in graphical
 mode (X11), or by exporting in one of several different formats, including:
-plain text, PDF, PNG, and FIG (see CLI Examples below). Note that some of the
-export formats require additional support libraries.
+plain text, PDF, PNG, and FIG (see Command-line Examples below). Note that some
+of the export formats require additional support libraries.
 
 hwloc offers a programming interface for manipulating topologies and objects.
 It also brings a powerful CPU bitmap API that is used to describe topology

opal/mca/hwloc/hwloc1113/hwloc/Makefile.am renamed to opal/mca/hwloc/hwloc1116/hwloc/Makefile.am

@@ -9,7 +9,7 @@
 
 major=1
 minor=11
-release=3
+release=6
 
 # greek is used for alpha or beta release tags.  If it is non-empty,
 # it will be appended to the version number.  It does not have to be
@@ -22,7 +22,7 @@ greek=
 
 # The date when this release was created
 
-date="Apr 26, 2016"
+date="Feb 23, 2017"
 
 # If snapshot=1, then use the value from snapshot_version as the
 # entire hwloc version (i.e., ignore major, minor, release, and
@@ -41,6 +41,6 @@ snapshot_version=${major}.${minor}.${release}${greek}-git
 # 2. Version numbers are described in the Libtool current:revision:age
 # format.
 
-libhwloc_so_version=12:0:7
+libhwloc_so_version=12:3:7
 
 # Please also update the <TargetName> lines in contrib/windows/libhwloc.vcxproj