Skip to content

Commit b393898

Browse files
NicolasDenoyelleNicolasDenoyelle
authored
Merge branch 'master' into distrib
2 parents c61806d + 3840d8c commit b393898

File tree

165 files changed

+5909
-1838
lines changed

Some content is hidden

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

165 files changed

+5909
-1838
lines changed

‎.github/contributing.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# License and Signed-off-by token
2+
3+
In order to ensure that we can keep distributing hwloc under our
4+
[open source license](/COPYING), we need to ensure that all
5+
contributions are compatible with that license.
6+
7+
To that end, we require that all Git commits contributed to hwloc
8+
have a "Signed-off-by" token indicating that the commit author agrees
9+
with [Open MPI's Contributor's
10+
Declaration](https://github.com/open-mpi/ompi/wiki/Administrative-rules#contributors-declaration).
11+
12+
If you have not already done so, please ensure that:
13+
14+
1. Every commit contains exactly the "Signed-off-by" token. You can
15+
add this token via `git commit -s`.
16+
1. The email address after "Signed-off-by" must match the Git commit
17+
email address.
18+
19+
# Copyright
20+
21+
You may also update the copyright headers whenever you modify
22+
a file. `contrib/update-my-copyright.pl` may help you doing so.
23+
It requires you to set the `HWLOC_COPYRIGHT_FORMAT_NAME` environment
24+
to something like `Inria. All rights reserved.`
25+
and `HWLOC_COPYRIGHT_SEARCH_NAME` to something like `Inria`.
26+
27+
You may even call `contrib/update-my-copyright.pl --check-only` from
28+
the git pre-commit hook so that it prevents committing without
29+
updated copyright headers (unless `--no-verify` is given).
30+
31+
Major contributors are also listed in the [Authors](/AUTHORS) file.

‎.github/issue_template.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@
2727
If your issue consists in a wrong topology detection, we also need the following for debugging remotely:
2828

2929
* On Linux, run `hwloc-gather-topology myhost` and post the `myhost.*` files that it will generate. Note that this tool may be slow on large nodes or when I/O is enabled.
30-
* On MacOS, `sysctl hw` and `sysctl machdep.cpu`
31-
* On Solaris, `kstat cpu_info` and `lgrp_info -a`
32-
* On BSD, `sysctl hw`
30+
* On Solaris, `kstat -C cpu_info`, `lgrpinfo -a` and `psrinfo`
31+
* On MacOS and BSD, `sysctl hw` and `sysctl machdep`
3332
* On BSD x86 platforms, if using hwloc >= 2.0, also run `hwloc-gather-cpuid` and post an archive of the `cpuid` that was generated.
3433
* On Windows, `coreinfo -cgnlsm`
3534

@@ -38,3 +37,4 @@ If your issue consists in a wrong topology detection, we also need the following
3837
You may need to archive the output from the above commands into a `.zip` or `.tar.gz` (not `.bz2`!) file before Github will allow you to drag-n-drop the file into the issue to attach it.
3938

4039
Note that upgrading your operating system (e.g., Linux kernel) and platform firmwares (e.g., BIOS) might help solving issues about wrong topology detection.
40+
Some known issues are listed at https://github.com/open-mpi/hwloc/wiki/Linux-kernel-bugs

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ test-suite.log
112112
/tests/hwloc/hwloc_iodevs
113113
/tests/hwloc/xmlbuffer
114114
/tests/hwloc/gl
115-
/tests/hwloc/intel-mic
116115
/tests/hwloc/linux-libnuma
117116
/tests/hwloc/glibc-sched
118117
/tests/hwloc/openfabrics-verbs
@@ -130,6 +129,8 @@ test-suite.log
130129

131130
/tests/hwloc/x86/test-topology.sh
132131

132+
/tests/hwloc/x86+linux/test-topology.sh
133+
133134
/tests/hwloc/xml/test-topology.sh
134135

135136
/tests/hwloc/embedded/aclocal.m4
@@ -197,6 +198,7 @@ test-suite.log
197198
/utils/lstopo/lstopo-no-graphics
198199
/utils/lstopo/lstopo-no-graphics.1
199200
/utils/lstopo/test-lstopo.sh
201+
/utils/lstopo/test-lstopo-shmem.sh
200202
/utils/lstopo/test-*.sh.log
201203
/utils/lstopo/test-*.sh.trs
202204

‎NEWS

Lines changed: 60 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,16 @@ bug fixes (and other actions) for each version of hwloc since version
1616
0.9.
1717

1818

19+
Version 2.2.0
20+
-------------
21+
* Remove support for Intel Xeon Phi (MIC, Knights Corner) co-processors.
22+
23+
1924
Version 2.1.0
2025
-------------
2126
* API
27+
+ Add a new "Die" object (HWLOC_OBJ_DIE) for upcoming x86 processors
28+
with multiple dies per package, in the x86 and Linux backends.
2229
+ Add the new HWLOC_OBJ_MEMCACHE object type for memory-side caches.
2330
- They are filtered-out by default, except in command-line tools.
2431
- They are only available on very recent platforms running Linux 5.2+
@@ -34,22 +41,32 @@ Version 2.1.0
3441
+ Improve the API for dealing with disallowed resources
3542
- HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM is replaced with FLAG_INCLUDE_DISALLOWED
3643
and --whole-system command-line options with --disallowed.
37-
Former names are still accepted for backward compatibility.
44+
. Former names are still accepted for backward compatibility.
3845
- Add hwloc_topology_allow() for changing allowed sets after load().
3946
- Add the HWLOC_ALLOW=all environment variable to totally ignore
4047
administrative restrictions such as Linux Cgroups.
4148
- Add disallowed_pu and disallowed_numa bits to the discovery support
4249
structure.
50+
+ Group objects have a new "dont_merge" attribute to prevent them from
51+
being automatically merged with identical parent or children.
52+
+ Add more distances-related features:
53+
- Add hwloc_distances_get_name() to retrieve a string describing
54+
what a distances structure contain.
55+
- Add hwloc_distances_get_by_name() to retrieve distances structures
56+
based on their name.
57+
- Add hwloc_distances_release_remove()
58+
- Distances may now cover objects of different types with new kind
59+
HWLOC_DISTANCES_KIND_HETEROGENEOUS_TYPES.
4360
* Backends
61+
+ Add support for Linux 5.3 new sysfs cpu topology files with Die information.
4462
+ Add support for Intel v2 Extended Topology Enumeration in the x86 backend.
45-
Tiles, Modules and Dies are exposed as Groups for now.
4663
+ Improve memory locality on Linux by using HMAT initiators (exposed
4764
since Linux 5.2+), and NUMA distances for CPU-less NUMA nodes.
48-
+ The x86 now properly handles offline CPUs.
65+
+ The x86 backend now properly handles offline CPUs.
4966
+ Detect the locality of NVIDIA GPU OpenCL devices.
5067
+ Ignore NUMA nodes that correspond to NVIDIA GPU by default.
51-
- They may be kept if HWLOC_KEEP_NVIDIA_GPU_NUMA_NODES=1 in the environment.
52-
Fix their CPU locality and add info attributes to identify them.
68+
- They may be unignored if HWLOC_KEEP_NVIDIA_GPU_NUMA_NODES=1 in the environment.
69+
- Fix their CPU locality and add info attributes to identify them.
5370
Thanks to Max Katz and Edgar Leon for the help.
5471
+ Add support for IBM S/390 drawers.
5572
+ Rework the heuristics for discovering KNL Cluster and Memory modes
@@ -60,12 +77,17 @@ Version 2.1.0
6077
+ Expose Linux DAX devices as hwloc Block OS devices.
6178
+ Remove support for /proc/cpuinfo-only topology discovery in Linux
6279
kernel prior to 2.6.16.
80+
+ Disable POWER device-tree-based topology on Linux by default.
81+
- It may be reenabled by setting HWLOC_USE_DT=1 in the environment.
82+
+ Discovery components are now divided in phases that may be individually
83+
blacklisted.
84+
- The linuxio component has been merged back into the linux component.
6385
* Tools
6486
+ lstopo
6587
- lstopo factorizes objects by default in the graphical output when
6688
there are more than 4 identical children.
67-
New options --no-factorize and --factorize may be used to configure this.
68-
Also hit the 'f' key to disable factorizing in interactive outputs.
89+
. New options --no-factorize and --factorize may be used to configure this.
90+
. Hit the 'f' key to disable factorizing in interactive outputs.
6991
- Both logical and OS/physical indexes are now displayed by default
7092
for PU and NUMA nodes.
7193
- The X11 and Windows interactive outputs support many keyboard
@@ -78,9 +100,27 @@ Version 2.1.0
78100
See dynamic_SVG_example.html for an example.
79101
+ Add --nodeset options to hwloc-calc for converting between cpusets and
80102
nodesets.
103+
+ Add --no-smt to lstopo, hwloc-bind and hwloc-calc to ignore multiple
104+
PU in SMT cores.
81105
+ hwloc-annotate may annotate multiple locations at once.
82106
+ Add a HTML/JS version of hwloc-ps. See contrib/hwloc-ps.www/README.
83107
+ Add bash completions.
108+
* Misc
109+
+ Add several FAQ entries in "Compatibility between hwloc versions"
110+
about API version, ABI, XML, Synthetic strings, and shmem topologies.
111+
112+
113+
Version 2.0.4 (also included in 1.11.13 when appropriate)
114+
-------------
115+
* Add support for Linux 5.3 new sysfs cpu topology files with Die information.
116+
* Add support for Intel v2 Extended Topology Enumeration in the x86 backend.
117+
* Tiles, Modules and Dies are exposed as Groups for now.
118+
+ HWLOC_DONT_MERGE_DIE_GROUPS=1 may be set in the environment to prevent
119+
Die groups from being automatically merged with identical parent or children.
120+
* Ignore NUMA node information from AMD topoext in the x86 backend,
121+
unless HWLOC_X86_TOPOEXT_NUMANODES=1 is set in the environment.
122+
* Group objects have a new "dont_merge" attribute to prevent them from
123+
being automatically merged with identical parent or children.
84124

85125

86126
Version 2.0.3 (also included in 1.11.12 when appropriate)
@@ -267,6 +307,19 @@ Version 2.0.0
267307
+ hwloc now requires a C99 compliant compiler.
268308

269309

310+
Version 1.11.13 (also included in 2.0.4)
311+
---------------
312+
* Add support for Linux 5.3 new sysfs cpu topology files with Die information.
313+
* Add support for Intel v2 Extended Topology Enumeration in the x86 backend.
314+
* Tiles, Modules and Dies are exposed as Groups for now.
315+
+ HWLOC_DONT_MERGE_DIE_GROUPS=1 may be set in the environment to prevent
316+
Die groups from being automatically merged with identical parent or children.
317+
* Ignore NUMA node information from AMD topoext in the x86 backend,
318+
unless HWLOC_X86_TOPOEXT_NUMANODES=1 is set in the environment.
319+
* Group objects have a new "dont_merge" attribute to prevent them from
320+
being automatically merged with identical parent or children.
321+
322+
270323
Version 1.11.12 (also included in 2.0.3)
271324
---------------
272325
* Fix a corner case of hwloc_topology_restrict() where children would

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# Please update HWLOC_VERSION* in contrib/windows/hwloc_config.h too.
99

1010
major=2
11-
minor=1
11+
minor=2
1212
release=0
1313

1414
# greek is used for alpha or beta release tags. If it is non-empty,

‎config/hwloc.m4

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dnl -*- Autoconf -*-
22
dnl
3-
dnl Copyright © 2009-2018 Inria. All rights reserved.
3+
dnl Copyright © 2009-2019 Inria. All rights reserved.
44
dnl Copyright © 2009-2012, 2015-2017 Université Bordeaux
55
dnl Copyright © 2004-2005 The Trustees of Indiana University and Indiana
66
dnl University Research and Technology
@@ -217,8 +217,7 @@ EOF])
217217
AC_MSG_RESULT([Linux])
218218
hwloc_components="$hwloc_components linux"
219219
if test "x$enable_io" != xno; then
220-
hwloc_components="$hwloc_components linuxio"
221-
AC_DEFINE(HWLOC_HAVE_LINUXIO, 1, [Define to 1 if building the Linux I/O component])
220+
AC_DEFINE(HWLOC_HAVE_LINUXIO, 1, [Define to 1 for I/O discovery in the Linux component])
222221
hwloc_linuxio_happy=yes
223222
if test x$enable_pci != xno; then
224223
AC_DEFINE(HWLOC_HAVE_LINUXPCI, 1, [Define to 1 if enabling Linux-specific PCI discovery in the Linux I/O component])
@@ -1220,11 +1219,13 @@ return clGetDeviceIDs(0, 0, 0, NULL, NULL);
12201219
AS_IF([test "$hwloc_mode" = "embedded"],
12211220
[HWLOC_EMBEDDED_CFLAGS=$HWLOC_CFLAGS
12221221
HWLOC_EMBEDDED_CPPFLAGS=$HWLOC_CPPFLAGS
1222+
HWLOC_EMBEDDED_LDFLAGS=$HWLOC_LDFLAGS
12231223
HWLOC_EMBEDDED_LDADD='$(HWLOC_top_builddir)/hwloc/libhwloc_embedded.la'
12241224
HWLOC_EMBEDDED_LIBS=$HWLOC_LIBS
12251225
HWLOC_LIBS=])
12261226
AC_SUBST(HWLOC_EMBEDDED_CFLAGS)
12271227
AC_SUBST(HWLOC_EMBEDDED_CPPFLAGS)
1228+
AC_SUBST(HWLOC_EMBEDDED_LDFLAGS)
12281229
AC_SUBST(HWLOC_EMBEDDED_LDADD)
12291230
AC_SUBST(HWLOC_EMBEDDED_LIBS)
12301231

