Skip to content

Commit 81062b7

Browse files
committed
hwloc: update hwloc to 1.11.6
Signed-off-by: Gilles Gouaillardet <[email protected]>
1 parent 7e57075 commit 81062b7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+1738
-1193
lines changed

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# Copyright (c) 2014-2015 Intel, Inc. All right reserved.
44
# Copyright (c) 2016 Los Alamos National Security, LLC. All rights
55
# reserved.
6+
# Copyright (c) 2017 Research Organization for Information Science
7+
# and Technology (RIST). All rights reserved.
68
# $COPYRIGHT$
79
#
810
# Additional copyrights may follow
@@ -28,16 +30,16 @@ EXTRA_DIST = \
2830
SUBDIRS = hwloc
2931

3032
# Headers and sources
31-
headers = hwloc1113.h
32-
sources = hwloc1113_component.c
33+
headers = hwloc1116.h
34+
sources = hwloc1116_component.c
3335

3436
# We only ever build this component statically
35-
noinst_LTLIBRARIES = libmca_hwloc_hwloc1113.la
36-
libmca_hwloc_hwloc1113_la_SOURCES = $(headers) $(sources)
37-
nodist_libmca_hwloc_hwloc1113_la_SOURCES = $(nodist_headers)
38-
libmca_hwloc_hwloc1113_la_LDFLAGS = -module -avoid-version $(opal_hwloc_hwloc1113_LDFLAGS)
39-
libmca_hwloc_hwloc1113_la_LIBADD = $(opal_hwloc_hwloc1113_LIBS)
40-
libmca_hwloc_hwloc1113_la_DEPENDENCIES = \
37+
noinst_LTLIBRARIES = libmca_hwloc_hwloc1116.la
38+
libmca_hwloc_hwloc1116_la_SOURCES = $(headers) $(sources)
39+
nodist_libmca_hwloc_hwloc1116_la_SOURCES = $(nodist_headers)
40+
libmca_hwloc_hwloc1116_la_LDFLAGS = -module -avoid-version $(opal_hwloc_hwloc1116_LDFLAGS)
41+
libmca_hwloc_hwloc1116_la_LIBADD = $(opal_hwloc_hwloc1116_LIBS)
42+
libmca_hwloc_hwloc1116_la_DEPENDENCIES = \
4143
$(HWLOC_top_builddir)/src/libhwloc_embedded.la
4244

4345
# Since the rest of the code base includes the underlying hwloc.h, we

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

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -17,41 +17,41 @@
1717
#
1818
# Priority
1919
#
20-
AC_DEFUN([MCA_opal_hwloc_hwloc1113_PRIORITY], [90])
20+
AC_DEFUN([MCA_opal_hwloc_hwloc1116_PRIORITY], [90])
2121

