From: Samuel Thibault Date: Wed, 5 Sep 2018 14:12:21 +0000 (+0100) Subject: hwloc (1.11.11-1) unstable; urgency=medium X-Git-Tag: archive/raspbian/1.11.11-1+rpi1^2~3 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c277141019784b3b20ba4d0bbdcd04a826c7c177;p=hwloc.git hwloc (1.11.11-1) unstable; urgency=medium * New upstream release. - patches/test-xml: Remove patch, merged upstream. * control: Bump Standards-Version to 4.2.0 (no changes). [dgit import unpatched hwloc 1.11.11-1] --- c277141019784b3b20ba4d0bbdcd04a826c7c177 diff --cc debian/changelog index 0000000,0000000..73513df new file mode 100644 --- /dev/null +++ b/debian/changelog @@@ -1,0 -1,0 +1,519 @@@ ++hwloc (1.11.11-1) unstable; urgency=medium ++ ++ * New upstream release. ++ - patches/test-xml: Remove patch, merged upstream. ++ * control: Bump Standards-Version to 4.2.0 (no changes). ++ ++ -- Samuel Thibault Wed, 05 Sep 2018 16:12:21 +0200 ++ ++hwloc (1.11.10-3) unstable; urgency=medium ++ ++ * control: Bump Standards-Version to 4.1.5 (no changes). ++ * patches/test-xml: cherry-pick upstream fix for xml test. ++ * tests/: Add autopkgtest. ++ ++ -- Samuel Thibault Tue, 17 Jul 2018 02:51:28 +0200 ++ ++hwloc (1.11.10-2) unstable; urgency=medium ++ ++ [ Alexander Kurtz ] ++ * control: Mark libhwloc-plugins as Multi-Arch: same (Closes: Bug#901558). ++ ++ [ Helmut Grohne ] ++ * Mark libhwloc-common and libhwloc-doc Multi-Arch: foreign. ++ ++ [ Samuel Thibault ] ++ * Use https URL ++ * Bump Standards-Version to 4.1.4 ++ ++ -- Samuel Thibault Sun, 17 Jun 2018 15:39:50 +0200 ++ ++hwloc (1.11.10-1) unstable; urgency=medium ++ ++ * New upstream release. ++ ++ -- Samuel Thibault Mon, 26 Mar 2018 11:46:01 +0200 ++ ++hwloc (1.11.9-1) unstable; urgency=medium ++ ++ * control: Bump Standards-Version to 4.1.1 (no changes). ++ * patches/format: Remove, merged upstream. ++ ++ -- Samuel Thibault Fri, 19 Jan 2018 09:46:54 +0100 ++ ++hwloc (1.11.8-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * control: Migrate priority to optional. ++ * control: Bump Standards-Version to 4.1.0. ++ * patches/format: Avoid letting snprintf interpret process name as format. ++ * control: Make libhwloc-plugins depend only on the same upstream source ++ version, that is where plugin compatibility is guaranteed. ++ ++ -- Samuel Thibault Wed, 06 Sep 2017 17:44:42 +0200 ++ ++hwloc (1.11.7-1) experimental; urgency=medium ++ ++ * New upstream release. ++ ++ -- Samuel Thibault Fri, 28 Apr 2017 16:56:32 +0200 ++ ++hwloc (1.11.6-1) experimental; urgency=medium ++ ++ * New upstream release. ++ * control: Make libhwloc-plugins depend on the same version of libhwloc5. ++ Closes: #846128. ++ ++ -- Samuel Thibault Mon, 28 Nov 2016 16:54:46 +0100 ++ ++hwloc (1.11.5-1) unstable; urgency=medium ++ ++ * New upstream release. ++ ++ -- Samuel Thibault Mon, 21 Nov 2016 11:20:05 +0100 ++ ++hwloc (1.11.4-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * rules: Re-enable parallel build. ++ * control: Bump Standards-Version to 3.9.8 (no change) ++ * patches/test-fix: Remove upstream fix. ++ ++ -- Samuel Thibault Mon, 29 Aug 2016 10:14:01 +0200 ++ ++hwloc (1.11.3-2) unstable; urgency=medium ++ ++ * patches/test-fix: Update to upstream fix. ++ * control: Build-depend on valgrind only on archs which have it. ++ ++ -- Samuel Thibault Tue, 03 May 2016 01:29:42 +0200 ++ ++hwloc (1.11.3-1) unstable; urgency=medium ++ ++ * New upstream release ++ - control: Add valgrind build-dep. ++ - patch/private_doxygen: Remove, merged upstream. ++ * patches/test-fix: Fix an xml testcase. ++ * rules: Do not ignore testsuite failure. ++ * contrib: control: Restrict to amd64, only architecture supported by nvidia. ++ * contrib: rules: Make dh_auto_install in debian/tmp, so dh_install can still work. ++ ++ -- Samuel Thibault Wed, 27 Apr 2016 18:56:17 +0200 ++ ++hwloc (1.11.2-3) unstable; urgency=medium ++ ++ * Also install hwloc-dump-hwdata on linux x32. ++ * control: Bump Standards-Version to 3.9.7 (no change). ++ * patches/private_doxygen: New upstream patch to fix build now that doxygen ++ respects \private. Closes: #814493. ++ ++ -- Samuel Thibault Tue, 16 Feb 2016 17:22:40 +0100 ++ ++hwloc (1.11.2-2) unstable; urgency=medium ++ ++ * Only install hwloc-dump-hwdata on linux x86. ++ ++ -- Samuel Thibault Tue, 29 Dec 2015 20:14:57 +0100 ++ ++hwloc (1.11.2-1) unstable; urgency=medium ++ ++ * New upstream release ++ - hwloc.install: Add /usr/sbin for hwloc-dump-hwdata. ++ * control: ++ - Drop multiarch-support pre-depend. ++ - Enable numa on mips64*. Closes: #806700. ++ * compat: Bump to 9. ++ * rules: Clear. ++ * hwloc.menu: Remove, replaced by desktop file. ++ * patches/bashism: Make hwloc-assembler-remote use bash since it uses ++ bashisms. Closes: #772231. ++ ++ -- Samuel Thibault Tue, 29 Dec 2015 18:31:50 +0100 ++ ++hwloc (1.11.1-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * Add opencl-dev build-dep alternative to ocl-icd-opencl-dev. ++ ++ -- Samuel Thibault Mon, 19 Oct 2015 18:35:48 +0200 ++ ++hwloc (1.11.0-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * rules: drop jquery.js. ++ * control: make libhwloc-doc depend on libjs-jquery to get jquery.js. ++ ++ -- Samuel Thibault Thu, 18 Jun 2015 10:00:13 +0200 ++ ++hwloc (1.10.1-1) unstable; urgency=medium ++ ++ * New upstream release. ++ ++ -- Samuel Thibault Fri, 01 May 2015 20:08:01 +0200 ++ ++hwloc (1.10.0-3) unstable; urgency=medium ++ ++ * Make packages depend on at least the same version of libhwloc5. ++ Closes: #767687. ++ ++ -- Samuel Thibault Sun, 02 Nov 2014 15:25:24 +0100 ++ ++hwloc (1.10.0-2) unstable; urgency=medium ++ ++ * control: ++ - Add common tools names in the description of hwloc. ++ - Add arm64, ppc64el and sparc in list of archs with libnuma-dev. ++ - Make libhwloc-dev depend on libnuma-dev only where it is used. ++ ++ -- Samuel Thibault Fri, 10 Oct 2014 16:22:19 +0200 ++ ++hwloc (1.10.0-1) unstable; urgency=medium ++ ++ * New upstream release. ++ - control: make libhwloc5 Break older libhwloc-plugins. ++ * Bump Standards-Version to 3.9.6 (no changes). ++ * Fix libhwloc-dev Depends. ++ * libhwloc-doc.docs: Add doc/examples. ++ ++ -- Samuel Thibault Wed, 08 Oct 2014 14:37:38 +0200 ++ ++hwloc (1.9.1-1) unstable; urgency=medium ++ ++ * New upstream release ++ ++ -- Samuel Thibault Fri, 29 Aug 2014 14:50:07 +0200 ++ ++hwloc (1.9-5) unstable; urgency=medium ++ ++ * Use dh_autoreconf. Closes: #755824. ++ * patches/desktop: Upstream patch to add desktop file for menu integration. ++ Closes: #758252. ++ * hwloc.install: Add desktop file. ++ ++ -- Samuel Thibault Thu, 21 Aug 2014 23:50:44 +0200 ++ ++hwloc (1.9-4) unstable; urgency=medium ++ ++ * Also ship lstopo-no-graphics in the hwloc package, to fix ++ hwloc-gather-topology, and possibly other scripts that people might be ++ using. Closes: #748927. ++ * Drop autotools-dev and help2man build-dependencies, now unused. ++ * Add --enable-doxygen to really build the documentation. ++ ++ -- Samuel Thibault Fri, 11 Jul 2014 10:11:54 +0200 ++ ++hwloc (1.9-3) unstable; urgency=medium ++ ++ * Use [!hurd-i386] instead of [!hurd-any], the latter doesn't seem to be ++ working. ++ ++ -- Samuel Thibault Fri, 02 May 2014 02:26:51 +0200 ++ ++hwloc (1.9-2) unstable; urgency=medium ++ ++ * Do not depend on opencl-icd on hurd. ++ ++ -- Samuel Thibault Thu, 01 May 2014 21:35:19 +0200 ++ ++hwloc (1.9-1) unstable; urgency=medium ++ ++ * New upstream release. ++ ++ -- Samuel Thibault Wed, 26 Mar 2014 12:36:58 +0100 ++ ++hwloc (1.8.1-1) unstable; urgency=medium ++ ++ * New upstream release. Closes: #737607. ++ ++ -- Samuel Thibault Tue, 04 Feb 2014 15:18:33 +0100 ++ ++hwloc (1.8-1) unstable; urgency=low ++ ++ * New upstream release. ++ * control: Update debian packaging VCS URL. ++ * Bump Standards-Version to 3.9.5 (no changes). ++ ++ -- Samuel Thibault Tue, 19 Nov 2013 13:59:51 +0100 ++ ++hwloc (1.7.2-1) unstable; urgency=low ++ ++ * New upstream release. ++ * Add ocl-icd-opencl-dev and opencl-headers build-dependencies to build opencl ++ plugin. ++ * Bump Standards-Version to 3.9.4 (no changes). ++ ++ -- Samuel Thibault Tue, 03 Sep 2013 12:41:33 +0200 ++ ++hwloc (1.7.1-1) unstable; urgency=low ++ ++ * New upstream release. ++ * Move generated header to multiarch place. Closes: #707748. ++ ++ -- Samuel Thibault Wed, 22 May 2013 01:14:30 +0200 ++ ++hwloc (1.7-3) unstable; urgency=low ++ ++ * Do not symlink lstopo into hwloc-info any more. ++ * control: explicitly build-depend on pkg-config for PCI support. ++ * patches/cpuset_ABI: Restore cpuset functions which were dropped without ++ soname bump. Closes: #707452. ++ ++ -- Samuel Thibault Tue, 14 May 2013 12:04:12 +0200 ++ ++hwloc (1.7-2) unstable; urgency=low ++ ++ * Upload to unstable. ++ * control: ++ - Make libhwloc5 Suggest libhwloc-contrib-plugins. ++ - Make libhwloc-plugins depend on libhwloc5. ++ ++ -- Samuel Thibault Tue, 07 May 2013 15:19:47 +0200 ++ ++hwloc (1.7-1) experimental; urgency=low ++ ++ * New upstream release. ++ * control: Replace libpci-dev build-dep with libpciaccess-dev. ++ ++ -- Samuel Thibault Thu, 11 Apr 2013 13:59:53 +0200 ++ ++hwloc (1.6.1-1) experimental; urgency=low ++ ++ * New upstream release. ++ * control: Make libhwloc-dev Multi-Arch: same. ++ ++ -- Samuel Thibault Fri, 18 Jan 2013 09:48:08 +0100 ++ ++hwloc (1.6-2) experimental; urgency=low ++ ++ * rules: Enable plugins. ++ * control: ++ - Add libltdl-dev build-depends. ++ - Add new hwloc-plugins package, containing libpci and libxml plugins. ++ ++ -- Samuel Thibault Fri, 07 Dec 2012 04:59:17 +0100 ++ ++hwloc (1.6-1) experimental; urgency=low ++ ++ * New upstream release. ++ * rules: Do not ignore all make distclean errors, only ignore Makefile not being ++ present. ++ ++ -- Samuel Thibault Mon, 03 Dec 2012 20:28:04 +0100 ++ ++hwloc (1.5-1) experimental; urgency=low ++ ++ * New upstream release. ++ * patches/unitialized_bytes_r4576,gfbsd-ftbfs_r4578: Remove, merged ++ upstream. ++ * rules: Do not build hwloc twice any more, use lstopo-no-graphics for the ++ hwloc-nox package. ++ ++ -- Samuel Thibault Mon, 30 Jul 2012 20:27:11 +0200 ++ ++hwloc (1.4.1-4) unstable; urgency=low ++ ++ * patches/gfbsd-ftbfs_r4578: New upstream patch to avoid missing ++ cpuset_setaffinity function on kfreebsd-any ++ * patches/unitialized_bytes_r4576: New upstream patch to fix uninitialized ++ pointers in topology structure. ++ ++ -- Samuel Thibault Sat, 07 Jul 2012 01:18:49 -0300 ++ ++hwloc (1.4.1-3) unstable; urgency=low ++ ++ [ Julien Cristau ] ++ * Restore ABI compatibility symlinks and provide/replace/conflict, except ++ with non-dangling symlinks this time. Closes: #664571. ++ ++ -- Samuel Thibault Fri, 06 Jul 2012 22:13:03 -0300 ++ ++hwloc (1.4.1-2) unstable; urgency=low ++ ++ * Remove ABI compatibility symlinks and provide/replace/conflict, ldconfig ++ actually removes them so they do not actually work. ++ ++ -- Samuel Thibault Wed, 28 Mar 2012 01:43:52 +0200 ++ ++hwloc (1.4.1-1) unstable; urgency=low ++ ++ * New upstream release. ++ * control: Bump Standards-Version to 3.9.3 (no changes). ++ ++ -- Samuel Thibault Sat, 25 Feb 2012 17:41:58 +0100 ++ ++hwloc (1.4-1) unstable; urgency=low ++ ++ * New upstream release, rename libhwloc4 package into libhwloc5 due to ++ soname change. ++ * Add ABI compatibility symlinks, and make libhwloc5 provide, replace and ++ conflict with previous versions. ++ ++ -- Samuel Thibault Thu, 26 Jan 2012 17:00:20 +0100 ++ ++hwloc (1.3.1-1) unstable; urgency=low ++ ++ * New upstream release. ++ * Add hwloc-dev dependency on libpci-dev. ++ ++ -- Samuel Thibault Tue, 20 Dec 2011 13:46:54 +0100 ++ ++hwloc (1.3-1) unstable; urgency=low ++ ++ * New upstream release, rename libhwloc3 package into libhwloc4 due to ++ soname change. ++ * debian/control: Build-Depend on libpci-dev. ++ ++ -- Samuel Thibault Sat, 12 Nov 2011 23:08:06 +0100 ++ ++hwloc (1.2.2-1) unstable; urgency=low ++ ++ * New upstream release. ++ * control: Depend on hardening-check. ++ * rules: Set DEB_BUILD_HARDENING=1 to enable hardening. ++ ++ -- Samuel Thibault Wed, 14 Sep 2011 17:18:20 +0200 ++ ++hwloc (1.2.1-1) unstable; urgency=low ++ ++ * New upstream release. ++ * debian/libhwloc-dev.install: Move pkg-config file to multiarch place. ++ ++ -- Samuel Thibault Thu, 09 Jun 2011 13:12:59 +0200 ++ ++hwloc (1.2-3) unstable; urgency=low ++ ++ * debian/rules: Set libdir to DEB_HOST_MULTIARCH. ++ * debian/control: Make libhwloc3 pre-depend on multiarch-support. ++ ++ -- Samuel Thibault Sun, 05 Jun 2011 12:38:54 +0200 ++ ++hwloc (1.2-2) unstable; urgency=low ++ ++ * debian/rules: Use DEB_HOST_GNU_TYPE for /usr/lib path until shlibdeps ++ finds libraries in DEB_HOST_MULTIARCH on any-i386. ++ ++ -- Samuel Thibault Sun, 08 May 2011 10:24:47 +0200 ++ ++hwloc (1.2-1) unstable; urgency=low ++ ++ * New upstream release, rename libhwloc2 package into libhwloc3 due to ++ soname change. ++ * debian/control: ++ - Build-depend on dpkg-dev (>= 1.16) ++ - Bump Standards-Version to 3.9.2 ++ * debian/rules: Use DEB_HOST_MULTIARCH for /usr/lib path. ++ ++ -- Samuel Thibault Sun, 10 Apr 2011 20:13:45 +0200 ++ ++hwloc (1.1.2-1) unstable; urgency=low ++ ++ * New upstream release. ++ * debian/control: Replace doxygen+texlive* build dependency with ++ doxygen-latex (Closes: Bug#616253). ++ ++ -- Samuel Thibault Thu, 03 Mar 2011 15:06:51 +0100 ++ ++hwloc (1.1.1-1) unstable; urgency=low ++ ++ * New upstream release, rename libhwloc1 package into libhwloc2 due to ++ soname change. ++ ++ -- Samuel Thibault Sun, 06 Feb 2011 04:28:37 +0100 ++ ++hwloc (1.1-2) experimental; urgency=low ++ ++ * Rename libhwloc0 packages name into libhwloc1 due to soname change. ++ ++ -- Samuel Thibault Mon, 03 Jan 2011 11:12:18 +0100 ++ ++hwloc (1.1-1) experimental; urgency=low ++ ++ * New upstream release. ++ - debian/patches/no-ibverbs-dep: Drop, merged upstream. ++ - debian/copyright: Update. ++ ++ -- Samuel Thibault Fri, 17 Dec 2010 01:51:24 +0100 ++ ++hwloc (1.0.2-2) unstable; urgency=low ++ ++ * debian/control: ++ - Bump Standards-Version to 3.9.1 (no change needed). ++ - Build-Depend on autoconf (>= 2.63), Build-conflicts with autoconf2.13 ++ * debian/rules: ++ - Run autoconf before build to permit autoconf patches. ++ - Remove configure on clean. ++ - Fix typo for parallel build. ++ * debian/patches/no-ibverbs-dep: New upstream patch to avoid libibverbs ++ dependency. ++ ++ -- Samuel Thibault Tue, 27 Jul 2010 11:43:35 +0200 ++ ++hwloc (1.0.2-1) unstable; urgency=low ++ ++ New upstream release. ++ * debian/hwloc-nox.manpages, debian/hwloc.manpages: Install hwloc.7 too. ++ * debian/libhwloc-doc.manpages: No need to install linux_* any more. ++ * debian/control: ++ - Bump Standards-Version to 3.9.0 (no change needed). ++ - Replace [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] with [linux-any]. ++ ++ -- Samuel Thibault Wed, 21 Jul 2010 22:09:08 +0200 ++ ++hwloc (1.0-1) unstable; urgency=low ++ ++ * New upstream release. ++ * debian/control: Build-Depend on cdbs. ++ * debian/rules: Include /usr/share/cdbs/1/class/langcore.mk instead of ++ parsing DEB_BUILD_OPTIONS by hand, enable parallel build. ++ ++ -- Samuel Thibault Tue, 18 May 2010 18:23:34 +0200 ++ ++hwloc (1.0~rc1-1) experimental; urgency=low ++ ++ * New upstream release canditate. ++ * debian/format/options: Switch to bz2 compression. ++ * debian/control: ++ - Fix libhwloc-common short description. ++ - Remove duplicate Section field. ++ - Bump Standards-Version to 3.8.4 (no change needed). ++ - Add libibverbs-dev Build-Depends on Linux ports. ++ * debian/rules: Pass --enable-static to configure. ++ * debian/hwloc-nox.install: Use a wildcard instead of the list of hwloc-* ++ tools. ++ ++ -- Samuel Thibault Tue, 20 Apr 2010 14:53:48 +0200 ++ ++hwloc (0.9.3~rc1-1) unstable; urgency=low ++ ++ * New upstream bugfix release. ++ * patches/binutils-gold.patch: Merged upstream. ++ * patches/hwloc-hello.patch: Merged upstream. ++ * control: Add Build-Depends-Indep: doxygen, texlive-latex-base, transfig to ++ regenerate the documentation. ++ ++ -- Samuel Thibault Tue, 24 Nov 2009 20:42:08 +0100 ++ ++hwloc (0.9.2-2) unstable; urgency=low ++ ++ * control: ++ - Enable libnuma-dev build-dep only on archs which have it. ++ - Add libncurses5-dev build-dep. ++ - Add expanded "Hardware Locality" in the description. ++ * rules: Run the testsuite but don't fail for now. ++ * source/format: Switch to 3.0 format (quilt). ++ * patches/binutils-gold.patch: Backported upstream patch to fix link ++ with binutils-gold. ++ * patches/hwloc-hello.patch: Backported upstream patch to always try ++ to run hwloc-hello. ++ * docs: Remove. ++ * libhwloc-doc.install: Move documentation to /usr/share/doc/libhwloc-doc. ++ * libhwloc-doc.docs: Add NEWS, README and html documentation. ++ * hwloc.docs, hwloc-nox.docs: Add NEWS and README files. ++ ++ -- Samuel Thibault Thu, 19 Nov 2009 03:35:18 +0100 ++ ++hwloc (0.9.2-1) unstable; urgency=low ++ ++ * Initial release (Closes: Bug#535615) ++ ++ -- Samuel Thibault Tue, 18 Aug 2009 01:35:03 +0200 diff --cc debian/compat index 0000000,0000000..ec63514 new file mode 100644 --- /dev/null +++ b/debian/compat @@@ -1,0 -1,0 +1,1 @@@ ++9 diff --cc debian/control index 0000000,0000000..9523274 new file mode 100644 --- /dev/null +++ b/debian/control @@@ -1,0 -1,0 +1,176 @@@ ++Source: hwloc ++Priority: optional ++Maintainer: Samuel Thibault ++Build-Depends: debhelper (>= 9), libltdl-dev, ++ valgrind [amd64 arm64 armhf i386 mips mipsel powerpc ppc64el s390x mips64el ppc64], ++ libcairo2-dev, libx11-dev, libxml2-dev, libxml2-utils, libncurses5-dev, ++ libnuma-dev [amd64 arm64 i386 ia64 mips mips64 mipsel mips64el powerpc ppc64el sparc], ++ libpciaccess-dev, pkg-config, ++ libibverbs-dev [linux-any], ++ ocl-icd-opencl-dev [!hurd-i386] | opencl-dev, opencl-headers, ++ autoconf (>= 2.63), ++ dh-autoreconf, ++ dpkg-dev (>= 1.16) ++Build-Depends-Indep: doxygen-latex, transfig ++Build-Conflicts: autoconf2.13 ++Standards-Version: 4.2.0 ++Section: libs ++Homepage: http://www.open-mpi.org/projects/hwloc/ ++Vcs-Git: https://github.com/open-mpi/hwloc-debian.git ++Vcs-Browser: https://github.com/open-mpi/hwloc-debian ++ ++Package: hwloc ++Section: admin ++Architecture: any ++Multi-Arch: foreign ++Depends: ${shlibs:Depends}, ${misc:Depends} ++Description: Hierarchical view of the machine - utilities ++ Hardware Locality (hwloc) provides a portable abstraction (across OS, versions, ++ architectures, ...) of the hierarchical topology of modern architectures. It ++ primarily aims at helping high-performance computing applications with ++ gathering information about the hardware so as to exploit it accordingly and ++ efficiently. ++ . ++ hwloc provides a hierarchical view of the machine, NUMA memory nodes, ++ sockets, shared caches, cores and simultaneous multithreading. It also gathers ++ various attributes such as cache and memory information. ++ . ++ hwloc supports old kernels not having sysfs topology information, ++ with knowledge of cpusets, offline cpus, and Kerrighed support ++ . ++ This package contains utilities to show the topology of the machine (lstopo and ++ hwloc-ls), manipulate cpu masks (hwloc-calc), and bind processes (hwloc-bind). ++ ++Package: hwloc-nox ++Section: admin ++Architecture: any ++Multi-Arch: foreign ++Depends: ${shlibs:Depends}, ${misc:Depends} ++Conflicts: hwloc ++Description: Hierarchical view of the machine - non-X version of utilities ++ Hardware Locality (hwloc) provides a portable abstraction (across OS, versions, ++ architectures, ...) of the hierarchical topology of modern architectures. It ++ primarily aims at helping high-performance computing applications with ++ gathering information about the hardware so as to exploit it accordingly and ++ efficiently. ++ . ++ hwloc provides a hierarchical view of the machine, NUMA memory nodes, ++ sockets, shared caches, cores and simultaneous multithreading. It also gathers ++ various attributes such as cache and memory information. ++ . ++ hwloc supports old kernels not having sysfs topology information, ++ with knowledge of cpusets, offline cpus, and Kerrighed support ++ . ++ This package contains utilities to show the topology of the machine (lstopo ++ and hwloc-ls, without X support), manipulate cpu masks (hwloc-calc), and bind ++ processes (hwloc-bind). ++ ++Package: libhwloc-dev ++Section: libdevel ++Architecture: any ++Multi-Arch: same ++Depends: ${misc:Depends}, libhwloc5 (= ${binary:Version}), libnuma-dev [amd64 arm64 i386 ia64 mips mips64 mipsel mips64el powerpc ppc64el sparc], libltdl-dev ++Description: Hierarchical view of the machine - static libs and headers ++ Hardware Locality (hwloc) provides a portable abstraction (across OS, versions, ++ architectures, ...) of the hierarchical topology of modern architectures. It ++ primarily aims at helping high-performance computing applications with ++ gathering information about the hardware so as to exploit it accordingly and ++ efficiently. ++ . ++ libhwloc provides a hierarchical view of the machine, NUMA memory nodes, ++ sockets, shared caches, cores and simultaneous multithreading. It also gathers ++ various attributes such as cache and memory information. ++ . ++ libhwloc supports old kernels not having sysfs topology information, ++ with knowledge of cpusets, offline cpus, and Kerrighed support ++ . ++ This package contains static libraries and development headers. ++ ++Package: libhwloc5 ++Architecture: any ++Multi-Arch: same ++Depends: ${shlibs:Depends}, ${misc:Depends} ++Recommends: libhwloc-plugins ++Breaks: libhwloc-plugins (<< 1.10~), libhwloc-contrib-plugins (<< 1.10~) ++Suggests: libhwloc-contrib-plugins ++Provides: libhwloc0, libhwloc1, libhwloc2, libhwloc3, libhwloc4 ++Replaces: libhwloc0, libhwloc1, libhwloc2, libhwloc3, libhwloc4 ++Conflicts: libhwloc0, libhwloc1, libhwloc2, libhwloc3, libhwloc4 ++Description: Hierarchical view of the machine - shared libs ++ libhwloc provides a portable abstraction (across OS, versions, ++ architectures, ...) of the hierarchical topology of modern architectures. It ++ primarily aims at helping high-performance computing applications with ++ gathering information about the hardware so as to exploit it accordingly and ++ efficiently. ++ . ++ libhwloc provides a hierarchical view of the machine, NUMA memory nodes, ++ sockets, shared caches, cores and simultaneous multithreading. It also gathers ++ various attributes such as cache and memory information. ++ . ++ libhwloc supports old kernels not having sysfs topology information, ++ with knowledge of cpusets, offline cpus, and Kerrighed support ++ . ++ This package contains shared libraries. ++ ++Package: libhwloc-plugins ++Architecture: any ++Multi-Arch: same ++Depends: ${shlibs:Depends}, ${misc:Depends}, libhwloc5 (>= ${source:Upstream-Version}~), libhwloc5 (<< ${source:Upstream-Version}A) ++Description: Hierarchical view of the machine - plugins ++ libhwloc provides a portable abstraction (across OS, versions, ++ architectures, ...) of the hierarchical topology of modern architectures. It ++ primarily aims at helping high-performance computing applications with ++ gathering information about the hardware so as to exploit it accordingly and ++ efficiently. ++ . ++ libhwloc provides a hierarchical view of the machine, NUMA memory nodes, ++ sockets, shared caches, cores and simultaneous multithreading. It also gathers ++ various attributes such as cache and memory information. ++ . ++ libhwloc supports old kernels not having sysfs topology information, ++ with knowledge of cpusets, offline cpus, and Kerrighed support ++ . ++ This package contains plugins to add more discovery support. This includes ++ - PCI support ++ - libxml support ++ ++Package: libhwloc-common ++Architecture: all ++Multi-Arch: foreign ++Depends: ${misc:Depends} ++Description: Hierarchical view of the machine - common files ++ Hardware Locality (hwloc) provides a portable abstraction (across OS, versions, ++ architectures, ...) of the hierarchical topology of modern architectures. It ++ primarily aims at helping high-performance computing applications with ++ gathering information about the hardware so as to exploit it accordingly and ++ efficiently. ++ . ++ libhwloc provides a hierarchical view of the machine, NUMA memory nodes, ++ sockets, shared caches, cores and simultaneous multithreading. It also gathers ++ various attributes such as cache and memory information. ++ . ++ libhwloc supports old kernels not having sysfs topology information, ++ with knowledge of cpusets, offline cpus, and Kerrighed support ++ . ++ This package contains the XML DTD of the lstopo XML output. ++ ++Package: libhwloc-doc ++Section: doc ++Architecture: all ++Multi-Arch: foreign ++Depends: ${misc:Depends}, libjs-jquery ++Description: Hierarchical view of the machine - documentation ++ Hardware Locality (hwloc) provides a portable abstraction (across OS, versions, ++ architectures, ...) of the hierarchical topology of modern architectures. It ++ primarily aims at helping high-performance computing applications with ++ gathering information about the hardware so as to exploit it accordingly and ++ efficiently. ++ . ++ libhwloc provides a hierarchical view of the machine, NUMA memory nodes, ++ sockets, shared caches, cores and simultaneous multithreading. It also gathers ++ various attributes such as cache and memory information. ++ . ++ libhwloc supports old kernels not having sysfs topology information, ++ with knowledge of cpusets, offline cpus, and Kerrighed support ++ . ++ This package contains documentation. diff --cc debian/copyright index 0000000,0000000..04cbc11 new file mode 100644 --- /dev/null +++ b/debian/copyright @@@ -1,0 -1,0 +1,52 @@@ ++This package was debianized by Samuel Thibault on ++Mon, 06 Jul 2009 10:55:29 +0200. ++ ++It was downloaded from http://www.open-mpi.org/projects/hwloc/ ++ ++Upstream Authors: ++ ++ Cédric Augonnet ++ Jérôme Clet-Ortega ++ Ludovic Courtès ++ Brice Goglin ++ Nathalie Furmento ++ Samuel Thibault ++ Jeff Squyres ++ ++Copyright: ++ ++ Copyright © 2009 CNRS ++ Copyright © 2009-2014 inria. All rights reserved. ++ Copyright © 2009-2014 Université Bordeaux 1 ++ Copyright © 2009-2014 Cisco Systems, Inc. All rights reserved. ++ ++License: ++ ++ 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. ++ ++The Debian packaging is: ++ ++ Copyright (C) 2009-2014 Samuel Thibault ++ ++and is licensed under the GPL version 3, ++see `/usr/share/common-licenses/GPL-3'. diff --cc debian/hwloc-nox.docs index 0000000,0000000..50bd824 new file mode 100644 --- /dev/null +++ b/debian/hwloc-nox.docs @@@ -1,0 -1,0 +1,2 @@@ ++NEWS ++README diff --cc debian/hwloc-nox.install index 0000000,0000000..acf94e3 new file mode 100644 --- /dev/null +++ b/debian/hwloc-nox.install @@@ -1,0 -1,0 +1,2 @@@ ++usr/bin/lstopo-no-graphics ++usr/bin/hwloc-* diff --cc debian/hwloc-nox.links index 0000000,0000000..e5104c9 new file mode 100644 --- /dev/null +++ b/debian/hwloc-nox.links @@@ -1,0 -1,0 +1,2 @@@ ++/usr/bin/lstopo-no-graphics /usr/bin/lstopo ++/usr/bin/lstopo /usr/bin/hwloc-ls diff --cc debian/hwloc-nox.manpages index 0000000,0000000..b09d6a9 new file mode 100644 --- /dev/null +++ b/debian/hwloc-nox.manpages @@@ -1,0 -1,0 +1,2 @@@ ++debian/tmp/usr/share/man/man1/*.1 ++debian/tmp/usr/share/man/man7/*.7 diff --cc debian/hwloc.docs index 0000000,0000000..50bd824 new file mode 100644 --- /dev/null +++ b/debian/hwloc.docs @@@ -1,0 -1,0 +1,2 @@@ ++NEWS ++README diff --cc debian/hwloc.install index 0000000,0000000..ea08b2d new file mode 100644 --- /dev/null +++ b/debian/hwloc.install @@@ -1,0 -1,0 +1,4 @@@ ++usr/bin/lstopo ++usr/bin/lstopo-no-graphics ++usr/bin/hwloc-* ++usr/share/applications diff --cc debian/hwloc.install.amd64 index 0000000,0000000..987e33c new file mode 120000 --- /dev/null +++ b/debian/hwloc.install.amd64 @@@ -1,0 -1,0 +1,1 @@@ ++hwloc.install.x86 diff --cc debian/hwloc.install.i386 index 0000000,0000000..987e33c new file mode 120000 --- /dev/null +++ b/debian/hwloc.install.i386 @@@ -1,0 -1,0 +1,1 @@@ ++hwloc.install.x86 diff --cc debian/hwloc.install.x32 index 0000000,0000000..987e33c new file mode 120000 --- /dev/null +++ b/debian/hwloc.install.x32 @@@ -1,0 -1,0 +1,1 @@@ ++hwloc.install.x86 diff --cc debian/hwloc.install.x86 index 0000000,0000000..9427a5c new file mode 100644 --- /dev/null +++ b/debian/hwloc.install.x86 @@@ -1,0 -1,0 +1,5 @@@ ++usr/bin/lstopo ++usr/bin/lstopo-no-graphics ++usr/bin/hwloc-* ++usr/share/applications ++usr/sbin diff --cc debian/hwloc.links index 0000000,0000000..1383634 new file mode 100644 --- /dev/null +++ b/debian/hwloc.links @@@ -1,0 -1,0 +1,1 @@@ ++/usr/bin/lstopo /usr/bin/hwloc-ls diff --cc debian/hwloc.manpages index 0000000,0000000..b09d6a9 new file mode 100644 --- /dev/null +++ b/debian/hwloc.manpages @@@ -1,0 -1,0 +1,2 @@@ ++debian/tmp/usr/share/man/man1/*.1 ++debian/tmp/usr/share/man/man7/*.7 diff --cc debian/libhwloc-common.install index 0000000,0000000..f4d081c new file mode 100644 --- /dev/null +++ b/debian/libhwloc-common.install @@@ -1,0 -1,0 +1,1 @@@ ++/usr/share/hwloc diff --cc debian/libhwloc-dev.install index 0000000,0000000..abebe49 new file mode 100644 --- /dev/null +++ b/debian/libhwloc-dev.install @@@ -1,0 -1,0 +1,4 @@@ ++usr/include/* ++usr/lib/*/lib*.a ++usr/lib/*/lib*.so ++usr/lib/*/pkgconfig/*.pc diff --cc debian/libhwloc-doc.docs index 0000000,0000000..7d50ca5 new file mode 100644 --- /dev/null +++ b/debian/libhwloc-doc.docs @@@ -1,0 -1,0 +1,4 @@@ ++NEWS ++README ++doc/doxygen-doc/html ++doc/examples/*.c diff --cc debian/libhwloc-doc.install index 0000000,0000000..c1199d9 new file mode 100644 --- /dev/null +++ b/debian/libhwloc-doc.install @@@ -1,0 -1,0 +1,1 @@@ ++/usr/share/doc/hwloc/* /usr/share/doc/libhwloc-doc/ diff --cc debian/libhwloc-doc.links index 0000000,0000000..ac5b4c6 new file mode 100644 --- /dev/null +++ b/debian/libhwloc-doc.links @@@ -1,0 -1,0 +1,1 @@@ ++/usr/share/javascript/jquery/jquery.js /usr/share/doc/libhwloc-doc/html/jquery.js diff --cc debian/libhwloc-doc.manpages index 0000000,0000000..242943a new file mode 100644 --- /dev/null +++ b/debian/libhwloc-doc.manpages @@@ -1,0 -1,0 +1,1 @@@ ++debian/tmp/usr/share/man/man3/*.3 diff --cc debian/libhwloc-plugins.install index 0000000,0000000..476929c new file mode 100644 --- /dev/null +++ b/debian/libhwloc-plugins.install @@@ -1,0 -1,0 +1,1 @@@ ++usr/lib/*/hwloc/*.so diff --cc debian/libhwloc5.install index 0000000,0000000..3ddde58 new file mode 100644 --- /dev/null +++ b/debian/libhwloc5.install @@@ -1,0 -1,0 +1,1 @@@ ++usr/lib/*/lib*.so.* diff --cc debian/libhwloc5.links.in index 0000000,0000000..ca75fcb new file mode 100644 --- /dev/null +++ b/debian/libhwloc5.links.in @@@ -1,0 -1,0 +1,5 @@@ ++usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.5 usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.0 ++usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.5 usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.1 ++usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.5 usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.2 ++usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.5 usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.3 ++usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.5 usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.4 diff --cc debian/patches/bashism index 0000000,0000000..1a09f0f new file mode 100644 --- /dev/null +++ b/debian/patches/bashism @@@ -1,0 -1,0 +1,8 @@@ ++--- a/utils/hwloc/hwloc-assembler-remote.in +++++ b/utils/hwloc/hwloc-assembler-remote.in ++@@ -1,4 +1,4 @@ ++-#!/bin/sh +++#!/bin/bash ++ #-*-sh-*- ++ ++ # diff --cc debian/patches/cpuset_ABI index 0000000,0000000..e10a275 new file mode 100644 --- /dev/null +++ b/debian/patches/cpuset_ABI @@@ -1,0 -1,0 +1,292 @@@ ++reverted: ++--- a/include/hwloc.h +++++ b/include/hwloc.h ++@@ -62,6 +62,7 @@ ++ */ ++ ++ #include +++#include ++ ++ ++ #ifdef __cplusplus ++--- a/include/Makefile.am +++++ b/include/Makefile.am ++@@ -12,6 +12,7 @@ include_HEADERS = hwloc.h ++ include_hwlocdir = $(includedir)/hwloc ++ include_hwloc_HEADERS = \ ++ hwloc/bitmap.h \ +++ hwloc/cpuset.h \ ++ hwloc/helper.h \ ++ hwloc/inlines.h \ ++ hwloc/diff.h \ ++--- /dev/null +++++ b/include/hwloc/cpuset.h ++@@ -0,0 +1,75 @@ +++/* +++ * Copyright © 2009 CNRS +++ * Copyright © 2009-2010 inria. All rights reserved. +++ * Copyright © 2009-2010, 2013 Université Bordeaux 1 +++ * Copyright © 2009-2010 Cisco Systems, Inc. All rights reserved. +++ * See COPYING in top-level directory. +++ */ +++ +++/** \file +++ * \brief The old deprecated Cpuset API. +++ * This interface should not be used anymore, it will be dropped in a later release. +++ * +++ * hwloc/bitmap.h should be used instead. Most hwloc_cpuset_foo functions are +++ * replaced with hwloc_bitmap_foo. The only exceptions are: +++ * - hwloc_cpuset_from_string -> hwloc_bitmap_sscanf +++ * - hwloc_cpuset_cpu -> hwloc_bitmap_only +++ * - hwloc_cpuset_all_but_cpu -> hwloc_bitmap_allbut +++ */ +++ +++#ifndef HWLOC_CPUSET_H +++#define HWLOC_CPUSET_H +++ +++#ifdef __cplusplus +++extern "C" { +++#endif +++ +++#include "hwloc/bitmap.h" +++ +++static __hwloc_inline hwloc_bitmap_t __hwloc_attribute_deprecated hwloc_cpuset_alloc(void) { return hwloc_bitmap_alloc(); } +++static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_free(hwloc_bitmap_t bitmap) { hwloc_bitmap_free(bitmap); } +++static __hwloc_inline hwloc_bitmap_t __hwloc_attribute_deprecated hwloc_cpuset_dup(hwloc_const_bitmap_t bitmap) { return hwloc_bitmap_dup(bitmap); } +++static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_copy(hwloc_bitmap_t dst, hwloc_const_bitmap_t src) { hwloc_bitmap_copy(dst, src); } +++static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_snprintf(char * __hwloc_restrict buf, size_t buflen, hwloc_const_bitmap_t bitmap) { return hwloc_bitmap_snprintf(buf, buflen, bitmap); } +++static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_asprintf(char ** strp, hwloc_const_bitmap_t bitmap) { return hwloc_bitmap_asprintf(strp, bitmap); } +++static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_from_string(hwloc_bitmap_t bitmap, const char * __hwloc_restrict string) { return hwloc_bitmap_sscanf(bitmap, string); } +++static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_zero(hwloc_bitmap_t bitmap) { hwloc_bitmap_zero(bitmap); } +++static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_fill(hwloc_bitmap_t bitmap) { hwloc_bitmap_fill(bitmap); } +++static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_from_ulong(hwloc_bitmap_t bitmap, unsigned long mask) { hwloc_bitmap_from_ulong(bitmap, mask); } +++static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_from_ith_ulong(hwloc_bitmap_t bitmap, unsigned i, unsigned long mask) { hwloc_bitmap_from_ith_ulong(bitmap, i, mask); } +++static __hwloc_inline unsigned __hwloc_attribute_deprecated long hwloc_cpuset_to_ulong(hwloc_const_bitmap_t bitmap) { return hwloc_bitmap_to_ulong(bitmap); } +++static __hwloc_inline unsigned __hwloc_attribute_deprecated long hwloc_cpuset_to_ith_ulong(hwloc_const_bitmap_t bitmap, unsigned i) { return hwloc_bitmap_to_ith_ulong(bitmap, i); } +++static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_cpu(hwloc_bitmap_t bitmap, unsigned index_) { hwloc_bitmap_only(bitmap, index_); } +++static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_all_but_cpu(hwloc_bitmap_t bitmap, unsigned index_) { hwloc_bitmap_allbut(bitmap, index_); } +++static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_set(hwloc_bitmap_t bitmap, unsigned index_) { hwloc_bitmap_set(bitmap, index_); } +++static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_set_range(hwloc_bitmap_t bitmap, unsigned begin, unsigned end) { hwloc_bitmap_set_range(bitmap, begin, end); } +++static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_set_ith_ulong(hwloc_bitmap_t bitmap, unsigned i, unsigned long mask) { hwloc_bitmap_set_ith_ulong(bitmap, i, mask); } +++static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_clr(hwloc_bitmap_t bitmap, unsigned index_) { hwloc_bitmap_clr(bitmap, index_); } +++static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_clr_range(hwloc_bitmap_t bitmap, unsigned begin, unsigned end) { hwloc_bitmap_clr_range(bitmap, begin, end); } +++static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_isset(hwloc_const_bitmap_t bitmap, unsigned index_) { return hwloc_bitmap_isset(bitmap, index_); } +++static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_iszero(hwloc_const_bitmap_t bitmap) { return hwloc_bitmap_iszero(bitmap); } +++static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_isfull(hwloc_const_bitmap_t bitmap) { return hwloc_bitmap_isfull(bitmap); } +++static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_isequal(hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) { return hwloc_bitmap_isequal(bitmap1, bitmap2); } +++static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_intersects(hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) { return hwloc_bitmap_intersects(bitmap1, bitmap2); } +++static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_isincluded(hwloc_const_bitmap_t sub_bitmap, hwloc_const_bitmap_t super_bitmap) { return hwloc_bitmap_isincluded(sub_bitmap, super_bitmap); } +++static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_or(hwloc_bitmap_t res, hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) { hwloc_bitmap_or(res, bitmap1, bitmap2); } +++static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_and(hwloc_bitmap_t res, hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) { hwloc_bitmap_and(res, bitmap1, bitmap2); } +++static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_andnot(hwloc_bitmap_t res, hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) { hwloc_bitmap_andnot(res, bitmap1, bitmap2); } +++static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_xor(hwloc_bitmap_t res, hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) { hwloc_bitmap_xor(res, bitmap1, bitmap2); } +++static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_not(hwloc_bitmap_t res, hwloc_const_bitmap_t bitmap) { hwloc_bitmap_not(res, bitmap); } +++static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_first(hwloc_const_bitmap_t bitmap) { return hwloc_bitmap_first(bitmap); } +++static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_last(hwloc_const_bitmap_t bitmap) { return hwloc_bitmap_last(bitmap); } +++static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_next(hwloc_const_bitmap_t bitmap, unsigned prev) { return hwloc_bitmap_next(bitmap, prev); } +++static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_singlify(hwloc_bitmap_t bitmap) { hwloc_bitmap_singlify(bitmap); } +++static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_compare_first(hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) { return hwloc_bitmap_compare_first(bitmap1, bitmap2); } +++static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_compare(hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) { return hwloc_bitmap_compare(bitmap1, bitmap2); } +++static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_weight(hwloc_const_bitmap_t bitmap) { return hwloc_bitmap_weight(bitmap); } +++ +++#define hwloc_cpuset_foreach_begin hwloc_bitmap_foreach_begin +++#define hwloc_cpuset_foreach_end hwloc_bitmap_foreach_end +++ +++#ifdef __cplusplus +++} /* extern "C" */ +++#endif +++ +++#endif /* HWLOC_CPUSET_H */ ++--- a/include/hwloc/rename.h +++++ b/include/hwloc/rename.h ++@@ -297,6 +297,51 @@ extern "C" { ++ #define hwloc_bitmap_compare HWLOC_NAME(bitmap_compare) ++ #define hwloc_bitmap_weight HWLOC_NAME(bitmap_weight) ++ +++/* hwloc/cpuset.h -- deprecated but still available */ +++ +++#define hwloc_cpuset_alloc HWLOC_NAME(cpuset_alloc) +++#define hwloc_cpuset_free HWLOC_NAME(cpuset_free) +++#define hwloc_cpuset_dup HWLOC_NAME(cpuset_dup) +++#define hwloc_cpuset_copy HWLOC_NAME(cpuset_copy) +++#define hwloc_cpuset_snprintf HWLOC_NAME(cpuset_snprintf) +++#define hwloc_cpuset_asprintf HWLOC_NAME(cpuset_asprintf) +++#define hwloc_cpuset_from_string HWLOC_NAME(cpuset_from_string) +++#define hwloc_cpuset_zero HWLOC_NAME(cpuset_zero) +++#define hwloc_cpuset_fill HWLOC_NAME(cpuset_fill) +++#define hwloc_cpuset_from_ulong HWLOC_NAME(cpuset_from_ulong) +++#define hwloc_cpuset_taskset_snprintf HWLOC_NAME(cpuset_taskset_snprintf) +++#define hwloc_cpuset_taskset_asprintf HWLOC_NAME(cpuset_taskset_asprintf) +++#define hwloc_cpuset_taskset_sscanf HWLOC_NAME(cpuset_taskset_sscanf) +++ +++#define hwloc_cpuset_from_ith_ulong HWLOC_NAME(cpuset_from_ith_ulong) +++#define hwloc_cpuset_to_ulong HWLOC_NAME(cpuset_to_ulong) +++#define hwloc_cpuset_to_ith_ulong HWLOC_NAME(cpuset_to_ith_ulong) +++#define hwloc_cpuset_cpu HWLOC_NAME(cpuset_cpu) +++#define hwloc_cpuset_all_but_cpu HWLOC_NAME(cpuset_all_but_cpu) +++#define hwloc_cpuset_set HWLOC_NAME(cpuset_set) +++#define hwloc_cpuset_set_range HWLOC_NAME(cpuset_set_range) +++#define hwloc_cpuset_set_ith_ulong HWLOC_NAME(cpuset_set_ith_ulong) +++#define hwloc_cpuset_clr HWLOC_NAME(cpuset_clr) +++#define hwloc_cpuset_clr_range HWLOC_NAME(cpuset_clr_range) +++#define hwloc_cpuset_isset HWLOC_NAME(cpuset_isset) +++#define hwloc_cpuset_iszero HWLOC_NAME(cpuset_iszero) +++#define hwloc_cpuset_isfull HWLOC_NAME(cpuset_isfull) +++#define hwloc_cpuset_isequal HWLOC_NAME(cpuset_isequal) +++#define hwloc_cpuset_intersects HWLOC_NAME(cpuset_intersects) +++#define hwloc_cpuset_isincluded HWLOC_NAME(cpuset_isincluded) +++#define hwloc_cpuset_or HWLOC_NAME(cpuset_or) +++#define hwloc_cpuset_and HWLOC_NAME(cpuset_and) +++#define hwloc_cpuset_andnot HWLOC_NAME(cpuset_andnot) +++#define hwloc_cpuset_xor HWLOC_NAME(cpuset_xor) +++#define hwloc_cpuset_not HWLOC_NAME(cpuset_not) +++#define hwloc_cpuset_first HWLOC_NAME(cpuset_first) +++#define hwloc_cpuset_last HWLOC_NAME(cpuset_last) +++#define hwloc_cpuset_next HWLOC_NAME(cpuset_next) +++#define hwloc_cpuset_singlify HWLOC_NAME(cpuset_singlify) +++#define hwloc_cpuset_compare_first HWLOC_NAME(cpuset_compare_first) +++#define hwloc_cpuset_compare HWLOC_NAME(cpuset_compare) +++#define hwloc_cpuset_weight HWLOC_NAME(cpuset_weight) +++ ++ /* hwloc/helper.h */ ++ ++ #define hwloc_get_type_or_below_depth HWLOC_NAME(get_type_or_below_depth) ++--- a/src/bitmap.c +++++ b/src/bitmap.c ++@@ -6,6 +6,14 @@ ++ * See COPYING in top-level directory. ++ */ ++ +++/* cpuset.h converts from the old cpuset API to the new bitmap API, we don't want it here */ +++#ifndef HWLOC_CPUSET_H +++/* make sure cpuset.h will not be automatically included here */ +++#define HWLOC_CPUSET_H 1 +++#else +++#error Do not include cpuset.h in cpuset.c +++#endif +++ ++ #include ++ #include ++ #include ++@@ -1159,3 +1167,101 @@ int hwloc_bitmap_weight(const struct hwl ++ ++ return result; ++ } +++ +++ +++/******************************************************************** +++ * everything below should be dropped when hwloc/cpuset.h is dropped +++ */ +++ +++/* for HWLOC_DECLSPEC */ +++#include +++ +++/* forward declarations (public headers do not export this API anymore) */ +++HWLOC_DECLSPEC struct hwloc_bitmap_s * hwloc_cpuset_alloc(void); +++HWLOC_DECLSPEC void hwloc_cpuset_free(struct hwloc_bitmap_s * set); +++HWLOC_DECLSPEC struct hwloc_bitmap_s * hwloc_cpuset_dup(const struct hwloc_bitmap_s * old); +++HWLOC_DECLSPEC void hwloc_cpuset_copy(struct hwloc_bitmap_s * dst, const struct hwloc_bitmap_s * src); +++HWLOC_DECLSPEC int hwloc_cpuset_snprintf(char * __hwloc_restrict buf, size_t buflen, const struct hwloc_bitmap_s * __hwloc_restrict set); +++HWLOC_DECLSPEC int hwloc_cpuset_asprintf(char ** strp, const struct hwloc_bitmap_s * __hwloc_restrict set); +++HWLOC_DECLSPEC int hwloc_cpuset_from_string(struct hwloc_bitmap_s *set, const char * __hwloc_restrict string); +++HWLOC_DECLSPEC int hwloc_cpuset_taskset_snprintf(char * __hwloc_restrict buf, size_t buflen, const struct hwloc_bitmap_s * __hwloc_restrict set); +++HWLOC_DECLSPEC int hwloc_cpuset_taskset_asprintf(char ** strp, const struct hwloc_bitmap_s * __hwloc_restrict set); +++HWLOC_DECLSPEC int hwloc_cpuset_taskset_sscanf(struct hwloc_bitmap_s *set, const char * __hwloc_restrict string); +++HWLOC_DECLSPEC void hwloc_cpuset_zero(struct hwloc_bitmap_s * set); +++HWLOC_DECLSPEC void hwloc_cpuset_fill(struct hwloc_bitmap_s * set); +++HWLOC_DECLSPEC void hwloc_cpuset_from_ulong(struct hwloc_bitmap_s *set, unsigned long mask); +++HWLOC_DECLSPEC void hwloc_cpuset_from_ith_ulong(struct hwloc_bitmap_s *set, unsigned i, unsigned long mask); +++HWLOC_DECLSPEC unsigned long hwloc_cpuset_to_ulong(const struct hwloc_bitmap_s *set); +++HWLOC_DECLSPEC unsigned long hwloc_cpuset_to_ith_ulong(const struct hwloc_bitmap_s *set, unsigned i); +++HWLOC_DECLSPEC void hwloc_cpuset_cpu(struct hwloc_bitmap_s * set, unsigned cpu); +++HWLOC_DECLSPEC void hwloc_cpuset_all_but_cpu(struct hwloc_bitmap_s * set, unsigned cpu); +++HWLOC_DECLSPEC void hwloc_cpuset_set(struct hwloc_bitmap_s * set, unsigned cpu); +++HWLOC_DECLSPEC void hwloc_cpuset_set_range(struct hwloc_bitmap_s * set, unsigned begincpu, unsigned endcpu); +++HWLOC_DECLSPEC void hwloc_cpuset_set_ith_ulong(struct hwloc_bitmap_s *set, unsigned i, unsigned long mask); +++HWLOC_DECLSPEC void hwloc_cpuset_clr(struct hwloc_bitmap_s * set, unsigned cpu); +++HWLOC_DECLSPEC void hwloc_cpuset_clr_range(struct hwloc_bitmap_s * set, unsigned begincpu, unsigned endcpu); +++HWLOC_DECLSPEC int hwloc_cpuset_isset(const struct hwloc_bitmap_s * set, unsigned cpu); +++HWLOC_DECLSPEC int hwloc_cpuset_iszero(const struct hwloc_bitmap_s *set); +++HWLOC_DECLSPEC int hwloc_cpuset_isfull(const struct hwloc_bitmap_s *set); +++HWLOC_DECLSPEC int hwloc_cpuset_isequal(const struct hwloc_bitmap_s *set1, const struct hwloc_bitmap_s *set2); +++HWLOC_DECLSPEC int hwloc_cpuset_intersects(const struct hwloc_bitmap_s *set1, const struct hwloc_bitmap_s *set2); +++HWLOC_DECLSPEC int hwloc_cpuset_isincluded(const struct hwloc_bitmap_s *sub_set, const struct hwloc_bitmap_s *super_set); +++HWLOC_DECLSPEC void hwloc_cpuset_or(struct hwloc_bitmap_s *res, const struct hwloc_bitmap_s *set1, const struct hwloc_bitmap_s *set2); +++HWLOC_DECLSPEC void hwloc_cpuset_and(struct hwloc_bitmap_s *res, const struct hwloc_bitmap_s *set1, const struct hwloc_bitmap_s *set2); +++HWLOC_DECLSPEC void hwloc_cpuset_andnot(struct hwloc_bitmap_s *res, const struct hwloc_bitmap_s *set1, const struct hwloc_bitmap_s *set2); +++HWLOC_DECLSPEC void hwloc_cpuset_xor(struct hwloc_bitmap_s *res, const struct hwloc_bitmap_s *set1, const struct hwloc_bitmap_s *set2); +++HWLOC_DECLSPEC void hwloc_cpuset_not(struct hwloc_bitmap_s *res, const struct hwloc_bitmap_s *set); +++HWLOC_DECLSPEC int hwloc_cpuset_first(const struct hwloc_bitmap_s * set); +++HWLOC_DECLSPEC int hwloc_cpuset_last(const struct hwloc_bitmap_s * set); +++HWLOC_DECLSPEC int hwloc_cpuset_next(const struct hwloc_bitmap_s * set, unsigned prev_cpu); +++HWLOC_DECLSPEC void hwloc_cpuset_singlify(struct hwloc_bitmap_s * set); +++HWLOC_DECLSPEC int hwloc_cpuset_compare_first(const struct hwloc_bitmap_s * set1, const struct hwloc_bitmap_s * set2); +++HWLOC_DECLSPEC int hwloc_cpuset_compare(const struct hwloc_bitmap_s * set1, const struct hwloc_bitmap_s * set2); +++HWLOC_DECLSPEC int hwloc_cpuset_weight(const struct hwloc_bitmap_s * set); +++ +++/* actual symbols converting from cpuset ABI into bitmap ABI */ +++struct hwloc_bitmap_s * hwloc_cpuset_alloc(void) { return hwloc_bitmap_alloc(); } +++void hwloc_cpuset_free(struct hwloc_bitmap_s * set) { hwloc_bitmap_free(set); } +++struct hwloc_bitmap_s * hwloc_cpuset_dup(const struct hwloc_bitmap_s * old) { return hwloc_bitmap_dup(old); } +++void hwloc_cpuset_copy(struct hwloc_bitmap_s * dst, const struct hwloc_bitmap_s * src) { hwloc_bitmap_copy(dst, src); } +++int hwloc_cpuset_snprintf(char * __hwloc_restrict buf, size_t buflen, const struct hwloc_bitmap_s * __hwloc_restrict set) { return hwloc_bitmap_snprintf(buf, buflen, set); } +++int hwloc_cpuset_asprintf(char ** strp, const struct hwloc_bitmap_s * __hwloc_restrict set) { return hwloc_bitmap_asprintf(strp, set); } +++int hwloc_cpuset_from_string(struct hwloc_bitmap_s *set, const char * __hwloc_restrict string) { return hwloc_bitmap_sscanf(set, string); } +++int hwloc_cpuset_taskset_snprintf(char * __hwloc_restrict buf, size_t buflen, const struct hwloc_bitmap_s * __hwloc_restrict set) { return hwloc_bitmap_taskset_snprintf(buf, buflen, set); } +++int hwloc_cpuset_taskset_asprintf(char ** strp, const struct hwloc_bitmap_s * __hwloc_restrict set) { return hwloc_bitmap_taskset_asprintf(strp, set); } +++int hwloc_cpuset_taskset_sscanf(struct hwloc_bitmap_s *set, const char * __hwloc_restrict string) { return hwloc_bitmap_taskset_sscanf(set, string); } +++void hwloc_cpuset_zero(struct hwloc_bitmap_s * set) { hwloc_bitmap_zero(set); } +++void hwloc_cpuset_fill(struct hwloc_bitmap_s * set) { hwloc_bitmap_fill(set); } +++void hwloc_cpuset_from_ulong(struct hwloc_bitmap_s *set, unsigned long mask) { hwloc_bitmap_from_ulong(set, mask); } +++void hwloc_cpuset_from_ith_ulong(struct hwloc_bitmap_s *set, unsigned i, unsigned long mask) { hwloc_bitmap_from_ith_ulong(set, i, mask); } +++unsigned long hwloc_cpuset_to_ulong(const struct hwloc_bitmap_s *set) { return hwloc_bitmap_to_ulong(set); } +++unsigned long hwloc_cpuset_to_ith_ulong(const struct hwloc_bitmap_s *set, unsigned i) { return hwloc_bitmap_to_ith_ulong(set, i); } +++void hwloc_cpuset_cpu(struct hwloc_bitmap_s * set, unsigned cpu) { hwloc_bitmap_only(set, cpu); } +++void hwloc_cpuset_all_but_cpu(struct hwloc_bitmap_s * set, unsigned cpu) { hwloc_bitmap_allbut(set, cpu); } +++void hwloc_cpuset_set(struct hwloc_bitmap_s * set, unsigned cpu) { hwloc_bitmap_set(set, cpu); } +++void hwloc_cpuset_set_range(struct hwloc_bitmap_s * set, unsigned begincpu, unsigned endcpu) { hwloc_bitmap_set_range(set, begincpu, endcpu); } +++void hwloc_cpuset_set_ith_ulong(struct hwloc_bitmap_s *set, unsigned i, unsigned long mask) { hwloc_bitmap_set_ith_ulong(set, i, mask); } +++void hwloc_cpuset_clr(struct hwloc_bitmap_s * set, unsigned cpu) { hwloc_bitmap_clr(set, cpu); } +++void hwloc_cpuset_clr_range(struct hwloc_bitmap_s * set, unsigned begincpu, unsigned endcpu) { hwloc_bitmap_clr_range(set, begincpu, endcpu); } +++int hwloc_cpuset_isset(const struct hwloc_bitmap_s * set, unsigned cpu) { return hwloc_bitmap_isset(set, cpu); } +++int hwloc_cpuset_iszero(const struct hwloc_bitmap_s *set) { return hwloc_bitmap_iszero(set); } +++int hwloc_cpuset_isfull(const struct hwloc_bitmap_s *set) { return hwloc_bitmap_isfull(set); } +++int hwloc_cpuset_isequal(const struct hwloc_bitmap_s *set1, const struct hwloc_bitmap_s *set2) { return hwloc_bitmap_isequal(set1, set2); } +++int hwloc_cpuset_intersects(const struct hwloc_bitmap_s *set1, const struct hwloc_bitmap_s *set2) { return hwloc_bitmap_intersects(set1, set2); } +++int hwloc_cpuset_isincluded(const struct hwloc_bitmap_s *sub_set, const struct hwloc_bitmap_s *super_set) { return hwloc_bitmap_isincluded(sub_set, super_set); } +++void hwloc_cpuset_or(struct hwloc_bitmap_s *res, const struct hwloc_bitmap_s *set1, const struct hwloc_bitmap_s *set2) { hwloc_bitmap_or(res, set1, set2); } +++void hwloc_cpuset_and(struct hwloc_bitmap_s *res, const struct hwloc_bitmap_s *set1, const struct hwloc_bitmap_s *set2) { hwloc_bitmap_and(res, set1, set2); } +++void hwloc_cpuset_andnot(struct hwloc_bitmap_s *res, const struct hwloc_bitmap_s *set1, const struct hwloc_bitmap_s *set2) { hwloc_bitmap_andnot(res, set1, set2); } +++void hwloc_cpuset_xor(struct hwloc_bitmap_s *res, const struct hwloc_bitmap_s *set1, const struct hwloc_bitmap_s *set2) { hwloc_bitmap_xor(res, set1, set2); } +++void hwloc_cpuset_not(struct hwloc_bitmap_s *res, const struct hwloc_bitmap_s *set) { hwloc_bitmap_not(res, set); } +++int hwloc_cpuset_first(const struct hwloc_bitmap_s * set) { return hwloc_bitmap_first(set); } +++int hwloc_cpuset_last(const struct hwloc_bitmap_s * set) { return hwloc_bitmap_last(set); } +++int hwloc_cpuset_next(const struct hwloc_bitmap_s * set, unsigned prev_cpu) { return hwloc_bitmap_next(set, prev_cpu); } +++void hwloc_cpuset_singlify(struct hwloc_bitmap_s * set) { hwloc_bitmap_singlify(set); } +++int hwloc_cpuset_compare_first(const struct hwloc_bitmap_s * set1, const struct hwloc_bitmap_s * set2) { return hwloc_bitmap_compare_first(set1, set2); } +++int hwloc_cpuset_compare(const struct hwloc_bitmap_s * set1, const struct hwloc_bitmap_s * set2) { return hwloc_bitmap_compare(set1, set2); } +++int hwloc_cpuset_weight(const struct hwloc_bitmap_s * set) { return hwloc_bitmap_weight(set); } +++ +++/* +++ * end of everything to be dropped when hwloc/cpuset.h is dropped +++ *****************************************************************/ ++--- a/include/Makefile.in +++++ b/include/Makefile.in ++@@ -143,7 +143,7 @@ am__uninstall_files_from_dir = { \ ++ am__installdirs = "$(DESTDIR)$(includedir)" \ ++ "$(DESTDIR)$(include_hwlocdir)" \ ++ "$(DESTDIR)$(include_hwloc_autogendir)" ++-am__include_hwloc_HEADERS_DIST = hwloc/bitmap.h hwloc/helper.h \ +++am__include_hwloc_HEADERS_DIST = hwloc/bitmap.h hwloc/cpuset.h hwloc/helper.h \ ++ hwloc/inlines.h hwloc/diff.h hwloc/myriexpress.h \ ++ hwloc/openfabrics-verbs.h hwloc/opencl.h hwloc/cuda.h \ ++ hwloc/cudart.h hwloc/nvml.h hwloc/plugins.h hwloc/gl.h \ ++@@ -378,7 +378,7 @@ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++ @HWLOC_BUILD_STANDALONE_TRUE@include_HEADERS = hwloc.h ++ @HWLOC_BUILD_STANDALONE_TRUE@include_hwlocdir = $(includedir)/hwloc ++-@HWLOC_BUILD_STANDALONE_TRUE@include_hwloc_HEADERS = hwloc/bitmap.h \ +++@HWLOC_BUILD_STANDALONE_TRUE@include_hwloc_HEADERS = hwloc/bitmap.h hwloc/cpuset.h \ ++ @HWLOC_BUILD_STANDALONE_TRUE@ hwloc/helper.h hwloc/inlines.h \ ++ @HWLOC_BUILD_STANDALONE_TRUE@ hwloc/diff.h hwloc/myriexpress.h \ ++ @HWLOC_BUILD_STANDALONE_TRUE@ hwloc/openfabrics-verbs.h \ diff --cc debian/patches/series index 0000000,0000000..850ba94 new file mode 100644 --- /dev/null +++ b/debian/patches/series @@@ -1,0 -1,0 +1,2 @@@ ++cpuset_ABI ++bashism diff --cc debian/rules index 0000000,0000000..afe27bd new file mode 100755 --- /dev/null +++ b/debian/rules @@@ -1,0 -1,0 +1,27 @@@ ++#!/usr/bin/make -f ++ ++%: ++ dh $@ --with autoreconf --parallel ++ ++DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) ++ ++override_dh_auto_configure: ++ dh_auto_configure -- --enable-static --enable-plugins --enable-doxygen ++ ++override_dh_auto_install: ++ dh_auto_install ++ ++ mkdir -p $(CURDIR)/debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/hwloc/autogen ++ mv $(CURDIR)/debian/tmp/usr/include/hwloc/autogen/config.h $(CURDIR)/debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/hwloc/autogen/ ++ ++debian/libhwloc5.links: debian/libhwloc5.links.in ++ sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' < $< > $@ ++override_dh_link: debian/libhwloc5.links ++ dh_link ++ ++override_dh_clean: ++ dh_clean ++ rm -f debian/libhwloc5.links ++ ++override_dh_makeshlibs: ++ dh_makeshlibs -V diff --cc debian/source/format index 0000000,0000000..163aaf8 new file mode 100644 --- /dev/null +++ b/debian/source/format @@@ -1,0 -1,0 +1,1 @@@ ++3.0 (quilt) diff --cc debian/source/options index 0000000,0000000..8f04d6d new file mode 100644 --- /dev/null +++ b/debian/source/options @@@ -1,0 -1,0 +1,1 @@@ ++compression = "bzip2" diff --cc debian/tests/allowed index 0000000,0000000..9252bbb new file mode 100644 --- /dev/null +++ b/debian/tests/allowed @@@ -1,0 -1,0 +1,2 @@@ ++#!/bin/sh ++test=tests/linux/allowed/test-topology.sh /bin/sh ./debian/tests/test-util tests/linux/allowed/test1.output diff --cc debian/tests/annotate index 0000000,0000000..13fac40 new file mode 100644 --- /dev/null +++ b/debian/tests/annotate @@@ -1,0 -1,0 +1,2 @@@ ++#!/bin/sh ++test=utils/hwloc/test-hwloc-annotate.sh /bin/sh ./debian/tests/test-util diff --cc debian/tests/assembler index 0000000,0000000..8b8f5e0 new file mode 100644 --- /dev/null +++ b/debian/tests/assembler @@@ -1,0 -1,0 +1,2 @@@ ++#!/bin/sh ++test=utils/hwloc/test-hwloc-assembler.sh /bin/sh ./debian/tests/test-util diff --cc debian/tests/calc index 0000000,0000000..b83cb8d new file mode 100644 --- /dev/null +++ b/debian/tests/calc @@@ -1,0 -1,0 +1,2 @@@ ++#!/bin/sh ++test=utils/hwloc/test-hwloc-calc.sh /bin/sh ./debian/tests/test-util diff --cc debian/tests/compress-dir index 0000000,0000000..6aab67a new file mode 100644 --- /dev/null +++ b/debian/tests/compress-dir @@@ -1,0 -1,0 +1,2 @@@ ++#!/bin/sh ++test=utils/hwloc/test-hwloc-compress-dir.sh /bin/sh ./debian/tests/test-util diff --cc debian/tests/control index 0000000,0000000..d469947 new file mode 100644 --- /dev/null +++ b/debian/tests/control @@@ -1,0 -1,0 +1,9 @@@ ++Depends: hwloc-nox | hwloc ++Tests: lstopo distances calc annotate assembler compress-dir distrib fake-plugin info gather allowed ++ ++Depends: hwloc-nox | hwloc ++Tests: diffpatch linux ++Restrictions: allow-stderr ++ ++Depends: hwloc-nox | hwloc, libxml2-utils ++Tests: xml diff --cc debian/tests/diffpatch index 0000000,0000000..cd553cf new file mode 100644 --- /dev/null +++ b/debian/tests/diffpatch @@@ -1,0 -1,0 +1,2 @@@ ++#!/bin/sh ++test=utils/hwloc/test-hwloc-diffpatch.sh /bin/sh ./debian/tests/test-util diff --cc debian/tests/distances index 0000000,0000000..e5b70a9 new file mode 100644 --- /dev/null +++ b/debian/tests/distances @@@ -1,0 -1,0 +1,2 @@@ ++#!/bin/sh ++test=utils/hwloc/test-hwloc-distances.sh /bin/sh ./debian/tests/test-util diff --cc debian/tests/distrib index 0000000,0000000..aaa8225 new file mode 100644 --- /dev/null +++ b/debian/tests/distrib @@@ -1,0 -1,0 +1,2 @@@ ++#!/bin/sh ++test=utils/hwloc/test-hwloc-distrib.sh /bin/sh ./debian/tests/test-util diff --cc debian/tests/fake-plugin index 0000000,0000000..c0e17f0 new file mode 100644 --- /dev/null +++ b/debian/tests/fake-plugin @@@ -1,0 -1,0 +1,2 @@@ ++#!/bin/sh ++test=utils/hwloc/test-fake-plugin.sh /bin/sh ./debian/tests/test-util diff --cc debian/tests/gather index 0000000,0000000..0db05a2 new file mode 100644 --- /dev/null +++ b/debian/tests/gather @@@ -1,0 -1,0 +1,2 @@@ ++#!/bin/sh ++test=tests/linux/gather/test-gather-topology.sh /bin/sh ./debian/tests/test-util diff --cc debian/tests/info index 0000000,0000000..61fee1c new file mode 100644 --- /dev/null +++ b/debian/tests/info @@@ -1,0 -1,0 +1,2 @@@ ++#!/bin/sh ++test=utils/hwloc/test-hwloc-info.sh /bin/sh ./debian/tests/test-util diff --cc debian/tests/linux index 0000000,0000000..964823c new file mode 100644 --- /dev/null +++ b/debian/tests/linux @@@ -1,0 -1,0 +1,6 @@@ ++#!/bin/sh ++set -e ++for i in tests/linux/*.output ++do ++ test=tests/linux/test-topology.sh /bin/sh ./debian/tests/test-util "$i" ++done diff --cc debian/tests/lstopo index 0000000,0000000..0df7d30 new file mode 100644 --- /dev/null +++ b/debian/tests/lstopo @@@ -1,0 -1,0 +1,2 @@@ ++#!/bin/sh ++test=utils/lstopo/test-hwloc-ls.sh /bin/sh ./debian/tests/test-util diff --cc debian/tests/test-util index 0000000,0000000..9925dac new file mode 100644 --- /dev/null +++ b/debian/tests/test-util @@@ -1,0 -1,0 +1,46 @@@ ++#!/bin/bash ++set -e ++ ++base=$(basename $test) ++sed \ ++ -e '/HWLOC_PLUGINS_PATH/d' \ ++ -e "/^diff=/d" \ ++ -e "/^patch=/d" \ ++ -e "/^distances=/d" \ ++ -e "/^calc=/d" \ ++ -e "/^annotate=/d" \ ++ -e "/^assembler=/d" \ ++ -e "/^compress=/d" \ ++ -e "/^distrib=/d" \ ++ -e "/^info=/d" \ ++ -e "/^lstopo=/d" \ ++ -e "/^ls=/d" \ ++ -e "/^gather=/d" \ ++ -e "s=@BASH@=/bin/bash=" \ ++ -e "s=@HWLOC_DIFF_U@=-u=" \ ++ -e "s=@HWLOC_DIFF_W@=-w=" \ ++ -e "s=@XMLLINT@=xmllint=" \ ++ -e "s=@HWLOC_VERSION@=1.11.10=" \ ++ -e "s=@SED@=/bin/sed=" \ ++ -e "s=@EXEEXT@==" \ ++ -e 's=@HWLOC_HAVE_PCI_TRUE@==' \ ++ -e "s=@HWLOC_top_srcdir@=$PWD=" \ ++ < $test.in > $AUTOPKGTEST_TMP/$base ++ ++export LANG=C ++export LC_ALL=C ++export diff=/usr/bin/hwloc-diff ++export patch=/usr/bin/hwloc-patch ++export distances=/usr/bin/hwloc-distances ++export calc=/usr/bin/hwloc-calc ++export annotate=/usr/bin/hwloc-annotate ++export assembler=/usr/bin/hwloc-assembler ++export compress=/usr/bin/hwloc-compress-dir ++export distrib=/usr/bin/hwloc-distrib ++export info=/usr/bin/hwloc-info ++export gather=/usr/bin/hwloc-gather-topology ++export lstopo=/usr/bin/lstopo-no-graphics ++export ls=/usr/bin/lstopo-no-graphics ++export TMPDIR=$AUTOPKGTEST_TMP ++chmod +x $AUTOPKGTEST_TMP/$base ++$AUTOPKGTEST_TMP/$base "$@" diff --cc debian/tests/xml index 0000000,0000000..0330fa0 new file mode 100644 --- /dev/null +++ b/debian/tests/xml @@@ -1,0 -1,0 +1,6 @@@ ++#!/bin/sh ++set -e ++for i in tests/xml/*.xml tests/xml/*.output ++do ++ test=tests/xml/test-topology.sh /bin/sh ./debian/tests/test-util "$i" ++done