‎config/hwloc_internal.m4

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -438,13 +438,15 @@ int foo(void) {
438438
hwloc_config_prefix[tests/hwloc/linux/allowed/Makefile]
439439
hwloc_config_prefix[tests/hwloc/linux/gather/Makefile]
440440
hwloc_config_prefix[tests/hwloc/x86/Makefile]
441+
hwloc_config_prefix[tests/hwloc/x86+linux/Makefile]
441442
hwloc_config_prefix[tests/hwloc/xml/Makefile]
442443
hwloc_config_prefix[tests/hwloc/ports/Makefile]
443444
hwloc_config_prefix[tests/hwloc/rename/Makefile]
444445
hwloc_config_prefix[tests/hwloc/linux/allowed/test-topology.sh]
445446
hwloc_config_prefix[tests/hwloc/linux/gather/test-gather-topology.sh]
446447
hwloc_config_prefix[tests/hwloc/linux/test-topology.sh]
447448
hwloc_config_prefix[tests/hwloc/x86/test-topology.sh]
449+
hwloc_config_prefix[tests/hwloc/x86+linux/test-topology.sh]
448450
hwloc_config_prefix[tests/hwloc/xml/test-topology.sh]
449451
hwloc_config_prefix[tests/hwloc/wrapper.sh]
450452
hwloc_config_prefix[utils/hwloc/hwloc-compress-dir]
@@ -459,6 +461,7 @@ int foo(void) {
459461
hwloc_config_prefix[utils/hwloc/test-hwloc-dump-hwdata/Makefile]
460462
hwloc_config_prefix[utils/hwloc/test-hwloc-dump-hwdata/test-hwloc-dump-hwdata.sh]
461463
hwloc_config_prefix[utils/lstopo/test-lstopo.sh]
464+
hwloc_config_prefix[utils/lstopo/test-lstopo-shmem.sh]
462465
hwloc_config_prefix[utils/netloc/infiniband/netloc_ib_gather_raw]
463466
hwloc_config_prefix[contrib/hwloc-ps.www/Makefile]
464467
hwloc_config_prefix[contrib/systemd/Makefile]
@@ -469,27 +472,29 @@ int foo(void) {
469472
hwloc_config_prefix[tests/netloc/tests.sh]
470473
)
471474
472-
AC_CONFIG_COMMANDS([chmoding-scripts], [
473-
chmod +x ]hwloc_config_prefix[tests/hwloc/linux/test-topology.sh \
474-
]hwloc_config_prefix[tests/hwloc/x86/test-topology.sh \
475-
]hwloc_config_prefix[tests/hwloc/xml/test-topology.sh \
476-
]hwloc_config_prefix[tests/hwloc/linux/allowed/test-topology.sh \
477-
]hwloc_config_prefix[tests/hwloc/linux/gather/test-gather-topology.sh \
478-
]hwloc_config_prefix[tests/hwloc/wrapper.sh \
479-
]hwloc_config_prefix[utils/hwloc/hwloc-compress-dir \
480-
]hwloc_config_prefix[utils/hwloc/hwloc-gather-topology \
481-
]hwloc_config_prefix[utils/hwloc/test-hwloc-annotate.sh \
482-
]hwloc_config_prefix[utils/hwloc/test-hwloc-calc.sh \
483-
]hwloc_config_prefix[utils/hwloc/test-hwloc-compress-dir.sh \
484-
]hwloc_config_prefix[utils/hwloc/test-hwloc-diffpatch.sh \
485-
]hwloc_config_prefix[utils/hwloc/test-hwloc-distrib.sh \
486-
]hwloc_config_prefix[utils/hwloc/test-hwloc-info.sh \
487-
]hwloc_config_prefix[utils/hwloc/test-fake-plugin.sh \
488-
]hwloc_config_prefix[utils/hwloc/test-hwloc-dump-hwdata/test-hwloc-dump-hwdata.sh \
489-
]hwloc_config_prefix[utils/lstopo/test-lstopo.sh \
490-
]hwloc_config_prefix[utils/netloc/infiniband/netloc_ib_gather_raw \
491-
]hwloc_config_prefix[contrib/windows/test-windows-version.sh \
492-
]hwloc_config_prefix[tests/netloc/tests.sh])
475+
AC_CONFIG_COMMANDS([chmoding-scripts], [chmod +x] \
476+
hwloc_config_prefix[tests/hwloc/linux/test-topology.sh] \
477+
hwloc_config_prefix[tests/hwloc/x86/test-topology.sh] \
478+
hwloc_config_prefix[tests/hwloc/x86+linux/test-topology.sh] \
479+
hwloc_config_prefix[tests/hwloc/xml/test-topology.sh] \
480+
hwloc_config_prefix[tests/hwloc/linux/allowed/test-topology.sh] \
481+
hwloc_config_prefix[tests/hwloc/linux/gather/test-gather-topology.sh] \
482+
hwloc_config_prefix[tests/hwloc/wrapper.sh] \
483+
hwloc_config_prefix[utils/hwloc/hwloc-compress-dir] \
484+
hwloc_config_prefix[utils/hwloc/hwloc-gather-topology] \
485+
hwloc_config_prefix[utils/hwloc/test-hwloc-annotate.sh] \
486+
hwloc_config_prefix[utils/hwloc/test-hwloc-calc.sh] \
487+
hwloc_config_prefix[utils/hwloc/test-hwloc-compress-dir.sh] \
488+
hwloc_config_prefix[utils/hwloc/test-hwloc-diffpatch.sh] \
489+
hwloc_config_prefix[utils/hwloc/test-hwloc-distrib.sh] \
490+
hwloc_config_prefix[utils/hwloc/test-hwloc-info.sh] \
491+
hwloc_config_prefix[utils/hwloc/test-fake-plugin.sh] \
492+
hwloc_config_prefix[utils/hwloc/test-hwloc-dump-hwdata/test-hwloc-dump-hwdata.sh] \
493+
hwloc_config_prefix[utils/lstopo/test-lstopo.sh] \
494+
hwloc_config_prefix[utils/lstopo/test-lstopo-shmem.sh] \
495+
hwloc_config_prefix[utils/netloc/infiniband/netloc_ib_gather_raw] \
496+
hwloc_config_prefix[contrib/windows/test-windows-version.sh] \
497+
hwloc_config_prefix[tests/netloc/tests.sh])
493498
494499
# These links are only needed in standalone mode. It would
495500
# be nice to m4 foreach this somehow, but whenever I tried

‎contrib/ci.inria.fr/Jenkinsfile-basic

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pipeline {
2626
node('autotools') {
2727
checkout scm
2828
script {
29-
gitBranch = sh (script: 'if test "$BRANCH_NAME"; then echo $BRANCH_NAME; else git branch | cut -c3-; fi', returnStdout: true).trim()
29+
gitBranch = sh (script: 'if test "$BRANCH_NAME"; then echo $BRANCH_NAME; else git rev-parse --abbrev-ref HEAD; fi', returnStdout: true).trim()
3030
}
3131
sh 'contrib/ci.inria.fr/job-0-tarball.sh '+gitBranch
3232
script {

‎contrib/ci.inria.fr/Jenkinsfile-extended

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// + running Unix Debug checks
77
// + building MinGW Windows zipballs
88
// + running Embedded checks
9-
// + running Sonarscanner analysis
9+
// + running Coverity and Sonarscanner analysis
1010
//
1111
// The GIT checkout must use the remote branch name as the checkout local
1212
// branch name so that tarball names contain the branch name.
@@ -36,7 +36,7 @@ pipeline {
3636
checkout scm
3737
script {
3838
gitRepoURL = sh (script: 'git config --get remote.origin.url', returnStdout: true).trim()
39-
gitBranch = sh (script: 'if test "$BRANCH_NAME"; then echo $BRANCH_NAME; else git branch | cut -c3-; fi', returnStdout: true).trim()
39+
gitBranch = sh (script: 'if test "$BRANCH_NAME"; then echo $BRANCH_NAME; else git rev-parse --abbrev-ref HEAD; fi', returnStdout: true).trim()
4040
}
4141
sh 'contrib/ci.inria.fr/job-0-tarball.sh '+gitBranch
4242
script {
@@ -47,6 +47,7 @@ pipeline {
4747
dir('contrib/ci.inria.fr') {
4848
stash includes: "job-3-debug.sh", name: 'script-unix-debug'
4949
stash includes: "job-3-embedded.sh", name: 'script-embedded'
50+
stash includes: "job-3-coverity.sh", name: 'script-coverity'
5051
stash includes: "job-3-sonarscanner.sh", name: 'script-sonarscanner'
5152
stash includes: "job-3-mingw.*", name: 'scripts-mingw'
5253
stash includes: "job-3-cygwin.*", name: 'scripts-cygwin'
@@ -70,7 +71,10 @@ pipeline {
7071
if (env.NO_MINGW != 'true') {
7172
listOfNodeNames.push('MinGW')
7273
}
73-
if (env.NO_SONAR != 'true') {
74+
if (env.NO_COVERITY != 'true') {
75+
listOfNodeNames.push('Coverity')
76+
}
77+
if (env.NO_SONARQUBE != 'true') {
7478
listOfNodeNames.push('SonarQube Scanner')
7579
}
7680
if (env.NO_EMBEDDED != 'true') {
@@ -103,6 +107,16 @@ pipeline {
103107
deleteDir()
104108
}
105109
}
110+
} else if (it == 'Coverity') {
111+
node('coverity') {
112+
dir('check-coverity') {
113+
unstash 'tarballgz'
114+
unstash 'script-coverity'
115+
sh 'chmod 755 job-3-coverity.sh && ./job-3-coverity.sh '+gitRepoURL+' '+gitBranch+' '+tarballgz
116+
if (env.KEEP_WORKING_DIRECTORY != 'true')
117+
deleteDir()
118+
}
119+
}
106120
} else if (it == 'SonarQube Scanner') {
107121
node('sonarscanner') {
108122
dir('check-sonarscanner') {

‎contrib/ci.inria.fr/job-1-visualstudio.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
REM
2-
REM Copyright © 2012-2018 Inria. All rights reserved.
2+
REM Copyright © 2012-2019 Inria. All rights reserved.
33
REM See COPYING in top-level directory.
44
REM
55

@@ -13,7 +13,7 @@ if %errorlevel% neq 0 exit /b %errorlevel%
1313
cd %TARBALL:~0,-7%\contrib\windows
1414
if %errorlevel% neq 0 exit /b %errorlevel%
1515

16-
%MSBUILD_PATH%\MSBuild hwloc.sln /p:Configuration=Release /p:Platform=x64
16+
%MSBUILD_PATH%\MSBuild hwloc.sln /p:Configuration=Release /p:Platform=x64 /p:PlatformToolset=v110
1717
if %errorlevel% neq 0 exit /b %errorlevel%
1818

1919
x64\Release\lstopo-no-graphics.exe

0 commit comments

Comments
 (0)