2222
#
2323
# Force this component to compile in static-only mode
2424
#
25-
AC_DEFUN([MCA_opal_hwloc_hwloc1113_COMPILE_MODE], [
25+
AC_DEFUN([MCA_opal_hwloc_hwloc1116_COMPILE_MODE], [
2626
AC_MSG_CHECKING([for MCA component $2:$3 compile mode])
2727
$4="static"
2828
AC_MSG_RESULT([$$4])
2929
])
3030

3131
# Include hwloc m4 files
32-
m4_include(opal/mca/hwloc/hwloc1113/hwloc/config/hwloc.m4)
33-
m4_include(opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_pkg.m4)
34-
m4_include(opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_check_attributes.m4)
35-
m4_include(opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_check_visibility.m4)
36-
m4_include(opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_check_vendor.m4)
37-
m4_include(opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_components.m4)
38-
39-
# MCA_hwloc_hwloc1113_POST_CONFIG()
32+
m4_include(opal/mca/hwloc/hwloc1116/hwloc/config/hwloc.m4)
33+
m4_include(opal/mca/hwloc/hwloc1116/hwloc/config/hwloc_pkg.m4)
34+
m4_include(opal/mca/hwloc/hwloc1116/hwloc/config/hwloc_check_attributes.m4)
35+
m4_include(opal/mca/hwloc/hwloc1116/hwloc/config/hwloc_check_visibility.m4)
36+
m4_include(opal/mca/hwloc/hwloc1116/hwloc/config/hwloc_check_vendor.m4)
37+
m4_include(opal/mca/hwloc/hwloc1116/hwloc/config/hwloc_components.m4)
38+
39+
# MCA_hwloc_hwloc1116_POST_CONFIG()
4040
# ---------------------------------
41-
AC_DEFUN([MCA_opal_hwloc_hwloc1113_POST_CONFIG],[
42-
OPAL_VAR_SCOPE_PUSH([opal_hwloc_hwloc1113_basedir])
41+
AC_DEFUN([MCA_opal_hwloc_hwloc1116_POST_CONFIG],[
42+
OPAL_VAR_SCOPE_PUSH([opal_hwloc_hwloc1116_basedir])
4343

4444
# If we won, then do all the rest of the setup
45-
AS_IF([test "$1" = "1" && test "$opal_hwloc_hwloc1113_support" = "yes"],
45+
AS_IF([test "$1" = "1" && test "$opal_hwloc_hwloc1116_support" = "yes"],
4646
[
4747
# Set this variable so that the framework m4 knows what
4848
# file to include in opal/mca/hwloc/hwloc-internal.h
49-
opal_hwloc_hwloc1113_basedir=opal/mca/hwloc/hwloc1113
50-
opal_hwloc_base_include="$opal_hwloc_hwloc1113_basedir/hwloc1113.h"
49+
opal_hwloc_hwloc1116_basedir=opal/mca/hwloc/hwloc1116
50+
opal_hwloc_base_include="$opal_hwloc_hwloc1116_basedir/hwloc1116.h"
5151

5252
# Add some stuff to CPPFLAGS so that the rest of the source
5353
# tree can be built
54-
file=$opal_hwloc_hwloc1113_basedir/hwloc
54+
file=$opal_hwloc_hwloc1116_basedir/hwloc
5555
CPPFLAGS="-I$OPAL_TOP_SRCDIR/$file/include $CPPFLAGS"
5656
AS_IF([test "$OPAL_TOP_BUILDDIR" != "$OPAL_TOP_SRCDIR"],
5757
[CPPFLAGS="-I$OPAL_TOP_BUILDDIR/$file/include $CPPFLAGS"])
@@ -64,39 +64,39 @@ AC_DEFUN([MCA_opal_hwloc_hwloc1113_POST_CONFIG],[
6464
])dnl
6565

6666

67-
# MCA_hwloc_hwloc1113_CONFIG([action-if-found], [action-if-not-found])
67+
# MCA_hwloc_hwloc1116_CONFIG([action-if-found], [action-if-not-found])
6868
# --------------------------------------------------------------------
69-
AC_DEFUN([MCA_opal_hwloc_hwloc1113_CONFIG],[
69+
AC_DEFUN([MCA_opal_hwloc_hwloc1116_CONFIG],[
7070
# Hwloc needs to know if we have Verbs support
7171
AC_REQUIRE([OPAL_CHECK_VERBS_DIR])
7272

73-
AC_CONFIG_FILES([opal/mca/hwloc/hwloc1113/Makefile])
73+
AC_CONFIG_FILES([opal/mca/hwloc/hwloc1116/Makefile])
7474

75-
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])
75+
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])
7676

7777
# default to this component not providing support
78-
opal_hwloc_hwloc1113_basedir=opal/mca/hwloc/hwloc1113
79-
opal_hwloc_hwloc1113_support=no
78+
opal_hwloc_hwloc1116_basedir=opal/mca/hwloc/hwloc1116
79+
opal_hwloc_hwloc1116_support=no
8080

8181
AS_IF([test "$with_hwloc" = "internal" || test -z "$with_hwloc" || test "$with_hwloc" = "yes"],
8282
[opal_hwloc_external="no"],
8383
[opal_hwloc_external="yes"])
8484

85-
opal_hwloc_hwloc1113_save_CPPFLAGS=$CPPFLAGS
86-
opal_hwloc_hwloc1113_save_LDFLAGS=$LDFLAGS
87-
opal_hwloc_hwloc1113_save_LIBS=$LIBS
85+
opal_hwloc_hwloc1116_save_CPPFLAGS=$CPPFLAGS
86+
opal_hwloc_hwloc1116_save_LDFLAGS=$LDFLAGS
87+
opal_hwloc_hwloc1116_save_LIBS=$LIBS
8888

8989
# Run the hwloc configuration - if no external hwloc, then set the prefixi
9090
# to minimize the chance that someone will use the internal symbols
9191
AS_IF([test "$opal_hwloc_external" = "no"],
92-
[HWLOC_SET_SYMBOL_PREFIX([opal_hwloc1113_])])
92+
[HWLOC_SET_SYMBOL_PREFIX([opal_hwloc1116_])])
9393

9494
# save XML or graphical options
95-
opal_hwloc_hwloc1113_save_cairo=$enable_cairo
96-
opal_hwloc_hwloc1113_save_xml=$enable_xml
97-
opal_hwloc_hwloc1113_save_static=$enable_static
98-
opal_hwloc_hwloc1113_save_shared=$enable_shared
99-
opal_hwloc_hwloc1113_save_plugins=$enable_plugins
95+
opal_hwloc_hwloc1116_save_cairo=$enable_cairo
96+
opal_hwloc_hwloc1116_save_xml=$enable_xml
97+
opal_hwloc_hwloc1116_save_static=$enable_static
98+
opal_hwloc_hwloc1116_save_shared=$enable_shared
99+
opal_hwloc_hwloc1116_save_plugins=$enable_plugins
100100

101101
# never enable hwloc's graphical option
102102
enable_cairo=no
@@ -113,19 +113,19 @@ AC_DEFUN([MCA_opal_hwloc_hwloc1113_CONFIG],[
113113

114114
# hwloc checks for compiler visibility, and its needs to do
115115
# this without "picky" flags.
116-
opal_hwloc_hwloc1113_save_cflags=$CFLAGS
116+
opal_hwloc_hwloc1116_save_cflags=$CFLAGS
117117
CFLAGS=$OPAL_CFLAGS_BEFORE_PICKY
118-
HWLOC_SETUP_CORE([opal/mca/hwloc/hwloc1113/hwloc],
118+
HWLOC_SETUP_CORE([opal/mca/hwloc/hwloc1116/hwloc],
119119
[AC_MSG_CHECKING([whether hwloc configure succeeded])
120120
AC_MSG_RESULT([yes])
121-
HWLOC_VERSION="internal v`$srcdir/$opal_hwloc_hwloc1113_basedir/hwloc/config/hwloc_get_version.sh $srcdir/$opal_hwloc_hwloc1113_basedir/hwloc/VERSION`"
121+
HWLOC_VERSION="internal v`$srcdir/$opal_hwloc_hwloc1116_basedir/hwloc/config/hwloc_get_version.sh $srcdir/$opal_hwloc_hwloc1116_basedir/hwloc/VERSION`"
122122

123123
# Build flags for our Makefile.am
124-
opal_hwloc_hwloc1113_LDFLAGS='$(HWLOC_EMBEDDED_LDFLAGS)'
125-
opal_hwloc_hwloc1113_LIBS='$(OPAL_TOP_BUILDDIR)/'"$opal_hwloc_hwloc1113_basedir"'/hwloc/src/libhwloc_embedded.la $(HWLOC_EMBEDDED_LIBS)'
126-
opal_hwloc_hwloc1113_support=yes
124+
opal_hwloc_hwloc1116_LDFLAGS='$(HWLOC_EMBEDDED_LDFLAGS)'
125+
opal_hwloc_hwloc1116_LIBS='$(OPAL_TOP_BUILDDIR)/'"$opal_hwloc_hwloc1116_basedir"'/hwloc/src/libhwloc_embedded.la $(HWLOC_EMBEDDED_LIBS)'
126+
opal_hwloc_hwloc1116_support=yes
127127

128-
AC_DEFINE_UNQUOTED([HWLOC_HWLOC1113_HWLOC_VERSION],
128+
AC_DEFINE_UNQUOTED([HWLOC_HWLOC1116_HWLOC_VERSION],
129129
["$HWLOC_VERSION"],
130130
[Version of hwloc])
131131

@@ -138,35 +138,35 @@ AC_DEFUN([MCA_opal_hwloc_hwloc1113_CONFIG],[
138138
],
139139
[AC_MSG_CHECKING([whether hwloc configure succeeded])
140140
AC_MSG_RESULT([no])
141-
opal_hwloc_hwloc1113_support=no])
142-
CFLAGS=$opal_hwloc_hwloc1113_save_cflags
141+
opal_hwloc_hwloc1116_support=no])
142+
CFLAGS=$opal_hwloc_hwloc1116_save_cflags
143143

144144
# Restore some env variables, if necessary
145-
AS_IF([test -n "$opal_hwloc_hwloc1113_save_cairo"],
146-
[enable_cairo=$opal_hwloc_hwloc1113_save_cairo])
147-
AS_IF([test -n "$opal_hwloc_hwloc1113_save_xml"],
148-
[enable_xml=$opal_hwloc_hwloc1113_save_xml])
149-
AS_IF([test -n "$opal_hwloc_hwloc1113_save_static"],
150-
[enable_static=$opal_hwloc_hwloc1113_save_static])
151-
AS_IF([test -n "$opal_hwloc_hwloc1113_save_shared"],
152-
[enable_shared=$opal_hwloc_hwloc1113_save_shared])
153-
AS_IF([test -n "$opal_hwloc_hwloc1113_save_plugins"],
154-
[enable_plugins=$opal_hwloc_hwloc1113_save_shared])
155-
156-
CPPFLAGS=$opal_hwloc_hwloc1113_save_CPPFLAGS
157-
LDFLAGS=$opal_hwloc_hwloc1113_save_LDFLAGS
158-
LIBS=$opal_hwloc_hwloc1113_save_LIBS
159-
160-
AC_SUBST([opal_hwloc_hwloc1113_CFLAGS])
161-
AC_SUBST([opal_hwloc_hwloc1113_CPPFLAGS])
162-
AC_SUBST([opal_hwloc_hwloc1113_LDFLAGS])
163-
AC_SUBST([opal_hwloc_hwloc1113_LIBS])
145+
AS_IF([test -n "$opal_hwloc_hwloc1116_save_cairo"],
146+
[enable_cairo=$opal_hwloc_hwloc1116_save_cairo])
147+
AS_IF([test -n "$opal_hwloc_hwloc1116_save_xml"],
148+
[enable_xml=$opal_hwloc_hwloc1116_save_xml])
149+
AS_IF([test -n "$opal_hwloc_hwloc1116_save_static"],
150+
[enable_static=$opal_hwloc_hwloc1116_save_static])
151+
AS_IF([test -n "$opal_hwloc_hwloc1116_save_shared"],
152+
[enable_shared=$opal_hwloc_hwloc1116_save_shared])
153+
AS_IF([test -n "$opal_hwloc_hwloc1116_save_plugins"],
154+
[enable_plugins=$opal_hwloc_hwloc1116_save_shared])
155+
156+
CPPFLAGS=$opal_hwloc_hwloc1116_save_CPPFLAGS
157+
LDFLAGS=$opal_hwloc_hwloc1116_save_LDFLAGS
158+
LIBS=$opal_hwloc_hwloc1116_save_LIBS
159+
160+
AC_SUBST([opal_hwloc_hwloc1116_CFLAGS])
161+
AC_SUBST([opal_hwloc_hwloc1116_CPPFLAGS])
162+
AC_SUBST([opal_hwloc_hwloc1116_LDFLAGS])
163+
AC_SUBST([opal_hwloc_hwloc1116_LIBS])
164164

165165
# Finally, add some flags to the wrapper compiler so that our
166166
# headers can be found.
167-
hwloc_hwloc1113_WRAPPER_EXTRA_LDFLAGS="$HWLOC_EMBEDDED_LDFLAGS"
168-
hwloc_hwloc1113_WRAPPER_EXTRA_LIBS="$HWLOC_EMBEDDED_LIBS"
169-
hwloc_hwloc1113_WRAPPER_EXTRA_CPPFLAGS='-I${pkgincludedir}/'"$opal_hwloc_hwloc1113_basedir/hwloc/include"
167+
hwloc_hwloc1116_WRAPPER_EXTRA_LDFLAGS="$HWLOC_EMBEDDED_LDFLAGS"
168+
hwloc_hwloc1116_WRAPPER_EXTRA_LIBS="$HWLOC_EMBEDDED_LIBS"
169+
hwloc_hwloc1116_WRAPPER_EXTRA_CPPFLAGS='-I${pkgincludedir}/'"$opal_hwloc_hwloc1116_basedir/hwloc/include"
170170

171171
# If we are not building the internal hwloc, then indicate that
172172
# this component should not be built. NOTE: we still did all the
@@ -176,12 +176,12 @@ AC_DEFUN([MCA_opal_hwloc_hwloc1113_CONFIG],[
176176
# distclean" infrastructure to work properly).
177177
AS_IF([test "$opal_hwloc_external" = "yes"],
178178
[AC_MSG_WARN([using an external hwloc; disqualifying this component])
179-
opal_hwloc_hwloc1113_support=no],
179+
opal_hwloc_hwloc1116_support=no],
180180
[AC_DEFINE([HAVE_DECL_HWLOC_OBJ_OSDEV_COPROC], [1])
181181
AC_DEFINE([HAVE_HWLOC_TOPOLOGY_DUP], [1])])
182182

183183
# Done!
184-
AS_IF([test "$opal_hwloc_hwloc1113_support" = "yes"],
184+
AS_IF([test "$opal_hwloc_hwloc1116_support" = "yes"],
185185
[$1],
186186
[$2])
187187

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ACLOCAL_AMFLAGS = -I ./config
99

1010
SUBDIRS = src include
1111
if HWLOC_BUILD_STANDALONE
12-
SUBDIRS += tests utils contrib/systemd
12+
SUBDIRS += utils tests contrib/systemd
1313
# We need doc/ if HWLOC_BUILD_DOXYGEN, or during make install if HWLOC_INSTALL_DOXYGEN.
1414
# There's no INSTALL_SUBDIRS, so always enter doc/ and check HWLOC_BUILD/INSTALL_DOXYGEN there
1515
SUBDIRS += doc

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

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Copyright © 2009 CNRS
2-
Copyright © 2009-2016 Inria. All rights reserved.
2+
Copyright © 2009-2017 Inria. All rights reserved.
33
Copyright © 2009-2013 Université Bordeaux
44
Copyright © 2009-2011 Cisco Systems, Inc. All rights reserved.
55

@@ -17,10 +17,51 @@ bug fixes (and other actions) for each version of hwloc since version
1717
in v0.9.1).
1818

1919

20+
Version 1.11.6
21+
--------------
22+
* Make the Linux discovery about twice faster, especially on the CPU side,
23+
by trying to avoid sysfs file accesses as much as possible.
24+
* Add support for AMD Family 17h processors (Zen) SMT cores in the Linux
25+
and x86 backends.
26+
* Add the HWLOC_TOPOLOGY_FLAG_THISSYSTEM_ALLOWED_RESOURCES flag (and the
27+
HWLOC_THISSYSTEM_ALLOWED_RESOURCES environment variable) for reading the
28+
set of allowed resources from the local operating system even if the
29+
topology was loaded from XML or synthetic.
30+
* Fix hwloc_bitmap_set/clr_range() for infinite ranges that do not
31+
overlap currently defined ranges in the bitmap.
32+
* Don't reset the lstopo zoom scale when moving the X11 window.
33+
* lstopo now has --flags for manually setting topology flags.
34+
* hwloc_get_depth_type() returns HWLOC_TYPE_DEPTH_UNKNOWN for Misc objects.
35+
36+
37+
Version 1.11.5
38+
--------------
39+
* Add support for Knights Mill Xeon Phi, thanks to Piotr Luc for the patch.
40+
* Reenable distance gathering on Solaris, disabled by mistake since v1.0.
41+
Thanks to TU Wien for the help.
42+
* Fix hwloc_get_*obj*_inside_cpuset() functions to ignore objects with
43+
empty CPU sets, for instance, CPU-less NUMA nodes such as KNL MCDRAM.
44+
Thanks to Nicolas Denoyelle for the report.
45+
* Fix XML import of multiple distance matrices.
46+
* Add a FAQ entry about "hwloc is only a structural model, it ignores
47+
performance models, memory bandwidth, etc.?"
48+
49+
2050
Version 1.11.4
2151
--------------
52+
* Add MemoryMode and ClusterMode attributes in the Machine object on KNL.
53+
Add doc/examples/get-knl-modes.c for an example of retrieving them.
54+
Thanks to Grzegorz Andrejczuk.
2255
* Fix Linux build with -m32 with respect to libudev.
2356
Thanks to Paul Hargrove for reporting the issue.
57+
* Fix build with Visual Studio 2015, thanks to Eloi Gaudry for reporting
58+
the issue and providing the patch.
59+
* Don't forget to display OS device children in the graphical lstopo.
60+
* Fix a memory leak on Solaris, thanks to Bryon Gloden for the patch.
61+
* Properly handle realloc() failures, thanks to Bryon Gloden for reporting
62+
the issue.
63+
* Fix lstopo crash in ascii/fig/windows outputs when some objects have a
64+
lstopoStyle info attribute.
2465

2566

2667
Version 1.11.3

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

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,11 @@ hwloc primarily aims at helping high-performance computing (HPC) applications,
1313
but is also applicable to any project seeking to exploit code and/or data
1414
locality on modern computing platforms.
1515

16-
Note that the hwloc project represents the merger of the libtopology project
17-
from inria and the Portable Linux Processor Affinity (PLPA) sub-project from
18-
Open MPI. Both of these prior projects are now deprecated. The first hwloc
19-
release was essentially a "re-branding" of the libtopology code base, but with
20-
both a few genuinely new features and a few PLPA-like features added in. Prior
21-
releases of hwloc included documentation about switching from PLPA to hwloc;
22-
this documentation has been dropped on the assumption that everyone who was
23-
using PLPA has already switched to hwloc.
24-
2516
hwloc supports the following operating systems:
2617

2718
* Linux (including old kernels not having sysfs topology information, with
28-
knowledge of cpusets, offline CPUs, ScaleMP vSMP and Kerrighed support) on
29-
all supported hardware, including Intel Xeon Phi (KNL and KNC, either
19+
knowledge of cpusets, ScaleMP vSMP and Kerrighed support, etc.) on all
20+
supported hardware, including Intel Xeon Phi (KNL and KNC, either
3021
standalone or as a coprocessor) and NumaScale NumaConnect.
3122
* Solaris
3223
* AIX
@@ -55,14 +46,15 @@ no topology information is available.
5546
For development and debugging purposes, hwloc also offers the ability to work
5647
on "fake" topologies:
5748

58-
* Symmetrical tree of resources generated from a list of level arities
59-
* Remote machine simulation through the gathering of Linux sysfs topology
60-
files
49+
* Symmetrical tree of resources generated from a list of level arities, see
50+
Synthetic topologies.
51+
* Remote machine simulation through the gathering of topology as XML files,
52+
see Importing and exporting topologies from/to XML files.
6153

6254
hwloc can display the topology in a human-readable format, either in graphical
6355
mode (X11), or by exporting in one of several different formats, including:
64-
plain text, PDF, PNG, and FIG (see CLI Examples below). Note that some of the
65-
export formats require additional support libraries.
56+
plain text, PDF, PNG, and FIG (see Command-line Examples below). Note that some
57+
of the export formats require additional support libraries.
6658

6759
hwloc offers a programming interface for manipulating topologies and objects.
6860
It also brings a powerful CPU bitmap API that is used to describe topology

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
major=1
1111
minor=11
12-
release=3
12+
release=6
1313

1414
# greek is used for alpha or beta release tags. If it is non-empty,
1515
# it will be appended to the version number. It does not have to be
@@ -22,7 +22,7 @@ greek=
2222

2323
# The date when this release was created
2424

25-
date="Apr 26, 2016"
25+
date="Feb 23, 2017"
2626

2727
# If snapshot=1, then use the value from snapshot_version as the
2828
# entire hwloc version (i.e., ignore major, minor, release, and
@@ -41,6 +41,6 @@ snapshot_version=${major}.${minor}.${release}${greek}-git
4141
# 2. Version numbers are described in the Libtool current:revision:age
4242
# format.
4343

44-
libhwloc_so_version=12:0:7
44+
libhwloc_so_version=12:3:7
4545

4646
# Please also update the <TargetName> lines in contrib/windows/libhwloc.vcxproj

0 commit comments

Comments
 (0)