From 245a239aa8466207ea477b660bc9dd949e97f94f Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 27 Aug 2014 08:17:36 -0500 Subject: [PATCH] Move src/* to hwloc/ to prepare for netloc addition Also move tests/* to tests/hwloc/ Utils were already in specific directories. --- .gitignore | 149 ++++++++-------- Makefile.am | 45 ++--- VERSION | 4 +- config/hwloc.m4 | 8 +- config/hwloc_internal.m4 | 68 +++++--- configure.ac | 2 +- contrib/update-my-copyright.pl | 2 +- doc/Makefile.am | 38 ++-- doc/examples/Makefile.am | 2 +- {src => hwloc}/Makefile.am | 0 {src => hwloc}/base64.c | 0 {src => hwloc}/bind.c | 0 {src => hwloc}/bitmap.c | 0 {src => hwloc}/components.c | 0 {src => hwloc}/diff.c | 0 {src => hwloc}/distances.c | 0 {src => hwloc}/dolib.c | 0 {src => hwloc}/hwloc.dtd | 0 {src => hwloc}/misc.c | 0 {src => hwloc}/pci-common.c | 0 {src => hwloc}/topology-aix.c | 0 {src => hwloc}/topology-bgq.c | 0 {src => hwloc}/topology-cuda.c | 0 {src => hwloc}/topology-custom.c | 0 {src => hwloc}/topology-darwin.c | 0 {src => hwloc}/topology-fake.c | 0 {src => hwloc}/topology-freebsd.c | 0 {src => hwloc}/topology-gl.c | 0 {src => hwloc}/topology-hpux.c | 0 {src => hwloc}/topology-linux.c | 0 {src => hwloc}/topology-netbsd.c | 0 {src => hwloc}/topology-noos.c | 0 {src => hwloc}/topology-nvml.c | 0 {src => hwloc}/topology-opencl.c | 0 {src => hwloc}/topology-osf.c | 0 {src => hwloc}/topology-pci.c | 0 {src => hwloc}/topology-solaris-chiptype.c | 0 {src => hwloc}/topology-solaris.c | 0 {src => hwloc}/topology-synthetic.c | 0 {src => hwloc}/topology-windows.c | 0 {src => hwloc}/topology-x86.c | 0 {src => hwloc}/topology-xml-libxml.c | 0 {src => hwloc}/topology-xml-nolibxml.c | 0 {src => hwloc}/topology-xml.c | 0 {src => hwloc}/topology.c | 0 {src => hwloc}/traversal.c | 0 tests/Makefile.am | 122 +------------ tests/hwloc/Makefile.am | 121 +++++++++++++ tests/{ => hwloc}/cuda.c | 0 tests/{ => hwloc}/cudart.c | 0 tests/{ => hwloc}/embedded/Makefile.am | 0 tests/{ => hwloc}/embedded/README.txt | 0 tests/{ => hwloc}/embedded/autogen.sh | 0 tests/{ => hwloc}/embedded/config/README.txt | 0 tests/{ => hwloc}/embedded/configure.ac | 0 tests/{ => hwloc}/embedded/do_test.c | 0 tests/{ => hwloc}/embedded/main.c | 0 .../embedded/run-embedded-tests.sh | 0 tests/{ => hwloc}/gl.c | 0 tests/{ => hwloc}/glibc-sched.c | 0 tests/{ => hwloc}/hwloc_backends.c | 0 tests/{ => hwloc}/hwloc_bind.c | 0 tests/{ => hwloc}/hwloc_bitmap.c | 0 .../hwloc_bitmap_first_last_weight.c | 0 tests/{ => hwloc}/hwloc_bitmap_singlify.c | 0 tests/{ => hwloc}/hwloc_bitmap_string.c | 0 tests/{ => hwloc}/hwloc_custom.c | 0 tests/{ => hwloc}/hwloc_distances.c | 0 .../hwloc_get_cache_covering_cpuset.c | 0 tests/{ => hwloc}/hwloc_get_closest_objs.c | 0 .../hwloc_get_largest_objs_inside_cpuset.c | 0 .../{ => hwloc}/hwloc_get_last_cpu_location.c | 0 .../hwloc_get_next_obj_covering_cpuset.c | 0 .../hwloc_get_obj_below_array_by_type.c | 0 .../hwloc_get_obj_covering_cpuset.c | 0 .../{ => hwloc}/hwloc_get_obj_inside_cpuset.c | 0 .../hwloc_get_shared_cache_covering_obj.c | 0 tests/{ => hwloc}/hwloc_groups.c | 0 tests/{ => hwloc}/hwloc_groups2.c | 0 tests/{ => hwloc}/hwloc_insert_misc.c | 0 tests/{ => hwloc}/hwloc_iodevs.c | 0 tests/{ => hwloc}/hwloc_is_thissystem.c | 0 tests/{ => hwloc}/hwloc_list_components.c | 0 tests/{ => hwloc}/hwloc_obj_infos.c | 0 tests/{ => hwloc}/hwloc_object_userdata.c | 0 tests/{ => hwloc}/hwloc_pci_backend.c | 0 tests/{ => hwloc}/hwloc_synthetic.c | 0 tests/{ => hwloc}/hwloc_topology_diff.c | 0 tests/{ => hwloc}/hwloc_topology_dup.c | 0 tests/{ => hwloc}/hwloc_topology_restrict.c | 0 tests/{ => hwloc}/hwloc_type_depth.c | 0 tests/{ => hwloc}/intel-mic.c | 0 tests/{ => hwloc}/linux-libnuma.c | 0 .../{ => hwloc}/linux/128ia64-17n4s2c.output | 0 .../{ => hwloc}/linux/128ia64-17n4s2c.tar.bz2 | Bin ...16amd64-4n4c-cgroup-distance-merge.options | 0 .../16amd64-4n4c-cgroup-distance-merge.output | 0 ...16amd64-4n4c-cgroup-distance-merge.tar.bz2 | Bin .../linux/16amd64-8n2c-cpusets.output | 0 .../linux/16amd64-8n2c-cpusets.tar.bz2 | Bin .../linux/16amd64-8n2c-cpusets.xml.options | 0 .../linux/16amd64-8n2c-cpusets.xml.output | 0 .../linux/16amd64-8n2c-cpusets.xml.source | 0 .../16amd64-8n2c-cpusets_noadmin.options | 0 .../linux/16amd64-8n2c-cpusets_noadmin.output | 0 .../linux/16amd64-8n2c-cpusets_noadmin.source | 0 tests/{ => hwloc}/linux/16amd64-8n2c.output | 0 tests/{ => hwloc}/linux/16amd64-8n2c.tar.bz2 | Bin tests/{ => hwloc}/linux/16em64t-2m4c2t.output | 0 .../{ => hwloc}/linux/16em64t-2m4c2t.tar.bz2 | Bin .../linux/16em64t-4s2c2t-offlines.output | 0 .../linux/16em64t-4s2c2t-offlines.tar.bz2 | Bin .../linux/16em64t-4s2c2t-offlines.xml.options | 0 .../linux/16em64t-4s2c2t-offlines.xml.output | 0 .../linux/16em64t-4s2c2t-offlines.xml.source | 0 .../16em64t-4s2c2t-offlines_noadmin.options | 0 .../16em64t-4s2c2t-offlines_noadmin.output | 0 .../16em64t-4s2c2t-offlines_noadmin.source | 0 tests/{ => hwloc}/linux/16em64t-4s2c2t.output | 0 .../{ => hwloc}/linux/16em64t-4s2c2t.tar.bz2 | Bin .../linux/16em64t-4s2c2t.xml.options | 0 .../linux/16em64t-4s2c2t.xml.output | 0 .../linux/16em64t-4s2c2t.xml.source | 0 .../linux/16em64t-4s2c2t_merge.options | 0 .../linux/16em64t-4s2c2t_merge.output | 0 .../linux/16em64t-4s2c2t_merge.source | 0 .../linux/16em64t-4s2c2t_ncaches.options | 0 .../linux/16em64t-4s2c2t_ncaches.output | 0 .../linux/16em64t-4s2c2t_ncaches.source | 0 .../16em64t-4s2ca2c-cpusetreorder.output | 0 .../16em64t-4s2ca2c-cpusetreorder.tar.bz2 | Bin tests/{ => hwloc}/linux/16ia64-8n2s.output | 0 tests/{ => hwloc}/linux/16ia64-8n2s.tar.bz2 | Bin tests/{ => hwloc}/linux/1alpha.output | 0 tests/{ => hwloc}/linux/1alpha.tar.bz2 | Bin tests/{ => hwloc}/linux/20s390-2g6s4c.output | 0 tests/{ => hwloc}/linux/20s390-2g6s4c.tar.bz2 | Bin .../24em64t-2n6c2t+2mic.olddriver.options | 0 .../24em64t-2n6c2t+2mic.olddriver.output | 0 .../24em64t-2n6c2t+2mic.olddriver.tar.bz2 | Bin .../{ => hwloc}/linux/256ia64-64n2s2c.output | 0 .../{ => hwloc}/linux/256ia64-64n2s2c.tar.bz2 | Bin .../linux/256ppc-8n8s4t-nocache.exclude | 0 .../linux/256ppc-8n8s4t-nocache.output | 0 .../linux/256ppc-8n8s4t-nocache.source | 0 .../linux/256ppc-8n8s4t-nosys.exclude | 0 .../linux/256ppc-8n8s4t-nosys.output | 0 .../linux/256ppc-8n8s4t-nosys.source | 0 tests/{ => hwloc}/linux/256ppc-8n8s4t.output | 0 tests/{ => hwloc}/linux/256ppc-8n8s4t.tar.bz2 | Bin .../28em64t-2s2n7c-buggycoresiblings.output | 0 .../28em64t-2s2n7c-buggycoresiblings.tar.bz2 | Bin tests/{ => hwloc}/linux/2amd64-2n.output | 0 tests/{ => hwloc}/linux/2amd64-2n.tar.bz2 | Bin tests/{ => hwloc}/linux/2arm-2c.output | 0 tests/{ => hwloc}/linux/2arm-2c.tar.bz2 | Bin .../linux/2i386-2c-nohugepage.tar.bz2 | Bin .../linux/2i386-2c-nohugepage.xml.options | 0 .../linux/2i386-2c-nohugepage.xml.output | 0 .../linux/2i386-2c-nohugepage.xml.source | 0 .../linux/2i386-2t-hugepagesizecount.tar.bz2 | Bin .../linux/2i386-2t-hugepagesizecount.xml.env | 0 .../2i386-2t-hugepagesizecount.xml.options | 0 .../2i386-2t-hugepagesizecount.xml.output | 0 .../2i386-2t-hugepagesizecount.xml.source | 0 tests/{ => hwloc}/linux/2ps3-2t.output | 0 tests/{ => hwloc}/linux/2ps3-2t.tar.bz2 | Bin tests/{ => hwloc}/linux/2s390-2c.output | 0 tests/{ => hwloc}/linux/2s390-2c.tar.bz2 | Bin .../linux/32amd64-4s2n4c-cgroup.env | 0 .../linux/32amd64-4s2n4c-cgroup.output | 0 .../linux/32amd64-4s2n4c-cgroup.tar.bz2 | Bin .../linux/32amd64-4s2n4c-cgroup.xml.env | 0 .../linux/32amd64-4s2n4c-cgroup.xml.options | 0 .../linux/32amd64-4s2n4c-cgroup.xml.output | 0 .../linux/32amd64-4s2n4c-cgroup.xml.source | 0 .../linux/32em64t-2n8c+1mic.options | 0 .../linux/32em64t-2n8c+1mic.output | 0 .../linux/32em64t-2n8c+1mic.tar.bz2 | Bin tests/{ => hwloc}/linux/32ppc-4n4c2c.output | 0 tests/{ => hwloc}/linux/32ppc-4n4c2c.tar.bz2 | Bin .../linux/40intel64-2g2n4c+pci.env | 0 .../linux/40intel64-2g2n4c+pci.options | 0 .../linux/40intel64-2g2n4c+pci.output | 0 .../linux/40intel64-2g2n4c+pci.tar.bz2 | Bin .../linux/40intel64-4n10c+pci-conflicts.env | 0 .../40intel64-4n10c+pci-conflicts.output | 0 .../40intel64-4n10c+pci-conflicts.tar.bz2 | Bin .../linux/48amd64-4d2n6c-sparse.output | 0 .../linux/48amd64-4d2n6c-sparse.tar.bz2 | Bin .../linux/4em64t-2c2t-ignore-reorder.options | 0 .../linux/4em64t-2c2t-ignore-reorder.output | 0 .../linux/4em64t-2c2t-ignore-reorder.tar.bz2 | Bin tests/{ => hwloc}/linux/4ia64-4s.output | 0 tests/{ => hwloc}/linux/4ia64-4s.tar.bz2 | Bin tests/{ => hwloc}/linux/4ppc-4c.output | 0 tests/{ => hwloc}/linux/4ppc-4c.tar.bz2 | Bin tests/{ => hwloc}/linux/4qs22-2s2t.output | 0 tests/{ => hwloc}/linux/4qs22-2s2t.tar.bz2 | Bin .../linux/64amd64-4s2n4ca2co.output | 0 .../linux/64amd64-4s2n4ca2co.tar.bz2 | Bin .../linux/64fake-4n2s2ca2c2t.output | 0 .../linux/64fake-4n2s2ca2c2t.tar.bz2 | Bin tests/{ => hwloc}/linux/8amd64-4n2c.output | 0 tests/{ => hwloc}/linux/8amd64-4n2c.tar.bz2 | Bin .../linux/8em64t-2s2ca2c-buggynuma.output | 0 .../linux/8em64t-2s2ca2c-buggynuma.tar.bz2 | Bin tests/{ => hwloc}/linux/8em64t-2s2ca2c.output | 0 .../{ => hwloc}/linux/8em64t-2s2ca2c.tar.bz2 | Bin .../linux/8em64t-2s4c-heterogeneous.output | 0 .../linux/8em64t-2s4c-heterogeneous.tar.bz2 | Bin tests/{ => hwloc}/linux/8em64t-4c2t.output | 0 tests/{ => hwloc}/linux/8em64t-4c2t.tar.bz2 | Bin tests/{ => hwloc}/linux/8ia64-2n2s2c.output | 0 tests/{ => hwloc}/linux/8ia64-2n2s2c.tar.bz2 | Bin tests/{ => hwloc}/linux/8ia64-2s2c2t.output | 0 tests/{ => hwloc}/linux/8ia64-2s2c2t.tar.bz2 | Bin tests/{ => hwloc}/linux/8ia64-4s2c.output | 0 tests/{ => hwloc}/linux/8ia64-4s2c.tar.bz2 | Bin .../linux/96em64t-4n4d3ca2co-forcecpuinfo.env | 0 .../96em64t-4n4d3ca2co-forcecpuinfo.output | 0 .../96em64t-4n4d3ca2co-forcecpuinfo.source | 0 .../linux/96em64t-4n4d3ca2co.output | 0 .../linux/96em64t-4n4d3ca2co.tar.bz2 | Bin tests/{ => hwloc}/linux/Makefile.am | 0 tests/{ => hwloc}/linux/README | 0 tests/{ => hwloc}/linux/gather/Makefile.am | 0 .../linux/gather/test-gather-topology.sh.in | 6 +- .../linux/hwloc-gather-topology.in | 1 + tests/{ => hwloc}/linux/test-topology.sh.in | 8 +- tests/{ => hwloc}/myriexpress.c | 0 tests/{ => hwloc}/nvml.c | 0 tests/{ => hwloc}/opencl.c | 0 tests/{ => hwloc}/openfabrics-verbs.c | 0 tests/hwloc/ports/Makefile.am | 165 ++++++++++++++++++ .../{ => hwloc}/ports/include/aix/procinfo.h | 0 .../ports/include/aix/sys/processor.h | 0 .../{ => hwloc}/ports/include/aix/sys/rset.h | 0 .../ports/include/aix/sys/systemcfg.h | 0 .../ports/include/aix/sys/thread.h | 0 .../include/bgq/spi/include/kernel/location.h | 0 .../include/bgq/spi/include/kernel/process.h | 0 .../ports/include/cuda/cuda_runtime_api.h | 0 .../ports/include/darwin/sys/sysctl.h | 0 .../ports/include/freebsd/pthread.h | 0 .../ports/include/freebsd/pthread_np.h | 0 .../ports/include/freebsd/sys/cpuset.h | 0 .../ports/include/freebsd/sys/sysctl.h | 0 .../ports/include/gl/NVCtrl/NVCtrl.h | 0 .../ports/include/gl/NVCtrl/NVCtrlLib.h | 0 tests/{ => hwloc}/ports/include/gl/X11/Xlib.h | 0 .../ports/include/hpux/sys/mpctl.h | 0 .../ports/include/netbsd/pthread.h | 0 .../{ => hwloc}/ports/include/netbsd/sched.h | 0 tests/{ => hwloc}/ports/include/nvml/nvml.h | 0 .../ports/include/opencl/CL/cl_ext.h | 0 tests/{ => hwloc}/ports/include/osf/cpuset.h | 0 tests/{ => hwloc}/ports/include/osf/numa.h | 0 tests/{ => hwloc}/ports/include/osf/radset.h | 0 .../{ => hwloc}/ports/include/solaris/kstat.h | 0 .../{ => hwloc}/ports/include/solaris/picl.h | 0 .../ports/include/solaris/sys/lgrp_user.h | 0 .../ports/include/solaris/sys/processor.h | 0 .../ports/include/solaris/sys/procset.h | 0 .../ports/include/solaris/sys/systeminfo.h | 0 .../ports/include/windows/windows.h | 0 tests/{ => hwloc}/rename/Makefile.am | 0 tests/{ => hwloc}/rename/main.c | 0 tests/{ => hwloc}/wrapper.sh.in | 0 .../{ => hwloc}/xml/16amd64-8n2c-cpusets.xml | 0 .../xml/16em64t-4s2c2t-offlines.xml | 0 tests/{ => hwloc}/xml/16em64t-4s2c2t.xml | 0 .../192em64t-12gr2n8c2t-distancegroups.env | 0 .../192em64t-12gr2n8c2t-distancegroups.xml | 0 .../xml/192em64t-24n8c2t-distancegroups.env | 0 .../192em64t-24n8c2t-distancegroups.source | 0 .../xml/192em64t-24n8c2t-distancegroups.xml | 0 .../xml/192em64t-24n8c2t-nodistancegroups.env | 0 .../xml/192em64t-24n8c2t-nodistancegroups.xml | 0 tests/{ => hwloc}/xml/24em64t-2n6c2t-pci.xml | 0 .../xml/32em64t-2n8c2t-pci-noio.options | 0 .../xml/32em64t-2n8c2t-pci-noio.source | 0 .../xml/32em64t-2n8c2t-pci-noio.xml | 0 .../xml/32em64t-2n8c2t-pci-normalio.source | 0 .../xml/32em64t-2n8c2t-pci-normalio.xml | 0 .../xml/32em64t-2n8c2t-pci-wholeio.options | 0 .../xml/32em64t-2n8c2t-pci-wholeio.xml | 0 tests/{ => hwloc}/xml/8em64t-2mi2ma2c.xml | 0 .../xml/96em64t-4n4d3ca2co-pci.xml | 0 tests/hwloc/xml/Makefile.am | 51 ++++++ tests/{ => hwloc}/xml/test-topology.sh.in | 8 +- tests/{ => hwloc}/xmlbuffer.c | 0 tests/ports/Makefile.am | 165 ------------------ tests/xml/Makefile.am | 51 ------ utils/.gitignore | 1 - utils/hwloc/Makefile.am | 2 +- utils/hwloc/hwloc-compress-dir.in | 0 utils/hwloc/test-fake-plugin.sh.in | 6 +- utils/hwloc/test-hwloc-annotate.sh.in | 13 +- utils/hwloc/test-hwloc-assembler.sh.in | 17 +- utils/hwloc/test-hwloc-calc.sh.in | 28 +-- utils/hwloc/test-hwloc-compress-dir.sh.in | 13 +- utils/hwloc/test-hwloc-diffpatch.sh.in | 24 +-- utils/hwloc/test-hwloc-distances.sh.in | 11 +- utils/hwloc/test-hwloc-distrib.sh.in | 11 +- utils/hwloc/test-hwloc-info.sh.in | 11 +- utils/lstopo/Makefile.am | 2 +- utils/lstopo/test-hwloc-ls.sh.in | 10 +- 308 files changed, 615 insertions(+), 550 deletions(-) rename {src => hwloc}/Makefile.am (100%) rename {src => hwloc}/base64.c (100%) rename {src => hwloc}/bind.c (100%) rename {src => hwloc}/bitmap.c (100%) rename {src => hwloc}/components.c (100%) rename {src => hwloc}/diff.c (100%) rename {src => hwloc}/distances.c (100%) rename {src => hwloc}/dolib.c (100%) rename {src => hwloc}/hwloc.dtd (100%) rename {src => hwloc}/misc.c (100%) rename {src => hwloc}/pci-common.c (100%) rename {src => hwloc}/topology-aix.c (100%) rename {src => hwloc}/topology-bgq.c (100%) rename {src => hwloc}/topology-cuda.c (100%) rename {src => hwloc}/topology-custom.c (100%) rename {src => hwloc}/topology-darwin.c (100%) rename {src => hwloc}/topology-fake.c (100%) rename {src => hwloc}/topology-freebsd.c (100%) rename {src => hwloc}/topology-gl.c (100%) rename {src => hwloc}/topology-hpux.c (100%) rename {src => hwloc}/topology-linux.c (100%) rename {src => hwloc}/topology-netbsd.c (100%) rename {src => hwloc}/topology-noos.c (100%) rename {src => hwloc}/topology-nvml.c (100%) rename {src => hwloc}/topology-opencl.c (100%) rename {src => hwloc}/topology-osf.c (100%) rename {src => hwloc}/topology-pci.c (100%) rename {src => hwloc}/topology-solaris-chiptype.c (100%) rename {src => hwloc}/topology-solaris.c (100%) rename {src => hwloc}/topology-synthetic.c (100%) rename {src => hwloc}/topology-windows.c (100%) rename {src => hwloc}/topology-x86.c (100%) rename {src => hwloc}/topology-xml-libxml.c (100%) rename {src => hwloc}/topology-xml-nolibxml.c (100%) rename {src => hwloc}/topology-xml.c (100%) rename {src => hwloc}/topology.c (100%) rename {src => hwloc}/traversal.c (100%) create mode 100644 tests/hwloc/Makefile.am rename tests/{ => hwloc}/cuda.c (100%) rename tests/{ => hwloc}/cudart.c (100%) rename tests/{ => hwloc}/embedded/Makefile.am (100%) rename tests/{ => hwloc}/embedded/README.txt (100%) rename tests/{ => hwloc}/embedded/autogen.sh (100%) rename tests/{ => hwloc}/embedded/config/README.txt (100%) rename tests/{ => hwloc}/embedded/configure.ac (100%) rename tests/{ => hwloc}/embedded/do_test.c (100%) rename tests/{ => hwloc}/embedded/main.c (100%) rename tests/{ => hwloc}/embedded/run-embedded-tests.sh (100%) rename tests/{ => hwloc}/gl.c (100%) rename tests/{ => hwloc}/glibc-sched.c (100%) rename tests/{ => hwloc}/hwloc_backends.c (100%) rename tests/{ => hwloc}/hwloc_bind.c (100%) rename tests/{ => hwloc}/hwloc_bitmap.c (100%) rename tests/{ => hwloc}/hwloc_bitmap_first_last_weight.c (100%) rename tests/{ => hwloc}/hwloc_bitmap_singlify.c (100%) rename tests/{ => hwloc}/hwloc_bitmap_string.c (100%) rename tests/{ => hwloc}/hwloc_custom.c (100%) rename tests/{ => hwloc}/hwloc_distances.c (100%) rename tests/{ => hwloc}/hwloc_get_cache_covering_cpuset.c (100%) rename tests/{ => hwloc}/hwloc_get_closest_objs.c (100%) rename tests/{ => hwloc}/hwloc_get_largest_objs_inside_cpuset.c (100%) rename tests/{ => hwloc}/hwloc_get_last_cpu_location.c (100%) rename tests/{ => hwloc}/hwloc_get_next_obj_covering_cpuset.c (100%) rename tests/{ => hwloc}/hwloc_get_obj_below_array_by_type.c (100%) rename tests/{ => hwloc}/hwloc_get_obj_covering_cpuset.c (100%) rename tests/{ => hwloc}/hwloc_get_obj_inside_cpuset.c (100%) rename tests/{ => hwloc}/hwloc_get_shared_cache_covering_obj.c (100%) rename tests/{ => hwloc}/hwloc_groups.c (100%) rename tests/{ => hwloc}/hwloc_groups2.c (100%) rename tests/{ => hwloc}/hwloc_insert_misc.c (100%) rename tests/{ => hwloc}/hwloc_iodevs.c (100%) rename tests/{ => hwloc}/hwloc_is_thissystem.c (100%) rename tests/{ => hwloc}/hwloc_list_components.c (100%) rename tests/{ => hwloc}/hwloc_obj_infos.c (100%) rename tests/{ => hwloc}/hwloc_object_userdata.c (100%) rename tests/{ => hwloc}/hwloc_pci_backend.c (100%) rename tests/{ => hwloc}/hwloc_synthetic.c (100%) rename tests/{ => hwloc}/hwloc_topology_diff.c (100%) rename tests/{ => hwloc}/hwloc_topology_dup.c (100%) rename tests/{ => hwloc}/hwloc_topology_restrict.c (100%) rename tests/{ => hwloc}/hwloc_type_depth.c (100%) rename tests/{ => hwloc}/intel-mic.c (100%) rename tests/{ => hwloc}/linux-libnuma.c (100%) rename tests/{ => hwloc}/linux/128ia64-17n4s2c.output (100%) rename tests/{ => hwloc}/linux/128ia64-17n4s2c.tar.bz2 (100%) rename tests/{ => hwloc}/linux/16amd64-4n4c-cgroup-distance-merge.options (100%) rename tests/{ => hwloc}/linux/16amd64-4n4c-cgroup-distance-merge.output (100%) rename tests/{ => hwloc}/linux/16amd64-4n4c-cgroup-distance-merge.tar.bz2 (100%) rename tests/{ => hwloc}/linux/16amd64-8n2c-cpusets.output (100%) rename tests/{ => hwloc}/linux/16amd64-8n2c-cpusets.tar.bz2 (100%) rename tests/{ => hwloc}/linux/16amd64-8n2c-cpusets.xml.options (100%) rename tests/{ => hwloc}/linux/16amd64-8n2c-cpusets.xml.output (100%) rename tests/{ => hwloc}/linux/16amd64-8n2c-cpusets.xml.source (100%) rename tests/{ => hwloc}/linux/16amd64-8n2c-cpusets_noadmin.options (100%) rename tests/{ => hwloc}/linux/16amd64-8n2c-cpusets_noadmin.output (100%) rename tests/{ => hwloc}/linux/16amd64-8n2c-cpusets_noadmin.source (100%) rename tests/{ => hwloc}/linux/16amd64-8n2c.output (100%) rename tests/{ => hwloc}/linux/16amd64-8n2c.tar.bz2 (100%) rename tests/{ => hwloc}/linux/16em64t-2m4c2t.output (100%) rename tests/{ => hwloc}/linux/16em64t-2m4c2t.tar.bz2 (100%) rename tests/{ => hwloc}/linux/16em64t-4s2c2t-offlines.output (100%) rename tests/{ => hwloc}/linux/16em64t-4s2c2t-offlines.tar.bz2 (100%) rename tests/{ => hwloc}/linux/16em64t-4s2c2t-offlines.xml.options (100%) rename tests/{ => hwloc}/linux/16em64t-4s2c2t-offlines.xml.output (100%) rename tests/{ => hwloc}/linux/16em64t-4s2c2t-offlines.xml.source (100%) rename tests/{ => hwloc}/linux/16em64t-4s2c2t-offlines_noadmin.options (100%) rename tests/{ => hwloc}/linux/16em64t-4s2c2t-offlines_noadmin.output (100%) rename tests/{ => hwloc}/linux/16em64t-4s2c2t-offlines_noadmin.source (100%) rename tests/{ => hwloc}/linux/16em64t-4s2c2t.output (100%) rename tests/{ => hwloc}/linux/16em64t-4s2c2t.tar.bz2 (100%) rename tests/{ => hwloc}/linux/16em64t-4s2c2t.xml.options (100%) rename tests/{ => hwloc}/linux/16em64t-4s2c2t.xml.output (100%) rename tests/{ => hwloc}/linux/16em64t-4s2c2t.xml.source (100%) rename tests/{ => hwloc}/linux/16em64t-4s2c2t_merge.options (100%) rename tests/{ => hwloc}/linux/16em64t-4s2c2t_merge.output (100%) rename tests/{ => hwloc}/linux/16em64t-4s2c2t_merge.source (100%) rename tests/{ => hwloc}/linux/16em64t-4s2c2t_ncaches.options (100%) rename tests/{ => hwloc}/linux/16em64t-4s2c2t_ncaches.output (100%) rename tests/{ => hwloc}/linux/16em64t-4s2c2t_ncaches.source (100%) rename tests/{ => hwloc}/linux/16em64t-4s2ca2c-cpusetreorder.output (100%) rename tests/{ => hwloc}/linux/16em64t-4s2ca2c-cpusetreorder.tar.bz2 (100%) rename tests/{ => hwloc}/linux/16ia64-8n2s.output (100%) rename tests/{ => hwloc}/linux/16ia64-8n2s.tar.bz2 (100%) rename tests/{ => hwloc}/linux/1alpha.output (100%) rename tests/{ => hwloc}/linux/1alpha.tar.bz2 (100%) rename tests/{ => hwloc}/linux/20s390-2g6s4c.output (100%) rename tests/{ => hwloc}/linux/20s390-2g6s4c.tar.bz2 (100%) rename tests/{ => hwloc}/linux/24em64t-2n6c2t+2mic.olddriver.options (100%) rename tests/{ => hwloc}/linux/24em64t-2n6c2t+2mic.olddriver.output (100%) rename tests/{ => hwloc}/linux/24em64t-2n6c2t+2mic.olddriver.tar.bz2 (100%) rename tests/{ => hwloc}/linux/256ia64-64n2s2c.output (100%) rename tests/{ => hwloc}/linux/256ia64-64n2s2c.tar.bz2 (100%) rename tests/{ => hwloc}/linux/256ppc-8n8s4t-nocache.exclude (100%) rename tests/{ => hwloc}/linux/256ppc-8n8s4t-nocache.output (100%) rename tests/{ => hwloc}/linux/256ppc-8n8s4t-nocache.source (100%) rename tests/{ => hwloc}/linux/256ppc-8n8s4t-nosys.exclude (100%) rename tests/{ => hwloc}/linux/256ppc-8n8s4t-nosys.output (100%) rename tests/{ => hwloc}/linux/256ppc-8n8s4t-nosys.source (100%) rename tests/{ => hwloc}/linux/256ppc-8n8s4t.output (100%) rename tests/{ => hwloc}/linux/256ppc-8n8s4t.tar.bz2 (100%) rename tests/{ => hwloc}/linux/28em64t-2s2n7c-buggycoresiblings.output (100%) rename tests/{ => hwloc}/linux/28em64t-2s2n7c-buggycoresiblings.tar.bz2 (100%) rename tests/{ => hwloc}/linux/2amd64-2n.output (100%) rename tests/{ => hwloc}/linux/2amd64-2n.tar.bz2 (100%) rename tests/{ => hwloc}/linux/2arm-2c.output (100%) rename tests/{ => hwloc}/linux/2arm-2c.tar.bz2 (100%) rename tests/{ => hwloc}/linux/2i386-2c-nohugepage.tar.bz2 (100%) rename tests/{ => hwloc}/linux/2i386-2c-nohugepage.xml.options (100%) rename tests/{ => hwloc}/linux/2i386-2c-nohugepage.xml.output (100%) rename tests/{ => hwloc}/linux/2i386-2c-nohugepage.xml.source (100%) rename tests/{ => hwloc}/linux/2i386-2t-hugepagesizecount.tar.bz2 (100%) rename tests/{ => hwloc}/linux/2i386-2t-hugepagesizecount.xml.env (100%) rename tests/{ => hwloc}/linux/2i386-2t-hugepagesizecount.xml.options (100%) rename tests/{ => hwloc}/linux/2i386-2t-hugepagesizecount.xml.output (100%) rename tests/{ => hwloc}/linux/2i386-2t-hugepagesizecount.xml.source (100%) rename tests/{ => hwloc}/linux/2ps3-2t.output (100%) rename tests/{ => hwloc}/linux/2ps3-2t.tar.bz2 (100%) rename tests/{ => hwloc}/linux/2s390-2c.output (100%) rename tests/{ => hwloc}/linux/2s390-2c.tar.bz2 (100%) rename tests/{ => hwloc}/linux/32amd64-4s2n4c-cgroup.env (100%) rename tests/{ => hwloc}/linux/32amd64-4s2n4c-cgroup.output (100%) rename tests/{ => hwloc}/linux/32amd64-4s2n4c-cgroup.tar.bz2 (100%) rename tests/{ => hwloc}/linux/32amd64-4s2n4c-cgroup.xml.env (100%) rename tests/{ => hwloc}/linux/32amd64-4s2n4c-cgroup.xml.options (100%) rename tests/{ => hwloc}/linux/32amd64-4s2n4c-cgroup.xml.output (100%) rename tests/{ => hwloc}/linux/32amd64-4s2n4c-cgroup.xml.source (100%) rename tests/{ => hwloc}/linux/32em64t-2n8c+1mic.options (100%) rename tests/{ => hwloc}/linux/32em64t-2n8c+1mic.output (100%) rename tests/{ => hwloc}/linux/32em64t-2n8c+1mic.tar.bz2 (100%) rename tests/{ => hwloc}/linux/32ppc-4n4c2c.output (100%) rename tests/{ => hwloc}/linux/32ppc-4n4c2c.tar.bz2 (100%) rename tests/{ => hwloc}/linux/40intel64-2g2n4c+pci.env (100%) rename tests/{ => hwloc}/linux/40intel64-2g2n4c+pci.options (100%) rename tests/{ => hwloc}/linux/40intel64-2g2n4c+pci.output (100%) rename tests/{ => hwloc}/linux/40intel64-2g2n4c+pci.tar.bz2 (100%) rename tests/{ => hwloc}/linux/40intel64-4n10c+pci-conflicts.env (100%) rename tests/{ => hwloc}/linux/40intel64-4n10c+pci-conflicts.output (100%) rename tests/{ => hwloc}/linux/40intel64-4n10c+pci-conflicts.tar.bz2 (100%) rename tests/{ => hwloc}/linux/48amd64-4d2n6c-sparse.output (100%) rename tests/{ => hwloc}/linux/48amd64-4d2n6c-sparse.tar.bz2 (100%) rename tests/{ => hwloc}/linux/4em64t-2c2t-ignore-reorder.options (100%) rename tests/{ => hwloc}/linux/4em64t-2c2t-ignore-reorder.output (100%) rename tests/{ => hwloc}/linux/4em64t-2c2t-ignore-reorder.tar.bz2 (100%) rename tests/{ => hwloc}/linux/4ia64-4s.output (100%) rename tests/{ => hwloc}/linux/4ia64-4s.tar.bz2 (100%) rename tests/{ => hwloc}/linux/4ppc-4c.output (100%) rename tests/{ => hwloc}/linux/4ppc-4c.tar.bz2 (100%) rename tests/{ => hwloc}/linux/4qs22-2s2t.output (100%) rename tests/{ => hwloc}/linux/4qs22-2s2t.tar.bz2 (100%) rename tests/{ => hwloc}/linux/64amd64-4s2n4ca2co.output (100%) rename tests/{ => hwloc}/linux/64amd64-4s2n4ca2co.tar.bz2 (100%) rename tests/{ => hwloc}/linux/64fake-4n2s2ca2c2t.output (100%) rename tests/{ => hwloc}/linux/64fake-4n2s2ca2c2t.tar.bz2 (100%) rename tests/{ => hwloc}/linux/8amd64-4n2c.output (100%) rename tests/{ => hwloc}/linux/8amd64-4n2c.tar.bz2 (100%) rename tests/{ => hwloc}/linux/8em64t-2s2ca2c-buggynuma.output (100%) rename tests/{ => hwloc}/linux/8em64t-2s2ca2c-buggynuma.tar.bz2 (100%) rename tests/{ => hwloc}/linux/8em64t-2s2ca2c.output (100%) rename tests/{ => hwloc}/linux/8em64t-2s2ca2c.tar.bz2 (100%) rename tests/{ => hwloc}/linux/8em64t-2s4c-heterogeneous.output (100%) rename tests/{ => hwloc}/linux/8em64t-2s4c-heterogeneous.tar.bz2 (100%) rename tests/{ => hwloc}/linux/8em64t-4c2t.output (100%) rename tests/{ => hwloc}/linux/8em64t-4c2t.tar.bz2 (100%) rename tests/{ => hwloc}/linux/8ia64-2n2s2c.output (100%) rename tests/{ => hwloc}/linux/8ia64-2n2s2c.tar.bz2 (100%) rename tests/{ => hwloc}/linux/8ia64-2s2c2t.output (100%) rename tests/{ => hwloc}/linux/8ia64-2s2c2t.tar.bz2 (100%) rename tests/{ => hwloc}/linux/8ia64-4s2c.output (100%) rename tests/{ => hwloc}/linux/8ia64-4s2c.tar.bz2 (100%) rename tests/{ => hwloc}/linux/96em64t-4n4d3ca2co-forcecpuinfo.env (100%) rename tests/{ => hwloc}/linux/96em64t-4n4d3ca2co-forcecpuinfo.output (100%) rename tests/{ => hwloc}/linux/96em64t-4n4d3ca2co-forcecpuinfo.source (100%) rename tests/{ => hwloc}/linux/96em64t-4n4d3ca2co.output (100%) rename tests/{ => hwloc}/linux/96em64t-4n4d3ca2co.tar.bz2 (100%) rename tests/{ => hwloc}/linux/Makefile.am (100%) rename tests/{ => hwloc}/linux/README (100%) rename tests/{ => hwloc}/linux/gather/Makefile.am (100%) rename tests/{ => hwloc}/linux/gather/test-gather-topology.sh.in (91%) mode change 100755 => 100644 rename tests/{ => hwloc}/linux/hwloc-gather-topology.in (98%) mode change 100755 => 100644 rename tests/{ => hwloc}/linux/test-topology.sh.in (90%) rename tests/{ => hwloc}/myriexpress.c (100%) rename tests/{ => hwloc}/nvml.c (100%) rename tests/{ => hwloc}/opencl.c (100%) rename tests/{ => hwloc}/openfabrics-verbs.c (100%) create mode 100644 tests/hwloc/ports/Makefile.am rename tests/{ => hwloc}/ports/include/aix/procinfo.h (100%) rename tests/{ => hwloc}/ports/include/aix/sys/processor.h (100%) rename tests/{ => hwloc}/ports/include/aix/sys/rset.h (100%) rename tests/{ => hwloc}/ports/include/aix/sys/systemcfg.h (100%) rename tests/{ => hwloc}/ports/include/aix/sys/thread.h (100%) rename tests/{ => hwloc}/ports/include/bgq/spi/include/kernel/location.h (100%) rename tests/{ => hwloc}/ports/include/bgq/spi/include/kernel/process.h (100%) rename tests/{ => hwloc}/ports/include/cuda/cuda_runtime_api.h (100%) rename tests/{ => hwloc}/ports/include/darwin/sys/sysctl.h (100%) rename tests/{ => hwloc}/ports/include/freebsd/pthread.h (100%) rename tests/{ => hwloc}/ports/include/freebsd/pthread_np.h (100%) rename tests/{ => hwloc}/ports/include/freebsd/sys/cpuset.h (100%) rename tests/{ => hwloc}/ports/include/freebsd/sys/sysctl.h (100%) rename tests/{ => hwloc}/ports/include/gl/NVCtrl/NVCtrl.h (100%) rename tests/{ => hwloc}/ports/include/gl/NVCtrl/NVCtrlLib.h (100%) rename tests/{ => hwloc}/ports/include/gl/X11/Xlib.h (100%) rename tests/{ => hwloc}/ports/include/hpux/sys/mpctl.h (100%) rename tests/{ => hwloc}/ports/include/netbsd/pthread.h (100%) rename tests/{ => hwloc}/ports/include/netbsd/sched.h (100%) rename tests/{ => hwloc}/ports/include/nvml/nvml.h (100%) rename tests/{ => hwloc}/ports/include/opencl/CL/cl_ext.h (100%) rename tests/{ => hwloc}/ports/include/osf/cpuset.h (100%) rename tests/{ => hwloc}/ports/include/osf/numa.h (100%) rename tests/{ => hwloc}/ports/include/osf/radset.h (100%) rename tests/{ => hwloc}/ports/include/solaris/kstat.h (100%) rename tests/{ => hwloc}/ports/include/solaris/picl.h (100%) rename tests/{ => hwloc}/ports/include/solaris/sys/lgrp_user.h (100%) rename tests/{ => hwloc}/ports/include/solaris/sys/processor.h (100%) rename tests/{ => hwloc}/ports/include/solaris/sys/procset.h (100%) rename tests/{ => hwloc}/ports/include/solaris/sys/systeminfo.h (100%) rename tests/{ => hwloc}/ports/include/windows/windows.h (100%) rename tests/{ => hwloc}/rename/Makefile.am (100%) rename tests/{ => hwloc}/rename/main.c (100%) rename tests/{ => hwloc}/wrapper.sh.in (100%) rename tests/{ => hwloc}/xml/16amd64-8n2c-cpusets.xml (100%) rename tests/{ => hwloc}/xml/16em64t-4s2c2t-offlines.xml (100%) rename tests/{ => hwloc}/xml/16em64t-4s2c2t.xml (100%) rename tests/{ => hwloc}/xml/192em64t-12gr2n8c2t-distancegroups.env (100%) rename tests/{ => hwloc}/xml/192em64t-12gr2n8c2t-distancegroups.xml (100%) rename tests/{ => hwloc}/xml/192em64t-24n8c2t-distancegroups.env (100%) rename tests/{ => hwloc}/xml/192em64t-24n8c2t-distancegroups.source (100%) rename tests/{ => hwloc}/xml/192em64t-24n8c2t-distancegroups.xml (100%) rename tests/{ => hwloc}/xml/192em64t-24n8c2t-nodistancegroups.env (100%) rename tests/{ => hwloc}/xml/192em64t-24n8c2t-nodistancegroups.xml (100%) rename tests/{ => hwloc}/xml/24em64t-2n6c2t-pci.xml (100%) rename tests/{ => hwloc}/xml/32em64t-2n8c2t-pci-noio.options (100%) rename tests/{ => hwloc}/xml/32em64t-2n8c2t-pci-noio.source (100%) rename tests/{ => hwloc}/xml/32em64t-2n8c2t-pci-noio.xml (100%) rename tests/{ => hwloc}/xml/32em64t-2n8c2t-pci-normalio.source (100%) rename tests/{ => hwloc}/xml/32em64t-2n8c2t-pci-normalio.xml (100%) rename tests/{ => hwloc}/xml/32em64t-2n8c2t-pci-wholeio.options (100%) rename tests/{ => hwloc}/xml/32em64t-2n8c2t-pci-wholeio.xml (100%) rename tests/{ => hwloc}/xml/8em64t-2mi2ma2c.xml (100%) rename tests/{ => hwloc}/xml/96em64t-4n4d3ca2co-pci.xml (100%) create mode 100644 tests/hwloc/xml/Makefile.am rename tests/{ => hwloc}/xml/test-topology.sh.in (90%) mode change 100755 => 100644 rename tests/{ => hwloc}/xmlbuffer.c (100%) delete mode 100644 tests/ports/Makefile.am delete mode 100644 tests/xml/Makefile.am delete mode 100644 utils/.gitignore mode change 100755 => 100644 utils/hwloc/hwloc-compress-dir.in mode change 100755 => 100644 utils/hwloc/test-hwloc-assembler.sh.in mode change 100755 => 100644 utils/hwloc/test-hwloc-calc.sh.in mode change 100755 => 100644 utils/hwloc/test-hwloc-compress-dir.sh.in mode change 100755 => 100644 utils/hwloc/test-hwloc-distrib.sh.in mode change 100755 => 100644 utils/hwloc/test-hwloc-info.sh.in mode change 100755 => 100644 utils/lstopo/test-hwloc-ls.sh.in diff --git a/.gitignore b/.gitignore index 99d4e38e85..2b2d3656ff 100644 --- a/.gitignore +++ b/.gitignore @@ -28,14 +28,15 @@ test-suite.log /autom4te.cache /aclocal.m4 /tags -/hwloc.pc /libtool +/hwloc.pc + /include/hwloc/autogen/config.h -/include/hwloc/autogen/stamp-h2 +/include/hwloc/autogen/stamp-h? /include/private/autogen/config.h /include/private/autogen/config.h.in -/include/private/autogen/stamp-h1 +/include/private/autogen/stamp-h? /doc/doxygen-config.cfg /doc/doxygen-doc/ @@ -44,82 +45,89 @@ test-suite.log /doc/hwloc-hello /doc/hwloc-hello-cpp /doc/hwloc-hello-cpp.cpp -/doc/*.o -/doc/*.log -/doc/*.trs /doc/doc.out /doc/readme.out -/src/static-components.h -/src/*.lo -/src/libhwloc.la -/src/libltdl/ +/hwloc/static-components.h +/hwloc/libhwloc.la -/tests/wrapper.sh -/tests/hwloc_list_components -/tests/hwloc_bitmap -/tests/hwloc_bitmap_string -/tests/hwloc_get_closest_objs -/tests/hwloc_get_obj_covering_cpuset -/tests/hwloc_get_cache_covering_cpuset -/tests/hwloc_get_largest_objs_inside_cpuset -/tests/hwloc_get_next_obj_covering_cpuset -/tests/hwloc_get_obj_inside_cpuset -/tests/hwloc_get_shared_cache_covering_obj -/tests/hwloc_get_obj_below_array_by_type -/tests/hwloc_bitmap_first_last_weight -/tests/hwloc_bitmap_singlify -/tests/hwloc_type_depth -/tests/hwloc_bind -/tests/hwloc_get_last_cpu_location -/tests/hwloc_object_userdata -/tests/hwloc_synthetic -/tests/hwloc_custom -/tests/hwloc_backends -/tests/hwloc_pci_backend -/tests/hwloc_is_thissystem -/tests/hwloc_distances -/tests/hwloc_groups -/tests/hwloc_groups2 -/tests/hwloc_insert_misc -/tests/hwloc_topology_restrict -/tests/hwloc_obj_infos -/tests/hwloc_iodevs -/tests/hwloc_topology_diff -/tests/hwloc_topology_dup -/tests/xmlbuffer -/tests/gl -/tests/intel-mic -/tests/linux-libnuma -/tests/glibc-sched -/tests/openfabrics-verbs -/tests/myriexpress -/tests/opencl -/tests/cuda -/tests/cudart -/tests/nvml -/tests/*.o -/tests/*.log -/tests/*.trs +/tests/hwloc/wrapper.sh +/tests/hwloc/hwloc_list_components +/tests/hwloc/hwloc_bitmap +/tests/hwloc/hwloc_bitmap_string +/tests/hwloc/hwloc_get_closest_objs +/tests/hwloc/hwloc_get_obj_covering_cpuset +/tests/hwloc/hwloc_get_cache_covering_cpuset +/tests/hwloc/hwloc_get_largest_objs_inside_cpuset +/tests/hwloc/hwloc_get_next_obj_covering_cpuset +/tests/hwloc/hwloc_get_obj_inside_cpuset +/tests/hwloc/hwloc_get_shared_cache_covering_obj +/tests/hwloc/hwloc_get_obj_below_array_by_type +/tests/hwloc/hwloc_bitmap_first_last_weight +/tests/hwloc/hwloc_bitmap_singlify +/tests/hwloc/hwloc_type_depth +/tests/hwloc/hwloc_bind +/tests/hwloc/hwloc_get_last_cpu_location +/tests/hwloc/hwloc_object_userdata +/tests/hwloc/hwloc_synthetic +/tests/hwloc/hwloc_custom +/tests/hwloc/hwloc_backends +/tests/hwloc/hwloc_pci_backend +/tests/hwloc/hwloc_is_thissystem +/tests/hwloc/hwloc_distances +/tests/hwloc/hwloc_groups +/tests/hwloc/hwloc_groups2 +/tests/hwloc/hwloc_insert_misc +/tests/hwloc/hwloc_topology_diff +/tests/hwloc/hwloc_topology_dup +/tests/hwloc/hwloc_topology_restrict +/tests/hwloc/hwloc_obj_infos +/tests/hwloc/hwloc_iodevs +/tests/hwloc/xmlbuffer +/tests/hwloc/gl +/tests/hwloc/intel-mic +/tests/hwloc/linux-libnuma +/tests/hwloc/glibc-sched +/tests/hwloc/openfabrics-verbs +/tests/hwloc/myriexpress +/tests/hwloc/opencl +/tests/hwloc/cuda +/tests/hwloc/cudart +/tests/hwloc/nvml -/tests/linux/hwloc-gather-topology -/tests/linux/test-topology.sh -/tests/linux/*.log -/tests/linux/*.trs +/tests/hwloc/linux/hwloc-gather-topology +/tests/hwloc/linux/test-topology.sh -/tests/linux/gather/test-gather-topology.sh -/tests/linux/gather/*.log -/tests/linux/gather/*.trs +/tests/hwloc/linux/gather/test-gather-topology.sh -/tests/ports/*.c -/tests/ports/*.la -/tests/ports/*.lo +/tests/hwloc/ports/*.c -/tests/xml/test-topology.sh -/tests/xml/*.log -/tests/xml/*.trs +/tests/hwloc/xml/test-topology.sh + +/tests/hwloc/embedded/aclocal.m4 +/tests/hwloc/embedded/autom4te.cache +/tests/hwloc/embedded/check.out +/tests/hwloc/embedded/clean.out +/tests/hwloc/embedded/config.out +/tests/hwloc/embedded/config/ar-lib +/tests/hwloc/embedded/config/compile +/tests/hwloc/embedded/config/config.guess +/tests/hwloc/embedded/config/config.sub +/tests/hwloc/embedded/config/depcomp +/tests/hwloc/embedded/config/install-sh +/tests/hwloc/embedded/config/libtool.m4 +/tests/hwloc/embedded/config/ltmain.sh +/tests/hwloc/embedded/config/ltoptions.m4 +/tests/hwloc/embedded/config/ltsugar.m4 +/tests/hwloc/embedded/config/ltversion.m4 +/tests/hwloc/embedded/config/lt~obsolete.m4 +/tests/hwloc/embedded/config/missing +/tests/hwloc/embedded/config/test-driver +/tests/hwloc/embedded/configure +/tests/hwloc/embedded/distclean.out +/tests/hwloc/embedded/hwloc-tree/ +/tests/hwloc/embedded/make.out -/utils/hwloc/*.o /utils/hwloc/hwloc-annotate /utils/hwloc/hwloc-annotate.1 /utils/hwloc/hwloc-assembler @@ -165,4 +173,3 @@ test-suite.log /utils/lstopo/test-hwloc-ls.sh /utils/lstopo/test-*.sh.log /utils/lstopo/test-*.sh.trs - diff --git a/Makefile.am b/Makefile.am index a893763e48..6726025bc3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,17 @@ # via AC_CONFIG_MACRO_DIR in configure.ac. ACLOCAL_AMFLAGS = -I ./config -SUBDIRS = src include +# +# "make distcheck" requires that tarballs are able to be able to "make +# dist", so we have to include config/distscript.sh. +# +EXTRA_DIST = \ + README VERSION COPYING AUTHORS \ + config/hwloc_get_version.sh \ + config/distscript.sh + +SUBDIRS = include hwloc + if HWLOC_BUILD_STANDALONE SUBDIRS += utils tests # We need doc/ if HWLOC_BUILD_DOXYGEN, or during make install if HWLOC_INSTALL_DOXYGEN. @@ -27,21 +37,14 @@ pkgconfig_DATA = hwloc.pc endif endif -# Only install the valgrind suppressions file if we're building in standalone mode +# Only install the valgrind suppressions file if we're building in +# standalone mode if HWLOC_BUILD_STANDALONE dist_pkgdata_DATA = contrib/hwloc-valgrind.supp endif -# -# "make distcheck" requires that tarballs are able to be able to "make -# dist", so we have to include config/distscript.sh. -# -EXTRA_DIST = \ - README VERSION COPYING AUTHORS \ - config/hwloc_get_version.sh \ - config/distscript.sh - -# Only install entire visual studio subdirectory if we're building in standalone mode +# Only install entire visual studio subdirectory if we're building in +# standalone mode if HWLOC_BUILD_STANDALONE EXTRA_DIST += contrib/windows endif @@ -51,15 +54,6 @@ dist-hook: sh "$(top_srcdir)/config/distscript.sh" "$(top_srcdir)" "$(distdir)" "$(HWLOC_VERSION)" endif HWLOC_BUILD_STANDALONE -# -# Build the documenation and top-level README file -# -if HWLOC_BUILD_STANDALONE -.PHONY: doc readme -doc readme: - $(MAKE) -C doc -endif HWLOC_BUILD_STANDALONE - if HWLOC_BUILD_STANDALONE if HWLOC_HAVE_WINDOWS # @@ -73,3 +67,12 @@ uninstall-local: rm -f $(DESTDIR)$(prefix)/README.txt $(DESTDIR)$(prefix)/NEWS.txt $(DESTDIR)$(prefix)/COPYING.txt endif HWLOC_HAVE_WINDOWS endif HWLOC_BUILD_STANDALONE + +# +# Build the documenation and top-level README file +# +if HWLOC_BUILD_STANDALONE +.PHONY: doc readme +doc readme: + $(MAKE) -C doc +endif HWLOC_BUILD_STANDALONE diff --git a/VERSION b/VERSION index 90541947e9..3f94570b9a 100644 --- a/VERSION +++ b/VERSION @@ -11,8 +11,8 @@ snapshot_version=gitclone # major, minor, and release are generally combined in the form # ... If release is zero, then it is omitted. -major=1 -minor=11 +major=2 +minor=0 release=0 # greek is used for alpha or beta release tags. If it is non-empty, diff --git a/config/hwloc.m4 b/config/hwloc.m4 index d941609a93..d909a64c7e 100644 --- a/config/hwloc.m4 +++ b/config/hwloc.m4 @@ -904,7 +904,7 @@ EOF]) AC_MSG_CHECKING([for x86 cpuid]) old_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$HWLOC_top_srcdir/include" - # We need hwloc_uint64_t but we can't use hwloc/autogen/config.h before configure ends. + # We need hwloc_uint64_t but we can't use autogen/config.h before configure ends. # So pass #include/#define manually here for now. CPUID_CHECK_HEADERS= CPUID_CHECK_DEFINE= @@ -1013,7 +1013,7 @@ EOF]) AC_SUBST(HWLOC_PLUGINS_DIR) # Static components output file - hwloc_static_components_dir=${HWLOC_top_builddir}/src + hwloc_static_components_dir=${HWLOC_top_builddir}/hwloc mkdir -p ${hwloc_static_components_dir} hwloc_static_components_file=${hwloc_static_components_dir}/static-components.h rm -f ${hwloc_static_components_file} @@ -1079,7 +1079,7 @@ EOF]) AS_IF([test "$hwloc_mode" = "embedded"], [HWLOC_EMBEDDED_CFLAGS=$HWLOC_CFLAGS HWLOC_EMBEDDED_CPPFLAGS=$HWLOC_CPPFLAGS - HWLOC_EMBEDDED_LDADD='$(HWLOC_top_builddir)/src/libhwloc_embedded.la' + HWLOC_EMBEDDED_LDADD='$(HWLOC_top_builddir)/hwloc/libhwloc_embedded.la' HWLOC_EMBEDDED_LIBS=$HWLOC_LIBS HWLOC_LIBS=]) AC_SUBST(HWLOC_EMBEDDED_CFLAGS) @@ -1091,7 +1091,7 @@ EOF]) AC_CONFIG_FILES( hwloc_config_prefix[Makefile] hwloc_config_prefix[include/Makefile] - hwloc_config_prefix[src/Makefile ] + hwloc_config_prefix[hwloc/Makefile ] ) # Cleanup diff --git a/config/hwloc_internal.m4 b/config/hwloc_internal.m4 index afc4f9d8c8..e70461557b 100644 --- a/config/hwloc_internal.m4 +++ b/config/hwloc_internal.m4 @@ -380,16 +380,17 @@ int foo(void) { # Only generate these files if we're making the tests AC_CONFIG_FILES( hwloc_config_prefix[tests/Makefile] - hwloc_config_prefix[tests/linux/Makefile] - hwloc_config_prefix[tests/linux/gather/Makefile] - hwloc_config_prefix[tests/xml/Makefile] - hwloc_config_prefix[tests/ports/Makefile] - hwloc_config_prefix[tests/rename/Makefile] - hwloc_config_prefix[tests/linux/hwloc-gather-topology] - hwloc_config_prefix[tests/linux/gather/test-gather-topology.sh] - hwloc_config_prefix[tests/linux/test-topology.sh] - hwloc_config_prefix[tests/xml/test-topology.sh] - hwloc_config_prefix[tests/wrapper.sh] + hwloc_config_prefix[tests/hwloc/Makefile] + hwloc_config_prefix[tests/hwloc/linux/Makefile] + hwloc_config_prefix[tests/hwloc/linux/gather/Makefile] + hwloc_config_prefix[tests/hwloc/xml/Makefile] + hwloc_config_prefix[tests/hwloc/ports/Makefile] + hwloc_config_prefix[tests/hwloc/rename/Makefile] + hwloc_config_prefix[tests/hwloc/linux/hwloc-gather-topology] + hwloc_config_prefix[tests/hwloc/linux/gather/test-gather-topology.sh] + hwloc_config_prefix[tests/hwloc/linux/test-topology.sh] + hwloc_config_prefix[tests/hwloc/xml/test-topology.sh] + hwloc_config_prefix[tests/hwloc/wrapper.sh] hwloc_config_prefix[utils/hwloc/hwloc-assembler-remote] hwloc_config_prefix[utils/hwloc/hwloc-compress-dir] hwloc_config_prefix[utils/hwloc/test-hwloc-annotate.sh] @@ -403,7 +404,24 @@ int foo(void) { hwloc_config_prefix[utils/hwloc/test-fake-plugin.sh] hwloc_config_prefix[utils/lstopo/test-hwloc-ls.sh]) - AC_CONFIG_COMMANDS([chmoding-scripts], [chmod +x ]hwloc_config_prefix[tests/linux/test-topology.sh ]hwloc_config_prefix[tests/xml/test-topology.sh ]hwloc_config_prefix[tests/linux/hwloc-gather-topology ]hwloc_config_prefix[tests/linux/gather/test-gather-topology.sh ]hwloc_config_prefix[tests/wrapper.sh ]hwloc_config_prefix[utils/hwloc/hwloc-assembler-remote ]hwloc_config_prefix[utils/hwloc/hwloc-compress-dir ]hwloc_config_prefix[utils/hwloc/test-hwloc-annotate.sh ]hwloc_config_prefix[utils/hwloc/test-hwloc-assembler.sh ]hwloc_config_prefix[utils/hwloc/test-hwloc-calc.sh ]hwloc_config_prefix[utils/hwloc/test-hwloc-compress-dir.sh ]hwloc_config_prefix[utils/hwloc/test-hwloc-diffpatch.sh ]hwloc_config_prefix[utils/hwloc/test-hwloc-distances.sh ]hwloc_config_prefix[utils/hwloc/test-hwloc-distrib.sh ]hwloc_config_prefix[utils/hwloc/test-hwloc-info.sh ]hwloc_config_prefix[utils/hwloc/test-fake-plugin.sh ]hwloc_config_prefix[utils/lstopo/test-hwloc-ls.sh]) + AC_CONFIG_COMMANDS([chmoding-scripts], [ +chmod +x ]hwloc_config_prefix[tests/hwloc/linux/test-topology.sh \ + ]hwloc_config_prefix[tests/hwloc/xml/test-topology.sh \ + ]hwloc_config_prefix[tests/hwloc/linux/hwloc-gather-topology \ + ]hwloc_config_prefix[tests/hwloc/linux/gather/test-gather-topology.sh \ + ]hwloc_config_prefix[tests/hwloc/wrapper.sh \ + ]hwloc_config_prefix[utils/hwloc/hwloc-assembler-remote \ + ]hwloc_config_prefix[utils/hwloc/hwloc-compress-dir \ + ]hwloc_config_prefix[utils/hwloc/test-hwloc-annotate.sh \ + ]hwloc_config_prefix[utils/hwloc/test-hwloc-assembler.sh \ + ]hwloc_config_prefix[utils/hwloc/test-hwloc-calc.sh \ + ]hwloc_config_prefix[utils/hwloc/test-hwloc-compress-dir.sh \ + ]hwloc_config_prefix[utils/hwloc/test-hwloc-diffpatch.sh \ + ]hwloc_config_prefix[utils/hwloc/test-hwloc-distances.sh \ + ]hwloc_config_prefix[utils/hwloc/test-hwloc-distrib.sh \ + ]hwloc_config_prefix[utils/hwloc/test-hwloc-info.sh \ + ]hwloc_config_prefix[utils/hwloc/test-fake-plugin.sh \ + ]hwloc_config_prefix[utils/lstopo/test-hwloc-ls.sh]) # These links are only needed in standalone mode. It would # be nice to m4 foreach this somehow, but whenever I tried @@ -412,19 +430,19 @@ int foo(void) { # built in standalone mode, only generate them in # standalone mode. AC_CONFIG_LINKS( - hwloc_config_prefix[tests/ports/topology-solaris.c]:hwloc_config_prefix[src/topology-solaris.c] - hwloc_config_prefix[tests/ports/topology-solaris-chiptype.c]:hwloc_config_prefix[src/topology-solaris-chiptype.c] - hwloc_config_prefix[tests/ports/topology-aix.c]:hwloc_config_prefix[src/topology-aix.c] - hwloc_config_prefix[tests/ports/topology-osf.c]:hwloc_config_prefix[src/topology-osf.c] - hwloc_config_prefix[tests/ports/topology-windows.c]:hwloc_config_prefix[src/topology-windows.c] - hwloc_config_prefix[tests/ports/topology-darwin.c]:hwloc_config_prefix[src/topology-darwin.c] - hwloc_config_prefix[tests/ports/topology-freebsd.c]:hwloc_config_prefix[src/topology-freebsd.c] - hwloc_config_prefix[tests/ports/topology-netbsd.c]:hwloc_config_prefix[src/topology-netbsd.c] - hwloc_config_prefix[tests/ports/topology-hpux.c]:hwloc_config_prefix[src/topology-hpux.c] - hwloc_config_prefix[tests/ports/topology-bgq.c]:hwloc_config_prefix[src/topology-bgq.c] - hwloc_config_prefix[tests/ports/topology-opencl.c]:hwloc_config_prefix[src/topology-opencl.c] - hwloc_config_prefix[tests/ports/topology-cuda.c]:hwloc_config_prefix[src/topology-cuda.c] - hwloc_config_prefix[tests/ports/topology-nvml.c]:hwloc_config_prefix[src/topology-nvml.c] - hwloc_config_prefix[tests/ports/topology-gl.c]:hwloc_config_prefix[src/topology-gl.c]) + hwloc_config_prefix[tests/hwloc/ports/topology-solaris.c]:hwloc_config_prefix[hwloc/topology-solaris.c] + hwloc_config_prefix[tests/hwloc/ports/topology-solaris-chiptype.c]:hwloc_config_prefix[hwloc/topology-solaris-chiptype.c] + hwloc_config_prefix[tests/hwloc/ports/topology-aix.c]:hwloc_config_prefix[hwloc/topology-aix.c] + hwloc_config_prefix[tests/hwloc/ports/topology-osf.c]:hwloc_config_prefix[hwloc/topology-osf.c] + hwloc_config_prefix[tests/hwloc/ports/topology-windows.c]:hwloc_config_prefix[hwloc/topology-windows.c] + hwloc_config_prefix[tests/hwloc/ports/topology-darwin.c]:hwloc_config_prefix[hwloc/topology-darwin.c] + hwloc_config_prefix[tests/hwloc/ports/topology-freebsd.c]:hwloc_config_prefix[hwloc/topology-freebsd.c] + hwloc_config_prefix[tests/hwloc/ports/topology-netbsd.c]:hwloc_config_prefix[hwloc/topology-netbsd.c] + hwloc_config_prefix[tests/hwloc/ports/topology-hpux.c]:hwloc_config_prefix[hwloc/topology-hpux.c] + hwloc_config_prefix[tests/hwloc/ports/topology-bgq.c]:hwloc_config_prefix[hwloc/topology-bgq.c] + hwloc_config_prefix[tests/hwloc/ports/topology-opencl.c]:hwloc_config_prefix[hwloc/topology-opencl.c] + hwloc_config_prefix[tests/hwloc/ports/topology-cuda.c]:hwloc_config_prefix[hwloc/topology-cuda.c] + hwloc_config_prefix[tests/hwloc/ports/topology-nvml.c]:hwloc_config_prefix[hwloc/topology-nvml.c] + hwloc_config_prefix[tests/hwloc/ports/topology-gl.c]:hwloc_config_prefix[hwloc/topology-gl.c]) ]) ])dnl diff --git a/configure.ac b/configure.ac index 8c171d8776..21827f2f74 100644 --- a/configure.ac +++ b/configure.ac @@ -89,7 +89,7 @@ AC_SUBST([libhwloc_so_version]) AH_TOP([/* -*- c -*- * * Copyright © 2009, 2011, 2012 CNRS, inria., Université Bordeaux All rights reserved. - * Copyright © 2009 Cisco Systems, Inc. All rights reserved. + * Copyright © 2009-2014 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/contrib/update-my-copyright.pl b/contrib/update-my-copyright.pl index 8727832fc5..060cedd9cf 100755 --- a/contrib/update-my-copyright.pl +++ b/contrib/update-my-copyright.pl @@ -121,7 +121,7 @@ sub quiet_print { # Find the top-level HWLOC source tree dir my $start = cwd(); my $top = $start; -while (! -d "$top/src") { +while (! -d "$top/hwloc") { chdir(".."); $top = cwd(); die "Can't find top-level hwloc directory" diff --git a/doc/Makefile.am b/doc/Makefile.am index d1a810ba87..c61c8a095f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,6 @@ # Copyright © 2009-2014 Inria. All rights reserved. # Copyright © 2009-2013 Université Bordeaux -# Copyright © 2009-2010 Cisco Systems, Inc. All rights reserved. +# Copyright © 2009-2014 Cisco Systems, Inc. All rights reserved. # See COPYING in top-level directory. AM_CPPFLAGS = $(HWLOC_CPPFLAGS) @@ -62,24 +62,26 @@ if HWLOC_BUILD_DOXYGEN # change. # +hwloc_include_dir = $(HWLOC_top_srcdir)/include + dox_inputs = $(DOX_CONFIG) \ $(srcdir)/hwloc.doxy \ - $(HWLOC_top_srcdir)/include/hwloc.h \ - $(HWLOC_top_srcdir)/include/hwloc/helper.h \ - $(HWLOC_top_srcdir)/include/hwloc/bitmap.h \ - $(HWLOC_top_srcdir)/include/hwloc/diff.h \ - $(HWLOC_top_srcdir)/include/hwloc/plugins.h \ - $(HWLOC_top_srcdir)/include/hwloc/glibc-sched.h \ - $(HWLOC_top_srcdir)/include/hwloc/linux.h \ - $(HWLOC_top_srcdir)/include/hwloc/linux-libnuma.h \ - $(HWLOC_top_srcdir)/include/hwloc/opencl.h \ - $(HWLOC_top_srcdir)/include/hwloc/cuda.h \ - $(HWLOC_top_srcdir)/include/hwloc/cudart.h \ - $(HWLOC_top_srcdir)/include/hwloc/nvml.h \ - $(HWLOC_top_srcdir)/include/hwloc/gl.h \ - $(HWLOC_top_srcdir)/include/hwloc/intel-mic.h \ - $(HWLOC_top_srcdir)/include/hwloc/openfabrics-verbs.h \ - $(HWLOC_top_srcdir)/include/hwloc/myriexpress.h + $(hwloc_include_dir)/hwloc.h \ + $(hwloc_include_dir)/hwloc/helper.h \ + $(hwloc_include_dir)/hwloc/bitmap.h \ + $(hwloc_include_dir)/hwloc/diff.h \ + $(hwloc_include_dir)/hwloc/plugins.h \ + $(hwloc_include_dir)/hwloc/glibc-sched.h \ + $(hwloc_include_dir)/hwloc/linux.h \ + $(hwloc_include_dir)/hwloc/linux-libnuma.h \ + $(hwloc_include_dir)/hwloc/opencl.h \ + $(hwloc_include_dir)/hwloc/cuda.h \ + $(hwloc_include_dir)/hwloc/cudart.h \ + $(hwloc_include_dir)/hwloc/nvml.h \ + $(hwloc_include_dir)/hwloc/gl.h \ + $(hwloc_include_dir)/hwloc/intel-mic.h \ + $(hwloc_include_dir)/hwloc/openfabrics-verbs.h \ + $(hwloc_include_dir)/hwloc/myriexpress.h # # Create the images that we need for the PDF output and the HTML @@ -773,7 +775,7 @@ if HWLOC_BUILD_README # Rules for creating the top-level README file. There does not appear # to be an easy way to know if AC_PATH_PROG found something in # configure.ac (!), so put a run-time check here to see if we have -# w3c. +# w3c. # # Just like BUILD_DOXYGEN, BUILD_README will automatically be false if # we're not building standalone. diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 31bcb36f7e..0969b13327 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -11,7 +11,7 @@ AM_CFLAGS = $(HWLOC_CFLAGS) AM_CPPFLAGS = $(HWLOC_CPPFLAGS) AM_LDFLAGS = $(HWLOC_LDFLAGS) -LDADD = $(HWLOC_top_builddir)/src/libhwloc.la +LDADD = $(HWLOC_top_builddir)/hwloc/libhwloc.la DEPENDENCIES = $(LDADD) TESTS = hwloc-hello diff --git a/src/Makefile.am b/hwloc/Makefile.am similarity index 100% rename from src/Makefile.am rename to hwloc/Makefile.am diff --git a/src/base64.c b/hwloc/base64.c similarity index 100% rename from src/base64.c rename to hwloc/base64.c diff --git a/src/bind.c b/hwloc/bind.c similarity index 100% rename from src/bind.c rename to hwloc/bind.c diff --git a/src/bitmap.c b/hwloc/bitmap.c similarity index 100% rename from src/bitmap.c rename to hwloc/bitmap.c diff --git a/src/components.c b/hwloc/components.c similarity index 100% rename from src/components.c rename to hwloc/components.c diff --git a/src/diff.c b/hwloc/diff.c similarity index 100% rename from src/diff.c rename to hwloc/diff.c diff --git a/src/distances.c b/hwloc/distances.c similarity index 100% rename from src/distances.c rename to hwloc/distances.c diff --git a/src/dolib.c b/hwloc/dolib.c similarity index 100% rename from src/dolib.c rename to hwloc/dolib.c diff --git a/src/hwloc.dtd b/hwloc/hwloc.dtd similarity index 100% rename from src/hwloc.dtd rename to hwloc/hwloc.dtd diff --git a/src/misc.c b/hwloc/misc.c similarity index 100% rename from src/misc.c rename to hwloc/misc.c diff --git a/src/pci-common.c b/hwloc/pci-common.c similarity index 100% rename from src/pci-common.c rename to hwloc/pci-common.c diff --git a/src/topology-aix.c b/hwloc/topology-aix.c similarity index 100% rename from src/topology-aix.c rename to hwloc/topology-aix.c diff --git a/src/topology-bgq.c b/hwloc/topology-bgq.c similarity index 100% rename from src/topology-bgq.c rename to hwloc/topology-bgq.c diff --git a/src/topology-cuda.c b/hwloc/topology-cuda.c similarity index 100% rename from src/topology-cuda.c rename to hwloc/topology-cuda.c diff --git a/src/topology-custom.c b/hwloc/topology-custom.c similarity index 100% rename from src/topology-custom.c rename to hwloc/topology-custom.c diff --git a/src/topology-darwin.c b/hwloc/topology-darwin.c similarity index 100% rename from src/topology-darwin.c rename to hwloc/topology-darwin.c diff --git a/src/topology-fake.c b/hwloc/topology-fake.c similarity index 100% rename from src/topology-fake.c rename to hwloc/topology-fake.c diff --git a/src/topology-freebsd.c b/hwloc/topology-freebsd.c similarity index 100% rename from src/topology-freebsd.c rename to hwloc/topology-freebsd.c diff --git a/src/topology-gl.c b/hwloc/topology-gl.c similarity index 100% rename from src/topology-gl.c rename to hwloc/topology-gl.c diff --git a/src/topology-hpux.c b/hwloc/topology-hpux.c similarity index 100% rename from src/topology-hpux.c rename to hwloc/topology-hpux.c diff --git a/src/topology-linux.c b/hwloc/topology-linux.c similarity index 100% rename from src/topology-linux.c rename to hwloc/topology-linux.c diff --git a/src/topology-netbsd.c b/hwloc/topology-netbsd.c similarity index 100% rename from src/topology-netbsd.c rename to hwloc/topology-netbsd.c diff --git a/src/topology-noos.c b/hwloc/topology-noos.c similarity index 100% rename from src/topology-noos.c rename to hwloc/topology-noos.c diff --git a/src/topology-nvml.c b/hwloc/topology-nvml.c similarity index 100% rename from src/topology-nvml.c rename to hwloc/topology-nvml.c diff --git a/src/topology-opencl.c b/hwloc/topology-opencl.c similarity index 100% rename from src/topology-opencl.c rename to hwloc/topology-opencl.c diff --git a/src/topology-osf.c b/hwloc/topology-osf.c similarity index 100% rename from src/topology-osf.c rename to hwloc/topology-osf.c diff --git a/src/topology-pci.c b/hwloc/topology-pci.c similarity index 100% rename from src/topology-pci.c rename to hwloc/topology-pci.c diff --git a/src/topology-solaris-chiptype.c b/hwloc/topology-solaris-chiptype.c similarity index 100% rename from src/topology-solaris-chiptype.c rename to hwloc/topology-solaris-chiptype.c diff --git a/src/topology-solaris.c b/hwloc/topology-solaris.c similarity index 100% rename from src/topology-solaris.c rename to hwloc/topology-solaris.c diff --git a/src/topology-synthetic.c b/hwloc/topology-synthetic.c similarity index 100% rename from src/topology-synthetic.c rename to hwloc/topology-synthetic.c diff --git a/src/topology-windows.c b/hwloc/topology-windows.c similarity index 100% rename from src/topology-windows.c rename to hwloc/topology-windows.c diff --git a/src/topology-x86.c b/hwloc/topology-x86.c similarity index 100% rename from src/topology-x86.c rename to hwloc/topology-x86.c diff --git a/src/topology-xml-libxml.c b/hwloc/topology-xml-libxml.c similarity index 100% rename from src/topology-xml-libxml.c rename to hwloc/topology-xml-libxml.c diff --git a/src/topology-xml-nolibxml.c b/hwloc/topology-xml-nolibxml.c similarity index 100% rename from src/topology-xml-nolibxml.c rename to hwloc/topology-xml-nolibxml.c diff --git a/src/topology-xml.c b/hwloc/topology-xml.c similarity index 100% rename from src/topology-xml.c rename to hwloc/topology-xml.c diff --git a/src/topology.c b/hwloc/topology.c similarity index 100% rename from src/topology.c rename to hwloc/topology.c diff --git a/src/traversal.c b/hwloc/traversal.c similarity index 100% rename from src/traversal.c rename to hwloc/traversal.c diff --git a/tests/Makefile.am b/tests/Makefile.am index a6d31193bf..aa01af4df0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,121 +1,5 @@ -# Copyright © 2009-2013 Inria. All rights reserved. -# Copyright © 2009-2012 Université Bordeaux -# Copyright © 2009-2010 Cisco Systems, Inc. All rights reserved. +# Copyright © 2014 Cisco Systems, Inc. All rights reserved. +# # See COPYING in top-level directory. -AM_CFLAGS = $(HWLOC_CFLAGS) -AM_CPPFLAGS = $(HWLOC_CPPFLAGS) -AM_LDFLAGS = $(HWLOC_LDFLAGS) - -SUBDIRS = ports xml -DIST_SUBDIRS = ports xml linux rename - -if HWLOC_HAVE_LINUX -SUBDIRS += linux -endif HWLOC_HAVE_LINUX - -LDADD = - -LOG_COMPILER = $(builddir)/wrapper.sh - -check_PROGRAMS = hwloc_list_components \ - hwloc_bitmap \ - hwloc_bitmap_string \ - hwloc_get_closest_objs \ - hwloc_get_obj_covering_cpuset \ - hwloc_get_cache_covering_cpuset \ - hwloc_get_largest_objs_inside_cpuset \ - hwloc_get_next_obj_covering_cpuset \ - hwloc_get_obj_inside_cpuset \ - hwloc_get_shared_cache_covering_obj \ - hwloc_get_obj_below_array_by_type \ - hwloc_bitmap_first_last_weight \ - hwloc_bitmap_singlify \ - hwloc_type_depth \ - hwloc_bind \ - hwloc_get_last_cpu_location \ - hwloc_object_userdata \ - hwloc_synthetic \ - hwloc_custom \ - hwloc_backends \ - hwloc_pci_backend \ - hwloc_is_thissystem \ - hwloc_distances \ - hwloc_groups \ - hwloc_groups2 \ - hwloc_insert_misc \ - hwloc_topology_restrict \ - hwloc_topology_dup \ - hwloc_topology_diff \ - hwloc_obj_infos \ - hwloc_iodevs \ - xmlbuffer \ - gl \ - intel-mic - -if HWLOC_HAVE_LINUX_LIBNUMA -check_PROGRAMS += linux-libnuma -endif HWLOC_HAVE_LINUX_LIBNUMA - -if HWLOC_HAVE_SCHED_SETAFFINITY -check_PROGRAMS += glibc-sched -endif HWLOC_HAVE_SCHED_SETAFFINITY - -if HWLOC_HAVE_LIBIBVERBS -check_PROGRAMS += openfabrics-verbs -endif HWLOC_HAVE_LIBIBVERBS - -if HWLOC_HAVE_MYRIEXPRESS -check_PROGRAMS += myriexpress -endif HWLOC_HAVE_MYRIEXPRESS - -if HWLOC_HAVE_OPENCL -check_PROGRAMS += opencl -endif HWLOC_HAVE_OPENCL - -if HWLOC_HAVE_CUDA -check_PROGRAMS += cuda -endif HWLOC_HAVE_CUDA - -if HWLOC_HAVE_CUDART -check_PROGRAMS += cudart -endif HWLOC_HAVE_CUDART - -if HWLOC_HAVE_NVML -check_PROGRAMS += nvml -endif HWLOC_HAVE_NVML - -TESTS = $(check_PROGRAMS) - -# The library has a different name depending on whether we are -# building in standalone or embedded mode. -if HWLOC_BUILD_STANDALONE -hwloc_lib = libhwloc.la -else -hwloc_lib = libhwloc_embedded.la -endif - -LDADD += $(HWLOC_top_builddir)/src/$(hwloc_lib) - -linux_libnuma_LDADD = $(LDADD) -lnuma -openfabrics_verbs_LDADD = $(LDADD) -libverbs -myriexpress_LDADD = $(LDADD) -lmyriexpress -opencl_LDADD = $(LDADD) -lOpenCL -cuda_LDADD = $(LDADD) -lcuda -cudart_LDADD = $(LDADD) -lcuda -lcudart -nvml_LDADD = $(LDADD) -lnvidia-ml -hwloc_bind_LDADD = $(LDADD) -if HWLOC_HAVE_PTHREAD -hwloc_bind_LDADD += -lpthread -endif - -# ship the embedded test code but don't actually let automake ever -# look at it because we have another configure stuff in there -EXTRA_DIST = embedded/autogen.sh \ - embedded/configure.ac \ - embedded/Makefile.am \ - embedded/do_test.c \ - embedded/main.c \ - embedded/run-embedded-tests.sh \ - embedded/README.txt \ - embedded/config/README.txt +SUBDIRS = hwloc diff --git a/tests/hwloc/Makefile.am b/tests/hwloc/Makefile.am new file mode 100644 index 0000000000..41e1cab7f3 --- /dev/null +++ b/tests/hwloc/Makefile.am @@ -0,0 +1,121 @@ +# Copyright © 2009-2013 Inria. All rights reserved. +# Copyright © 2009-2012 Université Bordeaux +# Copyright © 2009-2014 Cisco Systems, Inc. All rights reserved. +# See COPYING in top-level directory. + +AM_CFLAGS = $(HWLOC_CFLAGS) +AM_CPPFLAGS = $(HWLOC_CPPFLAGS) +AM_LDFLAGS = $(HWLOC_LDFLAGS) + +SUBDIRS = ports xml +DIST_SUBDIRS = ports xml linux rename + +if HWLOC_HAVE_LINUX +SUBDIRS += linux +endif HWLOC_HAVE_LINUX + +LDADD = + +LOG_COMPILER = $(builddir)/wrapper.sh + +check_PROGRAMS = hwloc_list_components \ + hwloc_bitmap \ + hwloc_bitmap_string \ + hwloc_get_closest_objs \ + hwloc_get_obj_covering_cpuset \ + hwloc_get_cache_covering_cpuset \ + hwloc_get_largest_objs_inside_cpuset \ + hwloc_get_next_obj_covering_cpuset \ + hwloc_get_obj_inside_cpuset \ + hwloc_get_shared_cache_covering_obj \ + hwloc_get_obj_below_array_by_type \ + hwloc_bitmap_first_last_weight \ + hwloc_bitmap_singlify \ + hwloc_type_depth \ + hwloc_bind \ + hwloc_get_last_cpu_location \ + hwloc_object_userdata \ + hwloc_synthetic \ + hwloc_custom \ + hwloc_backends \ + hwloc_pci_backend \ + hwloc_is_thissystem \ + hwloc_distances \ + hwloc_groups \ + hwloc_groups2 \ + hwloc_insert_misc \ + hwloc_topology_restrict \ + hwloc_topology_dup \ + hwloc_topology_diff \ + hwloc_obj_infos \ + hwloc_iodevs \ + xmlbuffer \ + gl \ + intel-mic + +if HWLOC_HAVE_LINUX_LIBNUMA +check_PROGRAMS += linux-libnuma +endif HWLOC_HAVE_LINUX_LIBNUMA + +if HWLOC_HAVE_SCHED_SETAFFINITY +check_PROGRAMS += glibc-sched +endif HWLOC_HAVE_SCHED_SETAFFINITY + +if HWLOC_HAVE_LIBIBVERBS +check_PROGRAMS += openfabrics-verbs +endif HWLOC_HAVE_LIBIBVERBS + +if HWLOC_HAVE_MYRIEXPRESS +check_PROGRAMS += myriexpress +endif HWLOC_HAVE_MYRIEXPRESS + +if HWLOC_HAVE_OPENCL +check_PROGRAMS += opencl +endif HWLOC_HAVE_OPENCL + +if HWLOC_HAVE_CUDA +check_PROGRAMS += cuda +endif HWLOC_HAVE_CUDA + +if HWLOC_HAVE_CUDART +check_PROGRAMS += cudart +endif HWLOC_HAVE_CUDART + +if HWLOC_HAVE_NVML +check_PROGRAMS += nvml +endif HWLOC_HAVE_NVML + +TESTS = $(check_PROGRAMS) + +# The library has a different name depending on whether we are +# building in standalone or embedded mode. +if HWLOC_BUILD_STANDALONE +hwloc_lib = libhwloc.la +else +hwloc_lib = libhwloc_embedded.la +endif + +LDADD += $(HWLOC_top_builddir)/hwloc/$(hwloc_lib) + +linux_libnuma_LDADD = $(LDADD) -lnuma +openfabrics_verbs_LDADD = $(LDADD) -libverbs +myriexpress_LDADD = $(LDADD) -lmyriexpress +opencl_LDADD = $(LDADD) -lOpenCL +cuda_LDADD = $(LDADD) -lcuda +cudart_LDADD = $(LDADD) -lcuda -lcudart +nvml_LDADD = $(LDADD) -lnvidia-ml +hwloc_bind_LDADD = $(LDADD) +if HWLOC_HAVE_PTHREAD +hwloc_bind_LDADD += -lpthread +endif + +# ship the embedded test code but don't actually let automake ever +# look at it because we have another configure stuff in there +EXTRA_DIST = embedded/autogen.sh \ + embedded/configure.ac \ + embedded/Makefile.am \ + embedded/do_test.c \ + embedded/main.c \ + embedded/run-embedded-tests.sh \ + embedded/README.txt \ + embedded/config/README.txt diff --git a/tests/cuda.c b/tests/hwloc/cuda.c similarity index 100% rename from tests/cuda.c rename to tests/hwloc/cuda.c diff --git a/tests/cudart.c b/tests/hwloc/cudart.c similarity index 100% rename from tests/cudart.c rename to tests/hwloc/cudart.c diff --git a/tests/embedded/Makefile.am b/tests/hwloc/embedded/Makefile.am similarity index 100% rename from tests/embedded/Makefile.am rename to tests/hwloc/embedded/Makefile.am diff --git a/tests/embedded/README.txt b/tests/hwloc/embedded/README.txt similarity index 100% rename from tests/embedded/README.txt rename to tests/hwloc/embedded/README.txt diff --git a/tests/embedded/autogen.sh b/tests/hwloc/embedded/autogen.sh similarity index 100% rename from tests/embedded/autogen.sh rename to tests/hwloc/embedded/autogen.sh diff --git a/tests/embedded/config/README.txt b/tests/hwloc/embedded/config/README.txt similarity index 100% rename from tests/embedded/config/README.txt rename to tests/hwloc/embedded/config/README.txt diff --git a/tests/embedded/configure.ac b/tests/hwloc/embedded/configure.ac similarity index 100% rename from tests/embedded/configure.ac rename to tests/hwloc/embedded/configure.ac diff --git a/tests/embedded/do_test.c b/tests/hwloc/embedded/do_test.c similarity index 100% rename from tests/embedded/do_test.c rename to tests/hwloc/embedded/do_test.c diff --git a/tests/embedded/main.c b/tests/hwloc/embedded/main.c similarity index 100% rename from tests/embedded/main.c rename to tests/hwloc/embedded/main.c diff --git a/tests/embedded/run-embedded-tests.sh b/tests/hwloc/embedded/run-embedded-tests.sh similarity index 100% rename from tests/embedded/run-embedded-tests.sh rename to tests/hwloc/embedded/run-embedded-tests.sh diff --git a/tests/gl.c b/tests/hwloc/gl.c similarity index 100% rename from tests/gl.c rename to tests/hwloc/gl.c diff --git a/tests/glibc-sched.c b/tests/hwloc/glibc-sched.c similarity index 100% rename from tests/glibc-sched.c rename to tests/hwloc/glibc-sched.c diff --git a/tests/hwloc_backends.c b/tests/hwloc/hwloc_backends.c similarity index 100% rename from tests/hwloc_backends.c rename to tests/hwloc/hwloc_backends.c diff --git a/tests/hwloc_bind.c b/tests/hwloc/hwloc_bind.c similarity index 100% rename from tests/hwloc_bind.c rename to tests/hwloc/hwloc_bind.c diff --git a/tests/hwloc_bitmap.c b/tests/hwloc/hwloc_bitmap.c similarity index 100% rename from tests/hwloc_bitmap.c rename to tests/hwloc/hwloc_bitmap.c diff --git a/tests/hwloc_bitmap_first_last_weight.c b/tests/hwloc/hwloc_bitmap_first_last_weight.c similarity index 100% rename from tests/hwloc_bitmap_first_last_weight.c rename to tests/hwloc/hwloc_bitmap_first_last_weight.c diff --git a/tests/hwloc_bitmap_singlify.c b/tests/hwloc/hwloc_bitmap_singlify.c similarity index 100% rename from tests/hwloc_bitmap_singlify.c rename to tests/hwloc/hwloc_bitmap_singlify.c diff --git a/tests/hwloc_bitmap_string.c b/tests/hwloc/hwloc_bitmap_string.c similarity index 100% rename from tests/hwloc_bitmap_string.c rename to tests/hwloc/hwloc_bitmap_string.c diff --git a/tests/hwloc_custom.c b/tests/hwloc/hwloc_custom.c similarity index 100% rename from tests/hwloc_custom.c rename to tests/hwloc/hwloc_custom.c diff --git a/tests/hwloc_distances.c b/tests/hwloc/hwloc_distances.c similarity index 100% rename from tests/hwloc_distances.c rename to tests/hwloc/hwloc_distances.c diff --git a/tests/hwloc_get_cache_covering_cpuset.c b/tests/hwloc/hwloc_get_cache_covering_cpuset.c similarity index 100% rename from tests/hwloc_get_cache_covering_cpuset.c rename to tests/hwloc/hwloc_get_cache_covering_cpuset.c diff --git a/tests/hwloc_get_closest_objs.c b/tests/hwloc/hwloc_get_closest_objs.c similarity index 100% rename from tests/hwloc_get_closest_objs.c rename to tests/hwloc/hwloc_get_closest_objs.c diff --git a/tests/hwloc_get_largest_objs_inside_cpuset.c b/tests/hwloc/hwloc_get_largest_objs_inside_cpuset.c similarity index 100% rename from tests/hwloc_get_largest_objs_inside_cpuset.c rename to tests/hwloc/hwloc_get_largest_objs_inside_cpuset.c diff --git a/tests/hwloc_get_last_cpu_location.c b/tests/hwloc/hwloc_get_last_cpu_location.c similarity index 100% rename from tests/hwloc_get_last_cpu_location.c rename to tests/hwloc/hwloc_get_last_cpu_location.c diff --git a/tests/hwloc_get_next_obj_covering_cpuset.c b/tests/hwloc/hwloc_get_next_obj_covering_cpuset.c similarity index 100% rename from tests/hwloc_get_next_obj_covering_cpuset.c rename to tests/hwloc/hwloc_get_next_obj_covering_cpuset.c diff --git a/tests/hwloc_get_obj_below_array_by_type.c b/tests/hwloc/hwloc_get_obj_below_array_by_type.c similarity index 100% rename from tests/hwloc_get_obj_below_array_by_type.c rename to tests/hwloc/hwloc_get_obj_below_array_by_type.c diff --git a/tests/hwloc_get_obj_covering_cpuset.c b/tests/hwloc/hwloc_get_obj_covering_cpuset.c similarity index 100% rename from tests/hwloc_get_obj_covering_cpuset.c rename to tests/hwloc/hwloc_get_obj_covering_cpuset.c diff --git a/tests/hwloc_get_obj_inside_cpuset.c b/tests/hwloc/hwloc_get_obj_inside_cpuset.c similarity index 100% rename from tests/hwloc_get_obj_inside_cpuset.c rename to tests/hwloc/hwloc_get_obj_inside_cpuset.c diff --git a/tests/hwloc_get_shared_cache_covering_obj.c b/tests/hwloc/hwloc_get_shared_cache_covering_obj.c similarity index 100% rename from tests/hwloc_get_shared_cache_covering_obj.c rename to tests/hwloc/hwloc_get_shared_cache_covering_obj.c diff --git a/tests/hwloc_groups.c b/tests/hwloc/hwloc_groups.c similarity index 100% rename from tests/hwloc_groups.c rename to tests/hwloc/hwloc_groups.c diff --git a/tests/hwloc_groups2.c b/tests/hwloc/hwloc_groups2.c similarity index 100% rename from tests/hwloc_groups2.c rename to tests/hwloc/hwloc_groups2.c diff --git a/tests/hwloc_insert_misc.c b/tests/hwloc/hwloc_insert_misc.c similarity index 100% rename from tests/hwloc_insert_misc.c rename to tests/hwloc/hwloc_insert_misc.c diff --git a/tests/hwloc_iodevs.c b/tests/hwloc/hwloc_iodevs.c similarity index 100% rename from tests/hwloc_iodevs.c rename to tests/hwloc/hwloc_iodevs.c diff --git a/tests/hwloc_is_thissystem.c b/tests/hwloc/hwloc_is_thissystem.c similarity index 100% rename from tests/hwloc_is_thissystem.c rename to tests/hwloc/hwloc_is_thissystem.c diff --git a/tests/hwloc_list_components.c b/tests/hwloc/hwloc_list_components.c similarity index 100% rename from tests/hwloc_list_components.c rename to tests/hwloc/hwloc_list_components.c diff --git a/tests/hwloc_obj_infos.c b/tests/hwloc/hwloc_obj_infos.c similarity index 100% rename from tests/hwloc_obj_infos.c rename to tests/hwloc/hwloc_obj_infos.c diff --git a/tests/hwloc_object_userdata.c b/tests/hwloc/hwloc_object_userdata.c similarity index 100% rename from tests/hwloc_object_userdata.c rename to tests/hwloc/hwloc_object_userdata.c diff --git a/tests/hwloc_pci_backend.c b/tests/hwloc/hwloc_pci_backend.c similarity index 100% rename from tests/hwloc_pci_backend.c rename to tests/hwloc/hwloc_pci_backend.c diff --git a/tests/hwloc_synthetic.c b/tests/hwloc/hwloc_synthetic.c similarity index 100% rename from tests/hwloc_synthetic.c rename to tests/hwloc/hwloc_synthetic.c diff --git a/tests/hwloc_topology_diff.c b/tests/hwloc/hwloc_topology_diff.c similarity index 100% rename from tests/hwloc_topology_diff.c rename to tests/hwloc/hwloc_topology_diff.c diff --git a/tests/hwloc_topology_dup.c b/tests/hwloc/hwloc_topology_dup.c similarity index 100% rename from tests/hwloc_topology_dup.c rename to tests/hwloc/hwloc_topology_dup.c diff --git a/tests/hwloc_topology_restrict.c b/tests/hwloc/hwloc_topology_restrict.c similarity index 100% rename from tests/hwloc_topology_restrict.c rename to tests/hwloc/hwloc_topology_restrict.c diff --git a/tests/hwloc_type_depth.c b/tests/hwloc/hwloc_type_depth.c similarity index 100% rename from tests/hwloc_type_depth.c rename to tests/hwloc/hwloc_type_depth.c diff --git a/tests/intel-mic.c b/tests/hwloc/intel-mic.c similarity index 100% rename from tests/intel-mic.c rename to tests/hwloc/intel-mic.c diff --git a/tests/linux-libnuma.c b/tests/hwloc/linux-libnuma.c similarity index 100% rename from tests/linux-libnuma.c rename to tests/hwloc/linux-libnuma.c diff --git a/tests/linux/128ia64-17n4s2c.output b/tests/hwloc/linux/128ia64-17n4s2c.output similarity index 100% rename from tests/linux/128ia64-17n4s2c.output rename to tests/hwloc/linux/128ia64-17n4s2c.output diff --git a/tests/linux/128ia64-17n4s2c.tar.bz2 b/tests/hwloc/linux/128ia64-17n4s2c.tar.bz2 similarity index 100% rename from tests/linux/128ia64-17n4s2c.tar.bz2 rename to tests/hwloc/linux/128ia64-17n4s2c.tar.bz2 diff --git a/tests/linux/16amd64-4n4c-cgroup-distance-merge.options b/tests/hwloc/linux/16amd64-4n4c-cgroup-distance-merge.options similarity index 100% rename from tests/linux/16amd64-4n4c-cgroup-distance-merge.options rename to tests/hwloc/linux/16amd64-4n4c-cgroup-distance-merge.options diff --git a/tests/linux/16amd64-4n4c-cgroup-distance-merge.output b/tests/hwloc/linux/16amd64-4n4c-cgroup-distance-merge.output similarity index 100% rename from tests/linux/16amd64-4n4c-cgroup-distance-merge.output rename to tests/hwloc/linux/16amd64-4n4c-cgroup-distance-merge.output diff --git a/tests/linux/16amd64-4n4c-cgroup-distance-merge.tar.bz2 b/tests/hwloc/linux/16amd64-4n4c-cgroup-distance-merge.tar.bz2 similarity index 100% rename from tests/linux/16amd64-4n4c-cgroup-distance-merge.tar.bz2 rename to tests/hwloc/linux/16amd64-4n4c-cgroup-distance-merge.tar.bz2 diff --git a/tests/linux/16amd64-8n2c-cpusets.output b/tests/hwloc/linux/16amd64-8n2c-cpusets.output similarity index 100% rename from tests/linux/16amd64-8n2c-cpusets.output rename to tests/hwloc/linux/16amd64-8n2c-cpusets.output diff --git a/tests/linux/16amd64-8n2c-cpusets.tar.bz2 b/tests/hwloc/linux/16amd64-8n2c-cpusets.tar.bz2 similarity index 100% rename from tests/linux/16amd64-8n2c-cpusets.tar.bz2 rename to tests/hwloc/linux/16amd64-8n2c-cpusets.tar.bz2 diff --git a/tests/linux/16amd64-8n2c-cpusets.xml.options b/tests/hwloc/linux/16amd64-8n2c-cpusets.xml.options similarity index 100% rename from tests/linux/16amd64-8n2c-cpusets.xml.options rename to tests/hwloc/linux/16amd64-8n2c-cpusets.xml.options diff --git a/tests/linux/16amd64-8n2c-cpusets.xml.output b/tests/hwloc/linux/16amd64-8n2c-cpusets.xml.output similarity index 100% rename from tests/linux/16amd64-8n2c-cpusets.xml.output rename to tests/hwloc/linux/16amd64-8n2c-cpusets.xml.output diff --git a/tests/linux/16amd64-8n2c-cpusets.xml.source b/tests/hwloc/linux/16amd64-8n2c-cpusets.xml.source similarity index 100% rename from tests/linux/16amd64-8n2c-cpusets.xml.source rename to tests/hwloc/linux/16amd64-8n2c-cpusets.xml.source diff --git a/tests/linux/16amd64-8n2c-cpusets_noadmin.options b/tests/hwloc/linux/16amd64-8n2c-cpusets_noadmin.options similarity index 100% rename from tests/linux/16amd64-8n2c-cpusets_noadmin.options rename to tests/hwloc/linux/16amd64-8n2c-cpusets_noadmin.options diff --git a/tests/linux/16amd64-8n2c-cpusets_noadmin.output b/tests/hwloc/linux/16amd64-8n2c-cpusets_noadmin.output similarity index 100% rename from tests/linux/16amd64-8n2c-cpusets_noadmin.output rename to tests/hwloc/linux/16amd64-8n2c-cpusets_noadmin.output diff --git a/tests/linux/16amd64-8n2c-cpusets_noadmin.source b/tests/hwloc/linux/16amd64-8n2c-cpusets_noadmin.source similarity index 100% rename from tests/linux/16amd64-8n2c-cpusets_noadmin.source rename to tests/hwloc/linux/16amd64-8n2c-cpusets_noadmin.source diff --git a/tests/linux/16amd64-8n2c.output b/tests/hwloc/linux/16amd64-8n2c.output similarity index 100% rename from tests/linux/16amd64-8n2c.output rename to tests/hwloc/linux/16amd64-8n2c.output diff --git a/tests/linux/16amd64-8n2c.tar.bz2 b/tests/hwloc/linux/16amd64-8n2c.tar.bz2 similarity index 100% rename from tests/linux/16amd64-8n2c.tar.bz2 rename to tests/hwloc/linux/16amd64-8n2c.tar.bz2 diff --git a/tests/linux/16em64t-2m4c2t.output b/tests/hwloc/linux/16em64t-2m4c2t.output similarity index 100% rename from tests/linux/16em64t-2m4c2t.output rename to tests/hwloc/linux/16em64t-2m4c2t.output diff --git a/tests/linux/16em64t-2m4c2t.tar.bz2 b/tests/hwloc/linux/16em64t-2m4c2t.tar.bz2 similarity index 100% rename from tests/linux/16em64t-2m4c2t.tar.bz2 rename to tests/hwloc/linux/16em64t-2m4c2t.tar.bz2 diff --git a/tests/linux/16em64t-4s2c2t-offlines.output b/tests/hwloc/linux/16em64t-4s2c2t-offlines.output similarity index 100% rename from tests/linux/16em64t-4s2c2t-offlines.output rename to tests/hwloc/linux/16em64t-4s2c2t-offlines.output diff --git a/tests/linux/16em64t-4s2c2t-offlines.tar.bz2 b/tests/hwloc/linux/16em64t-4s2c2t-offlines.tar.bz2 similarity index 100% rename from tests/linux/16em64t-4s2c2t-offlines.tar.bz2 rename to tests/hwloc/linux/16em64t-4s2c2t-offlines.tar.bz2 diff --git a/tests/linux/16em64t-4s2c2t-offlines.xml.options b/tests/hwloc/linux/16em64t-4s2c2t-offlines.xml.options similarity index 100% rename from tests/linux/16em64t-4s2c2t-offlines.xml.options rename to tests/hwloc/linux/16em64t-4s2c2t-offlines.xml.options diff --git a/tests/linux/16em64t-4s2c2t-offlines.xml.output b/tests/hwloc/linux/16em64t-4s2c2t-offlines.xml.output similarity index 100% rename from tests/linux/16em64t-4s2c2t-offlines.xml.output rename to tests/hwloc/linux/16em64t-4s2c2t-offlines.xml.output diff --git a/tests/linux/16em64t-4s2c2t-offlines.xml.source b/tests/hwloc/linux/16em64t-4s2c2t-offlines.xml.source similarity index 100% rename from tests/linux/16em64t-4s2c2t-offlines.xml.source rename to tests/hwloc/linux/16em64t-4s2c2t-offlines.xml.source diff --git a/tests/linux/16em64t-4s2c2t-offlines_noadmin.options b/tests/hwloc/linux/16em64t-4s2c2t-offlines_noadmin.options similarity index 100% rename from tests/linux/16em64t-4s2c2t-offlines_noadmin.options rename to tests/hwloc/linux/16em64t-4s2c2t-offlines_noadmin.options diff --git a/tests/linux/16em64t-4s2c2t-offlines_noadmin.output b/tests/hwloc/linux/16em64t-4s2c2t-offlines_noadmin.output similarity index 100% rename from tests/linux/16em64t-4s2c2t-offlines_noadmin.output rename to tests/hwloc/linux/16em64t-4s2c2t-offlines_noadmin.output diff --git a/tests/linux/16em64t-4s2c2t-offlines_noadmin.source b/tests/hwloc/linux/16em64t-4s2c2t-offlines_noadmin.source similarity index 100% rename from tests/linux/16em64t-4s2c2t-offlines_noadmin.source rename to tests/hwloc/linux/16em64t-4s2c2t-offlines_noadmin.source diff --git a/tests/linux/16em64t-4s2c2t.output b/tests/hwloc/linux/16em64t-4s2c2t.output similarity index 100% rename from tests/linux/16em64t-4s2c2t.output rename to tests/hwloc/linux/16em64t-4s2c2t.output diff --git a/tests/linux/16em64t-4s2c2t.tar.bz2 b/tests/hwloc/linux/16em64t-4s2c2t.tar.bz2 similarity index 100% rename from tests/linux/16em64t-4s2c2t.tar.bz2 rename to tests/hwloc/linux/16em64t-4s2c2t.tar.bz2 diff --git a/tests/linux/16em64t-4s2c2t.xml.options b/tests/hwloc/linux/16em64t-4s2c2t.xml.options similarity index 100% rename from tests/linux/16em64t-4s2c2t.xml.options rename to tests/hwloc/linux/16em64t-4s2c2t.xml.options diff --git a/tests/linux/16em64t-4s2c2t.xml.output b/tests/hwloc/linux/16em64t-4s2c2t.xml.output similarity index 100% rename from tests/linux/16em64t-4s2c2t.xml.output rename to tests/hwloc/linux/16em64t-4s2c2t.xml.output diff --git a/tests/linux/16em64t-4s2c2t.xml.source b/tests/hwloc/linux/16em64t-4s2c2t.xml.source similarity index 100% rename from tests/linux/16em64t-4s2c2t.xml.source rename to tests/hwloc/linux/16em64t-4s2c2t.xml.source diff --git a/tests/linux/16em64t-4s2c2t_merge.options b/tests/hwloc/linux/16em64t-4s2c2t_merge.options similarity index 100% rename from tests/linux/16em64t-4s2c2t_merge.options rename to tests/hwloc/linux/16em64t-4s2c2t_merge.options diff --git a/tests/linux/16em64t-4s2c2t_merge.output b/tests/hwloc/linux/16em64t-4s2c2t_merge.output similarity index 100% rename from tests/linux/16em64t-4s2c2t_merge.output rename to tests/hwloc/linux/16em64t-4s2c2t_merge.output diff --git a/tests/linux/16em64t-4s2c2t_merge.source b/tests/hwloc/linux/16em64t-4s2c2t_merge.source similarity index 100% rename from tests/linux/16em64t-4s2c2t_merge.source rename to tests/hwloc/linux/16em64t-4s2c2t_merge.source diff --git a/tests/linux/16em64t-4s2c2t_ncaches.options b/tests/hwloc/linux/16em64t-4s2c2t_ncaches.options similarity index 100% rename from tests/linux/16em64t-4s2c2t_ncaches.options rename to tests/hwloc/linux/16em64t-4s2c2t_ncaches.options diff --git a/tests/linux/16em64t-4s2c2t_ncaches.output b/tests/hwloc/linux/16em64t-4s2c2t_ncaches.output similarity index 100% rename from tests/linux/16em64t-4s2c2t_ncaches.output rename to tests/hwloc/linux/16em64t-4s2c2t_ncaches.output diff --git a/tests/linux/16em64t-4s2c2t_ncaches.source b/tests/hwloc/linux/16em64t-4s2c2t_ncaches.source similarity index 100% rename from tests/linux/16em64t-4s2c2t_ncaches.source rename to tests/hwloc/linux/16em64t-4s2c2t_ncaches.source diff --git a/tests/linux/16em64t-4s2ca2c-cpusetreorder.output b/tests/hwloc/linux/16em64t-4s2ca2c-cpusetreorder.output similarity index 100% rename from tests/linux/16em64t-4s2ca2c-cpusetreorder.output rename to tests/hwloc/linux/16em64t-4s2ca2c-cpusetreorder.output diff --git a/tests/linux/16em64t-4s2ca2c-cpusetreorder.tar.bz2 b/tests/hwloc/linux/16em64t-4s2ca2c-cpusetreorder.tar.bz2 similarity index 100% rename from tests/linux/16em64t-4s2ca2c-cpusetreorder.tar.bz2 rename to tests/hwloc/linux/16em64t-4s2ca2c-cpusetreorder.tar.bz2 diff --git a/tests/linux/16ia64-8n2s.output b/tests/hwloc/linux/16ia64-8n2s.output similarity index 100% rename from tests/linux/16ia64-8n2s.output rename to tests/hwloc/linux/16ia64-8n2s.output diff --git a/tests/linux/16ia64-8n2s.tar.bz2 b/tests/hwloc/linux/16ia64-8n2s.tar.bz2 similarity index 100% rename from tests/linux/16ia64-8n2s.tar.bz2 rename to tests/hwloc/linux/16ia64-8n2s.tar.bz2 diff --git a/tests/linux/1alpha.output b/tests/hwloc/linux/1alpha.output similarity index 100% rename from tests/linux/1alpha.output rename to tests/hwloc/linux/1alpha.output diff --git a/tests/linux/1alpha.tar.bz2 b/tests/hwloc/linux/1alpha.tar.bz2 similarity index 100% rename from tests/linux/1alpha.tar.bz2 rename to tests/hwloc/linux/1alpha.tar.bz2 diff --git a/tests/linux/20s390-2g6s4c.output b/tests/hwloc/linux/20s390-2g6s4c.output similarity index 100% rename from tests/linux/20s390-2g6s4c.output rename to tests/hwloc/linux/20s390-2g6s4c.output diff --git a/tests/linux/20s390-2g6s4c.tar.bz2 b/tests/hwloc/linux/20s390-2g6s4c.tar.bz2 similarity index 100% rename from tests/linux/20s390-2g6s4c.tar.bz2 rename to tests/hwloc/linux/20s390-2g6s4c.tar.bz2 diff --git a/tests/linux/24em64t-2n6c2t+2mic.olddriver.options b/tests/hwloc/linux/24em64t-2n6c2t+2mic.olddriver.options similarity index 100% rename from tests/linux/24em64t-2n6c2t+2mic.olddriver.options rename to tests/hwloc/linux/24em64t-2n6c2t+2mic.olddriver.options diff --git a/tests/linux/24em64t-2n6c2t+2mic.olddriver.output b/tests/hwloc/linux/24em64t-2n6c2t+2mic.olddriver.output similarity index 100% rename from tests/linux/24em64t-2n6c2t+2mic.olddriver.output rename to tests/hwloc/linux/24em64t-2n6c2t+2mic.olddriver.output diff --git a/tests/linux/24em64t-2n6c2t+2mic.olddriver.tar.bz2 b/tests/hwloc/linux/24em64t-2n6c2t+2mic.olddriver.tar.bz2 similarity index 100% rename from tests/linux/24em64t-2n6c2t+2mic.olddriver.tar.bz2 rename to tests/hwloc/linux/24em64t-2n6c2t+2mic.olddriver.tar.bz2 diff --git a/tests/linux/256ia64-64n2s2c.output b/tests/hwloc/linux/256ia64-64n2s2c.output similarity index 100% rename from tests/linux/256ia64-64n2s2c.output rename to tests/hwloc/linux/256ia64-64n2s2c.output diff --git a/tests/linux/256ia64-64n2s2c.tar.bz2 b/tests/hwloc/linux/256ia64-64n2s2c.tar.bz2 similarity index 100% rename from tests/linux/256ia64-64n2s2c.tar.bz2 rename to tests/hwloc/linux/256ia64-64n2s2c.tar.bz2 diff --git a/tests/linux/256ppc-8n8s4t-nocache.exclude b/tests/hwloc/linux/256ppc-8n8s4t-nocache.exclude similarity index 100% rename from tests/linux/256ppc-8n8s4t-nocache.exclude rename to tests/hwloc/linux/256ppc-8n8s4t-nocache.exclude diff --git a/tests/linux/256ppc-8n8s4t-nocache.output b/tests/hwloc/linux/256ppc-8n8s4t-nocache.output similarity index 100% rename from tests/linux/256ppc-8n8s4t-nocache.output rename to tests/hwloc/linux/256ppc-8n8s4t-nocache.output diff --git a/tests/linux/256ppc-8n8s4t-nocache.source b/tests/hwloc/linux/256ppc-8n8s4t-nocache.source similarity index 100% rename from tests/linux/256ppc-8n8s4t-nocache.source rename to tests/hwloc/linux/256ppc-8n8s4t-nocache.source diff --git a/tests/linux/256ppc-8n8s4t-nosys.exclude b/tests/hwloc/linux/256ppc-8n8s4t-nosys.exclude similarity index 100% rename from tests/linux/256ppc-8n8s4t-nosys.exclude rename to tests/hwloc/linux/256ppc-8n8s4t-nosys.exclude diff --git a/tests/linux/256ppc-8n8s4t-nosys.output b/tests/hwloc/linux/256ppc-8n8s4t-nosys.output similarity index 100% rename from tests/linux/256ppc-8n8s4t-nosys.output rename to tests/hwloc/linux/256ppc-8n8s4t-nosys.output diff --git a/tests/linux/256ppc-8n8s4t-nosys.source b/tests/hwloc/linux/256ppc-8n8s4t-nosys.source similarity index 100% rename from tests/linux/256ppc-8n8s4t-nosys.source rename to tests/hwloc/linux/256ppc-8n8s4t-nosys.source diff --git a/tests/linux/256ppc-8n8s4t.output b/tests/hwloc/linux/256ppc-8n8s4t.output similarity index 100% rename from tests/linux/256ppc-8n8s4t.output rename to tests/hwloc/linux/256ppc-8n8s4t.output diff --git a/tests/linux/256ppc-8n8s4t.tar.bz2 b/tests/hwloc/linux/256ppc-8n8s4t.tar.bz2 similarity index 100% rename from tests/linux/256ppc-8n8s4t.tar.bz2 rename to tests/hwloc/linux/256ppc-8n8s4t.tar.bz2 diff --git a/tests/linux/28em64t-2s2n7c-buggycoresiblings.output b/tests/hwloc/linux/28em64t-2s2n7c-buggycoresiblings.output similarity index 100% rename from tests/linux/28em64t-2s2n7c-buggycoresiblings.output rename to tests/hwloc/linux/28em64t-2s2n7c-buggycoresiblings.output diff --git a/tests/linux/28em64t-2s2n7c-buggycoresiblings.tar.bz2 b/tests/hwloc/linux/28em64t-2s2n7c-buggycoresiblings.tar.bz2 similarity index 100% rename from tests/linux/28em64t-2s2n7c-buggycoresiblings.tar.bz2 rename to tests/hwloc/linux/28em64t-2s2n7c-buggycoresiblings.tar.bz2 diff --git a/tests/linux/2amd64-2n.output b/tests/hwloc/linux/2amd64-2n.output similarity index 100% rename from tests/linux/2amd64-2n.output rename to tests/hwloc/linux/2amd64-2n.output diff --git a/tests/linux/2amd64-2n.tar.bz2 b/tests/hwloc/linux/2amd64-2n.tar.bz2 similarity index 100% rename from tests/linux/2amd64-2n.tar.bz2 rename to tests/hwloc/linux/2amd64-2n.tar.bz2 diff --git a/tests/linux/2arm-2c.output b/tests/hwloc/linux/2arm-2c.output similarity index 100% rename from tests/linux/2arm-2c.output rename to tests/hwloc/linux/2arm-2c.output diff --git a/tests/linux/2arm-2c.tar.bz2 b/tests/hwloc/linux/2arm-2c.tar.bz2 similarity index 100% rename from tests/linux/2arm-2c.tar.bz2 rename to tests/hwloc/linux/2arm-2c.tar.bz2 diff --git a/tests/linux/2i386-2c-nohugepage.tar.bz2 b/tests/hwloc/linux/2i386-2c-nohugepage.tar.bz2 similarity index 100% rename from tests/linux/2i386-2c-nohugepage.tar.bz2 rename to tests/hwloc/linux/2i386-2c-nohugepage.tar.bz2 diff --git a/tests/linux/2i386-2c-nohugepage.xml.options b/tests/hwloc/linux/2i386-2c-nohugepage.xml.options similarity index 100% rename from tests/linux/2i386-2c-nohugepage.xml.options rename to tests/hwloc/linux/2i386-2c-nohugepage.xml.options diff --git a/tests/linux/2i386-2c-nohugepage.xml.output b/tests/hwloc/linux/2i386-2c-nohugepage.xml.output similarity index 100% rename from tests/linux/2i386-2c-nohugepage.xml.output rename to tests/hwloc/linux/2i386-2c-nohugepage.xml.output diff --git a/tests/linux/2i386-2c-nohugepage.xml.source b/tests/hwloc/linux/2i386-2c-nohugepage.xml.source similarity index 100% rename from tests/linux/2i386-2c-nohugepage.xml.source rename to tests/hwloc/linux/2i386-2c-nohugepage.xml.source diff --git a/tests/linux/2i386-2t-hugepagesizecount.tar.bz2 b/tests/hwloc/linux/2i386-2t-hugepagesizecount.tar.bz2 similarity index 100% rename from tests/linux/2i386-2t-hugepagesizecount.tar.bz2 rename to tests/hwloc/linux/2i386-2t-hugepagesizecount.tar.bz2 diff --git a/tests/linux/2i386-2t-hugepagesizecount.xml.env b/tests/hwloc/linux/2i386-2t-hugepagesizecount.xml.env similarity index 100% rename from tests/linux/2i386-2t-hugepagesizecount.xml.env rename to tests/hwloc/linux/2i386-2t-hugepagesizecount.xml.env diff --git a/tests/linux/2i386-2t-hugepagesizecount.xml.options b/tests/hwloc/linux/2i386-2t-hugepagesizecount.xml.options similarity index 100% rename from tests/linux/2i386-2t-hugepagesizecount.xml.options rename to tests/hwloc/linux/2i386-2t-hugepagesizecount.xml.options diff --git a/tests/linux/2i386-2t-hugepagesizecount.xml.output b/tests/hwloc/linux/2i386-2t-hugepagesizecount.xml.output similarity index 100% rename from tests/linux/2i386-2t-hugepagesizecount.xml.output rename to tests/hwloc/linux/2i386-2t-hugepagesizecount.xml.output diff --git a/tests/linux/2i386-2t-hugepagesizecount.xml.source b/tests/hwloc/linux/2i386-2t-hugepagesizecount.xml.source similarity index 100% rename from tests/linux/2i386-2t-hugepagesizecount.xml.source rename to tests/hwloc/linux/2i386-2t-hugepagesizecount.xml.source diff --git a/tests/linux/2ps3-2t.output b/tests/hwloc/linux/2ps3-2t.output similarity index 100% rename from tests/linux/2ps3-2t.output rename to tests/hwloc/linux/2ps3-2t.output diff --git a/tests/linux/2ps3-2t.tar.bz2 b/tests/hwloc/linux/2ps3-2t.tar.bz2 similarity index 100% rename from tests/linux/2ps3-2t.tar.bz2 rename to tests/hwloc/linux/2ps3-2t.tar.bz2 diff --git a/tests/linux/2s390-2c.output b/tests/hwloc/linux/2s390-2c.output similarity index 100% rename from tests/linux/2s390-2c.output rename to tests/hwloc/linux/2s390-2c.output diff --git a/tests/linux/2s390-2c.tar.bz2 b/tests/hwloc/linux/2s390-2c.tar.bz2 similarity index 100% rename from tests/linux/2s390-2c.tar.bz2 rename to tests/hwloc/linux/2s390-2c.tar.bz2 diff --git a/tests/linux/32amd64-4s2n4c-cgroup.env b/tests/hwloc/linux/32amd64-4s2n4c-cgroup.env similarity index 100% rename from tests/linux/32amd64-4s2n4c-cgroup.env rename to tests/hwloc/linux/32amd64-4s2n4c-cgroup.env diff --git a/tests/linux/32amd64-4s2n4c-cgroup.output b/tests/hwloc/linux/32amd64-4s2n4c-cgroup.output similarity index 100% rename from tests/linux/32amd64-4s2n4c-cgroup.output rename to tests/hwloc/linux/32amd64-4s2n4c-cgroup.output diff --git a/tests/linux/32amd64-4s2n4c-cgroup.tar.bz2 b/tests/hwloc/linux/32amd64-4s2n4c-cgroup.tar.bz2 similarity index 100% rename from tests/linux/32amd64-4s2n4c-cgroup.tar.bz2 rename to tests/hwloc/linux/32amd64-4s2n4c-cgroup.tar.bz2 diff --git a/tests/linux/32amd64-4s2n4c-cgroup.xml.env b/tests/hwloc/linux/32amd64-4s2n4c-cgroup.xml.env similarity index 100% rename from tests/linux/32amd64-4s2n4c-cgroup.xml.env rename to tests/hwloc/linux/32amd64-4s2n4c-cgroup.xml.env diff --git a/tests/linux/32amd64-4s2n4c-cgroup.xml.options b/tests/hwloc/linux/32amd64-4s2n4c-cgroup.xml.options similarity index 100% rename from tests/linux/32amd64-4s2n4c-cgroup.xml.options rename to tests/hwloc/linux/32amd64-4s2n4c-cgroup.xml.options diff --git a/tests/linux/32amd64-4s2n4c-cgroup.xml.output b/tests/hwloc/linux/32amd64-4s2n4c-cgroup.xml.output similarity index 100% rename from tests/linux/32amd64-4s2n4c-cgroup.xml.output rename to tests/hwloc/linux/32amd64-4s2n4c-cgroup.xml.output diff --git a/tests/linux/32amd64-4s2n4c-cgroup.xml.source b/tests/hwloc/linux/32amd64-4s2n4c-cgroup.xml.source similarity index 100% rename from tests/linux/32amd64-4s2n4c-cgroup.xml.source rename to tests/hwloc/linux/32amd64-4s2n4c-cgroup.xml.source diff --git a/tests/linux/32em64t-2n8c+1mic.options b/tests/hwloc/linux/32em64t-2n8c+1mic.options similarity index 100% rename from tests/linux/32em64t-2n8c+1mic.options rename to tests/hwloc/linux/32em64t-2n8c+1mic.options diff --git a/tests/linux/32em64t-2n8c+1mic.output b/tests/hwloc/linux/32em64t-2n8c+1mic.output similarity index 100% rename from tests/linux/32em64t-2n8c+1mic.output rename to tests/hwloc/linux/32em64t-2n8c+1mic.output diff --git a/tests/linux/32em64t-2n8c+1mic.tar.bz2 b/tests/hwloc/linux/32em64t-2n8c+1mic.tar.bz2 similarity index 100% rename from tests/linux/32em64t-2n8c+1mic.tar.bz2 rename to tests/hwloc/linux/32em64t-2n8c+1mic.tar.bz2 diff --git a/tests/linux/32ppc-4n4c2c.output b/tests/hwloc/linux/32ppc-4n4c2c.output similarity index 100% rename from tests/linux/32ppc-4n4c2c.output rename to tests/hwloc/linux/32ppc-4n4c2c.output diff --git a/tests/linux/32ppc-4n4c2c.tar.bz2 b/tests/hwloc/linux/32ppc-4n4c2c.tar.bz2 similarity index 100% rename from tests/linux/32ppc-4n4c2c.tar.bz2 rename to tests/hwloc/linux/32ppc-4n4c2c.tar.bz2 diff --git a/tests/linux/40intel64-2g2n4c+pci.env b/tests/hwloc/linux/40intel64-2g2n4c+pci.env similarity index 100% rename from tests/linux/40intel64-2g2n4c+pci.env rename to tests/hwloc/linux/40intel64-2g2n4c+pci.env diff --git a/tests/linux/40intel64-2g2n4c+pci.options b/tests/hwloc/linux/40intel64-2g2n4c+pci.options similarity index 100% rename from tests/linux/40intel64-2g2n4c+pci.options rename to tests/hwloc/linux/40intel64-2g2n4c+pci.options diff --git a/tests/linux/40intel64-2g2n4c+pci.output b/tests/hwloc/linux/40intel64-2g2n4c+pci.output similarity index 100% rename from tests/linux/40intel64-2g2n4c+pci.output rename to tests/hwloc/linux/40intel64-2g2n4c+pci.output diff --git a/tests/linux/40intel64-2g2n4c+pci.tar.bz2 b/tests/hwloc/linux/40intel64-2g2n4c+pci.tar.bz2 similarity index 100% rename from tests/linux/40intel64-2g2n4c+pci.tar.bz2 rename to tests/hwloc/linux/40intel64-2g2n4c+pci.tar.bz2 diff --git a/tests/linux/40intel64-4n10c+pci-conflicts.env b/tests/hwloc/linux/40intel64-4n10c+pci-conflicts.env similarity index 100% rename from tests/linux/40intel64-4n10c+pci-conflicts.env rename to tests/hwloc/linux/40intel64-4n10c+pci-conflicts.env diff --git a/tests/linux/40intel64-4n10c+pci-conflicts.output b/tests/hwloc/linux/40intel64-4n10c+pci-conflicts.output similarity index 100% rename from tests/linux/40intel64-4n10c+pci-conflicts.output rename to tests/hwloc/linux/40intel64-4n10c+pci-conflicts.output diff --git a/tests/linux/40intel64-4n10c+pci-conflicts.tar.bz2 b/tests/hwloc/linux/40intel64-4n10c+pci-conflicts.tar.bz2 similarity index 100% rename from tests/linux/40intel64-4n10c+pci-conflicts.tar.bz2 rename to tests/hwloc/linux/40intel64-4n10c+pci-conflicts.tar.bz2 diff --git a/tests/linux/48amd64-4d2n6c-sparse.output b/tests/hwloc/linux/48amd64-4d2n6c-sparse.output similarity index 100% rename from tests/linux/48amd64-4d2n6c-sparse.output rename to tests/hwloc/linux/48amd64-4d2n6c-sparse.output diff --git a/tests/linux/48amd64-4d2n6c-sparse.tar.bz2 b/tests/hwloc/linux/48amd64-4d2n6c-sparse.tar.bz2 similarity index 100% rename from tests/linux/48amd64-4d2n6c-sparse.tar.bz2 rename to tests/hwloc/linux/48amd64-4d2n6c-sparse.tar.bz2 diff --git a/tests/linux/4em64t-2c2t-ignore-reorder.options b/tests/hwloc/linux/4em64t-2c2t-ignore-reorder.options similarity index 100% rename from tests/linux/4em64t-2c2t-ignore-reorder.options rename to tests/hwloc/linux/4em64t-2c2t-ignore-reorder.options diff --git a/tests/linux/4em64t-2c2t-ignore-reorder.output b/tests/hwloc/linux/4em64t-2c2t-ignore-reorder.output similarity index 100% rename from tests/linux/4em64t-2c2t-ignore-reorder.output rename to tests/hwloc/linux/4em64t-2c2t-ignore-reorder.output diff --git a/tests/linux/4em64t-2c2t-ignore-reorder.tar.bz2 b/tests/hwloc/linux/4em64t-2c2t-ignore-reorder.tar.bz2 similarity index 100% rename from tests/linux/4em64t-2c2t-ignore-reorder.tar.bz2 rename to tests/hwloc/linux/4em64t-2c2t-ignore-reorder.tar.bz2 diff --git a/tests/linux/4ia64-4s.output b/tests/hwloc/linux/4ia64-4s.output similarity index 100% rename from tests/linux/4ia64-4s.output rename to tests/hwloc/linux/4ia64-4s.output diff --git a/tests/linux/4ia64-4s.tar.bz2 b/tests/hwloc/linux/4ia64-4s.tar.bz2 similarity index 100% rename from tests/linux/4ia64-4s.tar.bz2 rename to tests/hwloc/linux/4ia64-4s.tar.bz2 diff --git a/tests/linux/4ppc-4c.output b/tests/hwloc/linux/4ppc-4c.output similarity index 100% rename from tests/linux/4ppc-4c.output rename to tests/hwloc/linux/4ppc-4c.output diff --git a/tests/linux/4ppc-4c.tar.bz2 b/tests/hwloc/linux/4ppc-4c.tar.bz2 similarity index 100% rename from tests/linux/4ppc-4c.tar.bz2 rename to tests/hwloc/linux/4ppc-4c.tar.bz2 diff --git a/tests/linux/4qs22-2s2t.output b/tests/hwloc/linux/4qs22-2s2t.output similarity index 100% rename from tests/linux/4qs22-2s2t.output rename to tests/hwloc/linux/4qs22-2s2t.output diff --git a/tests/linux/4qs22-2s2t.tar.bz2 b/tests/hwloc/linux/4qs22-2s2t.tar.bz2 similarity index 100% rename from tests/linux/4qs22-2s2t.tar.bz2 rename to tests/hwloc/linux/4qs22-2s2t.tar.bz2 diff --git a/tests/linux/64amd64-4s2n4ca2co.output b/tests/hwloc/linux/64amd64-4s2n4ca2co.output similarity index 100% rename from tests/linux/64amd64-4s2n4ca2co.output rename to tests/hwloc/linux/64amd64-4s2n4ca2co.output diff --git a/tests/linux/64amd64-4s2n4ca2co.tar.bz2 b/tests/hwloc/linux/64amd64-4s2n4ca2co.tar.bz2 similarity index 100% rename from tests/linux/64amd64-4s2n4ca2co.tar.bz2 rename to tests/hwloc/linux/64amd64-4s2n4ca2co.tar.bz2 diff --git a/tests/linux/64fake-4n2s2ca2c2t.output b/tests/hwloc/linux/64fake-4n2s2ca2c2t.output similarity index 100% rename from tests/linux/64fake-4n2s2ca2c2t.output rename to tests/hwloc/linux/64fake-4n2s2ca2c2t.output diff --git a/tests/linux/64fake-4n2s2ca2c2t.tar.bz2 b/tests/hwloc/linux/64fake-4n2s2ca2c2t.tar.bz2 similarity index 100% rename from tests/linux/64fake-4n2s2ca2c2t.tar.bz2 rename to tests/hwloc/linux/64fake-4n2s2ca2c2t.tar.bz2 diff --git a/tests/linux/8amd64-4n2c.output b/tests/hwloc/linux/8amd64-4n2c.output similarity index 100% rename from tests/linux/8amd64-4n2c.output rename to tests/hwloc/linux/8amd64-4n2c.output diff --git a/tests/linux/8amd64-4n2c.tar.bz2 b/tests/hwloc/linux/8amd64-4n2c.tar.bz2 similarity index 100% rename from tests/linux/8amd64-4n2c.tar.bz2 rename to tests/hwloc/linux/8amd64-4n2c.tar.bz2 diff --git a/tests/linux/8em64t-2s2ca2c-buggynuma.output b/tests/hwloc/linux/8em64t-2s2ca2c-buggynuma.output similarity index 100% rename from tests/linux/8em64t-2s2ca2c-buggynuma.output rename to tests/hwloc/linux/8em64t-2s2ca2c-buggynuma.output diff --git a/tests/linux/8em64t-2s2ca2c-buggynuma.tar.bz2 b/tests/hwloc/linux/8em64t-2s2ca2c-buggynuma.tar.bz2 similarity index 100% rename from tests/linux/8em64t-2s2ca2c-buggynuma.tar.bz2 rename to tests/hwloc/linux/8em64t-2s2ca2c-buggynuma.tar.bz2 diff --git a/tests/linux/8em64t-2s2ca2c.output b/tests/hwloc/linux/8em64t-2s2ca2c.output similarity index 100% rename from tests/linux/8em64t-2s2ca2c.output rename to tests/hwloc/linux/8em64t-2s2ca2c.output diff --git a/tests/linux/8em64t-2s2ca2c.tar.bz2 b/tests/hwloc/linux/8em64t-2s2ca2c.tar.bz2 similarity index 100% rename from tests/linux/8em64t-2s2ca2c.tar.bz2 rename to tests/hwloc/linux/8em64t-2s2ca2c.tar.bz2 diff --git a/tests/linux/8em64t-2s4c-heterogeneous.output b/tests/hwloc/linux/8em64t-2s4c-heterogeneous.output similarity index 100% rename from tests/linux/8em64t-2s4c-heterogeneous.output rename to tests/hwloc/linux/8em64t-2s4c-heterogeneous.output diff --git a/tests/linux/8em64t-2s4c-heterogeneous.tar.bz2 b/tests/hwloc/linux/8em64t-2s4c-heterogeneous.tar.bz2 similarity index 100% rename from tests/linux/8em64t-2s4c-heterogeneous.tar.bz2 rename to tests/hwloc/linux/8em64t-2s4c-heterogeneous.tar.bz2 diff --git a/tests/linux/8em64t-4c2t.output b/tests/hwloc/linux/8em64t-4c2t.output similarity index 100% rename from tests/linux/8em64t-4c2t.output rename to tests/hwloc/linux/8em64t-4c2t.output diff --git a/tests/linux/8em64t-4c2t.tar.bz2 b/tests/hwloc/linux/8em64t-4c2t.tar.bz2 similarity index 100% rename from tests/linux/8em64t-4c2t.tar.bz2 rename to tests/hwloc/linux/8em64t-4c2t.tar.bz2 diff --git a/tests/linux/8ia64-2n2s2c.output b/tests/hwloc/linux/8ia64-2n2s2c.output similarity index 100% rename from tests/linux/8ia64-2n2s2c.output rename to tests/hwloc/linux/8ia64-2n2s2c.output diff --git a/tests/linux/8ia64-2n2s2c.tar.bz2 b/tests/hwloc/linux/8ia64-2n2s2c.tar.bz2 similarity index 100% rename from tests/linux/8ia64-2n2s2c.tar.bz2 rename to tests/hwloc/linux/8ia64-2n2s2c.tar.bz2 diff --git a/tests/linux/8ia64-2s2c2t.output b/tests/hwloc/linux/8ia64-2s2c2t.output similarity index 100% rename from tests/linux/8ia64-2s2c2t.output rename to tests/hwloc/linux/8ia64-2s2c2t.output diff --git a/tests/linux/8ia64-2s2c2t.tar.bz2 b/tests/hwloc/linux/8ia64-2s2c2t.tar.bz2 similarity index 100% rename from tests/linux/8ia64-2s2c2t.tar.bz2 rename to tests/hwloc/linux/8ia64-2s2c2t.tar.bz2 diff --git a/tests/linux/8ia64-4s2c.output b/tests/hwloc/linux/8ia64-4s2c.output similarity index 100% rename from tests/linux/8ia64-4s2c.output rename to tests/hwloc/linux/8ia64-4s2c.output diff --git a/tests/linux/8ia64-4s2c.tar.bz2 b/tests/hwloc/linux/8ia64-4s2c.tar.bz2 similarity index 100% rename from tests/linux/8ia64-4s2c.tar.bz2 rename to tests/hwloc/linux/8ia64-4s2c.tar.bz2 diff --git a/tests/linux/96em64t-4n4d3ca2co-forcecpuinfo.env b/tests/hwloc/linux/96em64t-4n4d3ca2co-forcecpuinfo.env similarity index 100% rename from tests/linux/96em64t-4n4d3ca2co-forcecpuinfo.env rename to tests/hwloc/linux/96em64t-4n4d3ca2co-forcecpuinfo.env diff --git a/tests/linux/96em64t-4n4d3ca2co-forcecpuinfo.output b/tests/hwloc/linux/96em64t-4n4d3ca2co-forcecpuinfo.output similarity index 100% rename from tests/linux/96em64t-4n4d3ca2co-forcecpuinfo.output rename to tests/hwloc/linux/96em64t-4n4d3ca2co-forcecpuinfo.output diff --git a/tests/linux/96em64t-4n4d3ca2co-forcecpuinfo.source b/tests/hwloc/linux/96em64t-4n4d3ca2co-forcecpuinfo.source similarity index 100% rename from tests/linux/96em64t-4n4d3ca2co-forcecpuinfo.source rename to tests/hwloc/linux/96em64t-4n4d3ca2co-forcecpuinfo.source diff --git a/tests/linux/96em64t-4n4d3ca2co.output b/tests/hwloc/linux/96em64t-4n4d3ca2co.output similarity index 100% rename from tests/linux/96em64t-4n4d3ca2co.output rename to tests/hwloc/linux/96em64t-4n4d3ca2co.output diff --git a/tests/linux/96em64t-4n4d3ca2co.tar.bz2 b/tests/hwloc/linux/96em64t-4n4d3ca2co.tar.bz2 similarity index 100% rename from tests/linux/96em64t-4n4d3ca2co.tar.bz2 rename to tests/hwloc/linux/96em64t-4n4d3ca2co.tar.bz2 diff --git a/tests/linux/Makefile.am b/tests/hwloc/linux/Makefile.am similarity index 100% rename from tests/linux/Makefile.am rename to tests/hwloc/linux/Makefile.am diff --git a/tests/linux/README b/tests/hwloc/linux/README similarity index 100% rename from tests/linux/README rename to tests/hwloc/linux/README diff --git a/tests/linux/gather/Makefile.am b/tests/hwloc/linux/gather/Makefile.am similarity index 100% rename from tests/linux/gather/Makefile.am rename to tests/hwloc/linux/gather/Makefile.am diff --git a/tests/linux/gather/test-gather-topology.sh.in b/tests/hwloc/linux/gather/test-gather-topology.sh.in old mode 100755 new mode 100644 similarity index 91% rename from tests/linux/gather/test-gather-topology.sh.in rename to tests/hwloc/linux/gather/test-gather-topology.sh.in index d946030a22..7a44c11bd9 --- a/tests/linux/gather/test-gather-topology.sh.in +++ b/tests/hwloc/linux/gather/test-gather-topology.sh.in @@ -3,14 +3,14 @@ # # Copyright © 2012-2014 Inria. All rights reserved. -# Copyright © 2010 Cisco Systems, Inc. All rights reserved. +# Copyright © 2010-2014 Cisco Systems, Inc. All rights reserved. # Copyright © 2011 Université Bordeaux # See COPYING in top-level directory. # HWLOC_top_builddir="@HWLOC_top_builddir@" lstopo="$HWLOC_top_builddir/utils/lstopo/lstopo-no-graphics" -gather="$HWLOC_top_builddir/tests/linux/hwloc-gather-topology" +gather="$HWLOC_top_builddir/tests/hwloc/linux/hwloc-gather-topology" # make sure we use default numeric formats LANG=C @@ -25,7 +25,7 @@ case `uname -a` in *) echo "Not running on linux; skipped" exit 77 ;; -esac +esac error() { diff --git a/tests/linux/hwloc-gather-topology.in b/tests/hwloc/linux/hwloc-gather-topology.in old mode 100755 new mode 100644 similarity index 98% rename from tests/linux/hwloc-gather-topology.in rename to tests/hwloc/linux/hwloc-gather-topology.in index 3431a3c903..3c7302e79f --- a/tests/linux/hwloc-gather-topology.in +++ b/tests/hwloc/linux/hwloc-gather-topology.in @@ -5,6 +5,7 @@ # Copyright © 2009 CNRS # Copyright © 2009-2014 Inria. All rights reserved. # Copyright © 2009-2012 Université Bordeaux +# Copyright © 2014 Cisco Systems, Inc. All rights reserved. # See COPYING in top-level directory. # diff --git a/tests/linux/test-topology.sh.in b/tests/hwloc/linux/test-topology.sh.in similarity index 90% rename from tests/linux/test-topology.sh.in rename to tests/hwloc/linux/test-topology.sh.in index 081bf1b83c..c9809f4a5d 100644 --- a/tests/linux/test-topology.sh.in +++ b/tests/hwloc/linux/test-topology.sh.in @@ -5,7 +5,7 @@ # Copyright © 2009 CNRS # Copyright © 2009-2013 Inria. All rights reserved. # Copyright © 2009-2011 Université Bordeaux -# Copyright © 2009 Cisco Systems, Inc. All rights reserved. +# Copyright © 2009-2014 Cisco Systems, Inc. All rights reserved. # See COPYING in top-level directory. # @@ -16,7 +16,7 @@ HWLOC_top_srcdir="@HWLOC_top_srcdir@" HWLOC_top_builddir="@HWLOC_top_builddir@" lstopo="$HWLOC_top_builddir/utils/lstopo/lstopo-no-graphics" -HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/src +HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc export HWLOC_PLUGINS_PATH actual_output="$1" @@ -101,7 +101,7 @@ actual_options="$topology".options # if there's a .source file, use the tarball name it contains instead of $topology if [ -f "$topology".source ] ; then - actual_source="$HWLOC_top_srcdir"/tests/linux/`cat "$topology".source` + actual_source="$HWLOC_top_srcdir"/tests/hwloc/linux/`cat "$topology".source` else actual_source="$topology".tar.bz2 fi @@ -112,7 +112,7 @@ if [ -f "$topology".env ] ; then fi # use an absolute path for tar options because tar is invoked from the temp directory -actual_exclude="$HWLOC_top_srcdir/tests/linux/`basename $topology`".exclude +actual_exclude="$HWLOC_top_srcdir/tests/hwloc/linux/`basename $topology`".exclude [ -f "$actual_exclude" ] && tar_options="--exclude-from=$actual_exclude" result=1 diff --git a/tests/myriexpress.c b/tests/hwloc/myriexpress.c similarity index 100% rename from tests/myriexpress.c rename to tests/hwloc/myriexpress.c diff --git a/tests/nvml.c b/tests/hwloc/nvml.c similarity index 100% rename from tests/nvml.c rename to tests/hwloc/nvml.c diff --git a/tests/opencl.c b/tests/hwloc/opencl.c similarity index 100% rename from tests/opencl.c rename to tests/hwloc/opencl.c diff --git a/tests/openfabrics-verbs.c b/tests/hwloc/openfabrics-verbs.c similarity index 100% rename from tests/openfabrics-verbs.c rename to tests/hwloc/openfabrics-verbs.c diff --git a/tests/hwloc/ports/Makefile.am b/tests/hwloc/ports/Makefile.am new file mode 100644 index 0000000000..081f9af211 --- /dev/null +++ b/tests/hwloc/ports/Makefile.am @@ -0,0 +1,165 @@ +# Copyright © 2009-2012 Inria. All rights reserved. +# Copyright © 2009, 2011-2012 Université Bordeaux +# Copyright © 2009-2014 Cisco Systems, Inc. All rights reserved. +# See COPYING in top-level directory. + +AM_CFLAGS = $(HWLOC_CFLAGS) +AM_CPPFLAGS = $(HWLOC_CPPFLAGS) +AM_LDFLAGS = $(HWLOC_LDFLAGS) + +SRC = $(HWLOC_top_srcdir)/hwloc + +if HWLOC_HAVE_LINUX +check_LTLIBRARIES = \ + libhwloc-port-aix.la \ + libhwloc-port-bgq.la \ + libhwloc-port-darwin.la \ + libhwloc-port-freebsd.la \ + libhwloc-port-hpux.la \ + libhwloc-port-netbsd.la \ + libhwloc-port-osf.la \ + libhwloc-port-solaris.la \ + libhwloc-port-windows.la \ + libhwloc-port-opencl.la \ + libhwloc-port-cuda.la \ + libhwloc-port-nvml.la \ + libhwloc-port-gl.la +endif HWLOC_HAVE_LINUX + +# Note that AC_CONFIG_LINKS sets up the sym links for the files in +# this directory (back to the $top_srcdir/src directory). So if you +# need more sym-linked files in here, go edit configure.ac. Note that +# we have to use sym links in here rather than just directly +# referencing the files via $HWLOC_top_srcdir/src/foo.c because of +# dependencies issues when using the Automake option "subdir-objects". +# We nodist these because they're created by configure. + +common_CPPFLAGS = \ + $(HWLOC_CPPFLAGS) \ + -I$(HWLOC_top_srcdir)/include \ + -DHWLOC_COMPILE_PORTS \ + -DHWLOC_INSIDE_LIBHWLOC + +nodist_libhwloc_port_aix_la_SOURCES = topology-aix.c +libhwloc_port_aix_la_SOURCES = \ + include/aix/procinfo.h \ + include/aix/sys/processor.h \ + include/aix/sys/rset.h \ + include/aix/sys/systemcfg.h \ + include/aix/sys/thread.h +libhwloc_port_aix_la_CPPFLAGS = $(common_CPPFLAGS) \ + -I$(HWLOC_top_srcdir)/tests/hwloc/ports/include/aix \ + -DHWLOC_AIX_SYS \ + -DHWLOC_HAVE_PTHREAD_GETTHRDS_NP \ + -DHAVE__SC_LARGE_PAGESIZE -D_SC_LARGE_PAGESIZE=33 + +nodist_libhwloc_port_bgq_la_SOURCES = topology-bgq.c +libhwloc_port_bgq_la_SOURCES = \ + include/bgq/spi/include/kernel/location.h \ + include/bgq/spi/include/kernel/process.h +libhwloc_port_bgq_la_CPPFLAGS = $(common_CPPFLAGS) \ + -I$(HWLOC_top_srcdir)/tests/hwloc/ports/include/bgq \ + -DHWLOC_BGQ_SYS + +nodist_libhwloc_port_darwin_la_SOURCES = topology-darwin.c +libhwloc_port_darwin_la_SOURCES = \ + include/darwin/sys/sysctl.h +libhwloc_port_darwin_la_CPPFLAGS = $(common_CPPFLAGS) \ + -I$(HWLOC_top_srcdir)/tests/hwloc/ports/include/darwin \ + -DHWLOC_DARWIN_SYS \ + -DHAVE__SC_LARGE_PAGESIZE -D_SC_LARGE_PAGESIZE=33 + +nodist_libhwloc_port_freebsd_la_SOURCES = topology-freebsd.c +libhwloc_port_freebsd_la_SOURCES = \ + include/freebsd/pthread.h \ + include/freebsd/pthread_np.h \ + include/freebsd/sys/cpuset.h \ + include/freebsd/sys/sysctl.h +libhwloc_port_freebsd_la_CPPFLAGS = $(common_CPPFLAGS) \ + -I$(HWLOC_top_srcdir)/tests/hwloc/ports/include/freebsd \ + -DHWLOC_FREEBSD_SYS \ + -DHAVE_PTHREAD_NP_H \ + -DHAVE_SYS_CPUSET_H \ + -DHAVE_SYS_SYSCTL_H \ + -DHAVE_SYSCTL \ + -DHAVE_CPUSET_SETAFFINITY \ + -Dhwloc_thread_t=pthread_t \ + -DHAVE_DECL_PTHREAD_SETAFFINITY_NP=1 \ + -DHAVE_DECL_PTHREAD_GETAFFINITY_NP=1 \ + -DHAVE_CPUSET_SETID + +nodist_libhwloc_port_hpux_la_SOURCES = topology-hpux.c +libhwloc_port_hpux_la_SOURCES = \ + include/hpux/sys/mpctl.h +libhwloc_port_hpux_la_CPPFLAGS = $(common_CPPFLAGS) \ + -I$(HWLOC_top_srcdir)/tests/hwloc/ports/include/hpux \ + -DHWLOC_HPUX_SYS + +nodist_libhwloc_port_netbsd_la_SOURCES = topology-netbsd.c +libhwloc_port_netbsd_la_SOURCES = \ + include/netbsd/pthread.h \ + include/netbsd/sched.h +libhwloc_port_netbsd_la_CPPFLAGS = $(common_CPPFLAGS) \ + -I$(HWLOC_top_srcdir)/tests/hwloc/ports/include/netbsd \ + -DHWLOC_NETBSD_SYS + +nodist_libhwloc_port_osf_la_SOURCES = topology-osf.c +libhwloc_port_osf_la_SOURCES = \ + include/osf/cpuset.h \ + include/osf/numa.h \ + include/osf/radset.h +libhwloc_port_osf_la_CPPFLAGS = $(common_CPPFLAGS) \ + -I$(HWLOC_top_srcdir)/tests/hwloc/ports/include/osf \ + -DHWLOC_OSF_SYS \ + -DHAVE__SC_LARGE_PAGESIZE -D_SC_LARGE_PAGESIZE=33 + +nodist_libhwloc_port_solaris_la_SOURCES = topology-solaris.c topology-solaris-chiptype.c +libhwloc_port_solaris_la_SOURCES = \ + include/solaris/kstat.h \ + include/solaris/picl.h \ + include/solaris/sys/lgrp_user.h \ + include/solaris/sys/processor.h \ + include/solaris/sys/procset.h \ + include/solaris/sys/systeminfo.h +libhwloc_port_solaris_la_CPPFLAGS = $(common_CPPFLAGS) \ + -I$(HWLOC_top_srcdir)/tests/hwloc/ports/include/solaris \ + -DHWLOC_SOLARIS_SYS \ + -DHAVE_LIBLGRP \ + -DHAVE__SC_LARGE_PAGESIZE -D_SC_LARGE_PAGESIZE=33 \ + -DHAVE_LGRP_LATENCY_COOKIE \ + -DHAVE_LIBKSTAT \ + -DHAVE_PICL_H + +nodist_libhwloc_port_windows_la_SOURCES = topology-windows.c +libhwloc_port_windows_la_SOURCES = \ + include/windows/windows.h +libhwloc_port_windows_la_CPPFLAGS = $(common_CPPFLAGS) \ + -I$(HWLOC_top_srcdir)/tests/hwloc/ports/include/windows \ + -DHWLOC_WIN_SYS \ + -DHAVE__SC_LARGE_PAGESIZE -D_SC_LARGE_PAGESIZE=33 + +nodist_libhwloc_port_opencl_la_SOURCES = topology-opencl.c +libhwloc_port_opencl_la_SOURCES = \ + include/opencl/CL/cl_ext.h +libhwloc_port_opencl_la_CPPFLAGS = $(common_CPPFLAGS) \ + -I$(HWLOC_top_srcdir)/tests/hwloc/ports/include/opencl + +nodist_libhwloc_port_cuda_la_SOURCES = topology-cuda.c +libhwloc_port_cuda_la_SOURCES = \ + include/cuda/cuda_runtime_api.h +libhwloc_port_cuda_la_CPPFLAGS = $(common_CPPFLAGS) \ + -I$(HWLOC_top_srcdir)/tests/hwloc/ports/include/cuda + +nodist_libhwloc_port_nvml_la_SOURCES = topology-nvml.c +libhwloc_port_nvml_la_SOURCES = \ + include/nvml/nvml.h +libhwloc_port_nvml_la_CPPFLAGS = $(common_CPPFLAGS) \ + -I$(HWLOC_top_srcdir)/tests/hwloc/ports/include/nvml + +nodist_libhwloc_port_gl_la_SOURCES = topology-gl.c +libhwloc_port_gl_la_SOURCES = \ + include/gl/X11/Xlib.h \ + include/gl/NVCtrl/NVCtrl.h \ + include/gl/NVCtrl/NVCtrlLib.h +libhwloc_port_gl_la_CPPFLAGS = $(common_CPPFLAGS) \ + -I$(HWLOC_top_srcdir)/tests/hwloc/ports/include/gl diff --git a/tests/ports/include/aix/procinfo.h b/tests/hwloc/ports/include/aix/procinfo.h similarity index 100% rename from tests/ports/include/aix/procinfo.h rename to tests/hwloc/ports/include/aix/procinfo.h diff --git a/tests/ports/include/aix/sys/processor.h b/tests/hwloc/ports/include/aix/sys/processor.h similarity index 100% rename from tests/ports/include/aix/sys/processor.h rename to tests/hwloc/ports/include/aix/sys/processor.h diff --git a/tests/ports/include/aix/sys/rset.h b/tests/hwloc/ports/include/aix/sys/rset.h similarity index 100% rename from tests/ports/include/aix/sys/rset.h rename to tests/hwloc/ports/include/aix/sys/rset.h diff --git a/tests/ports/include/aix/sys/systemcfg.h b/tests/hwloc/ports/include/aix/sys/systemcfg.h similarity index 100% rename from tests/ports/include/aix/sys/systemcfg.h rename to tests/hwloc/ports/include/aix/sys/systemcfg.h diff --git a/tests/ports/include/aix/sys/thread.h b/tests/hwloc/ports/include/aix/sys/thread.h similarity index 100% rename from tests/ports/include/aix/sys/thread.h rename to tests/hwloc/ports/include/aix/sys/thread.h diff --git a/tests/ports/include/bgq/spi/include/kernel/location.h b/tests/hwloc/ports/include/bgq/spi/include/kernel/location.h similarity index 100% rename from tests/ports/include/bgq/spi/include/kernel/location.h rename to tests/hwloc/ports/include/bgq/spi/include/kernel/location.h diff --git a/tests/ports/include/bgq/spi/include/kernel/process.h b/tests/hwloc/ports/include/bgq/spi/include/kernel/process.h similarity index 100% rename from tests/ports/include/bgq/spi/include/kernel/process.h rename to tests/hwloc/ports/include/bgq/spi/include/kernel/process.h diff --git a/tests/ports/include/cuda/cuda_runtime_api.h b/tests/hwloc/ports/include/cuda/cuda_runtime_api.h similarity index 100% rename from tests/ports/include/cuda/cuda_runtime_api.h rename to tests/hwloc/ports/include/cuda/cuda_runtime_api.h diff --git a/tests/ports/include/darwin/sys/sysctl.h b/tests/hwloc/ports/include/darwin/sys/sysctl.h similarity index 100% rename from tests/ports/include/darwin/sys/sysctl.h rename to tests/hwloc/ports/include/darwin/sys/sysctl.h diff --git a/tests/ports/include/freebsd/pthread.h b/tests/hwloc/ports/include/freebsd/pthread.h similarity index 100% rename from tests/ports/include/freebsd/pthread.h rename to tests/hwloc/ports/include/freebsd/pthread.h diff --git a/tests/ports/include/freebsd/pthread_np.h b/tests/hwloc/ports/include/freebsd/pthread_np.h similarity index 100% rename from tests/ports/include/freebsd/pthread_np.h rename to tests/hwloc/ports/include/freebsd/pthread_np.h diff --git a/tests/ports/include/freebsd/sys/cpuset.h b/tests/hwloc/ports/include/freebsd/sys/cpuset.h similarity index 100% rename from tests/ports/include/freebsd/sys/cpuset.h rename to tests/hwloc/ports/include/freebsd/sys/cpuset.h diff --git a/tests/ports/include/freebsd/sys/sysctl.h b/tests/hwloc/ports/include/freebsd/sys/sysctl.h similarity index 100% rename from tests/ports/include/freebsd/sys/sysctl.h rename to tests/hwloc/ports/include/freebsd/sys/sysctl.h diff --git a/tests/ports/include/gl/NVCtrl/NVCtrl.h b/tests/hwloc/ports/include/gl/NVCtrl/NVCtrl.h similarity index 100% rename from tests/ports/include/gl/NVCtrl/NVCtrl.h rename to tests/hwloc/ports/include/gl/NVCtrl/NVCtrl.h diff --git a/tests/ports/include/gl/NVCtrl/NVCtrlLib.h b/tests/hwloc/ports/include/gl/NVCtrl/NVCtrlLib.h similarity index 100% rename from tests/ports/include/gl/NVCtrl/NVCtrlLib.h rename to tests/hwloc/ports/include/gl/NVCtrl/NVCtrlLib.h diff --git a/tests/ports/include/gl/X11/Xlib.h b/tests/hwloc/ports/include/gl/X11/Xlib.h similarity index 100% rename from tests/ports/include/gl/X11/Xlib.h rename to tests/hwloc/ports/include/gl/X11/Xlib.h diff --git a/tests/ports/include/hpux/sys/mpctl.h b/tests/hwloc/ports/include/hpux/sys/mpctl.h similarity index 100% rename from tests/ports/include/hpux/sys/mpctl.h rename to tests/hwloc/ports/include/hpux/sys/mpctl.h diff --git a/tests/ports/include/netbsd/pthread.h b/tests/hwloc/ports/include/netbsd/pthread.h similarity index 100% rename from tests/ports/include/netbsd/pthread.h rename to tests/hwloc/ports/include/netbsd/pthread.h diff --git a/tests/ports/include/netbsd/sched.h b/tests/hwloc/ports/include/netbsd/sched.h similarity index 100% rename from tests/ports/include/netbsd/sched.h rename to tests/hwloc/ports/include/netbsd/sched.h diff --git a/tests/ports/include/nvml/nvml.h b/tests/hwloc/ports/include/nvml/nvml.h similarity index 100% rename from tests/ports/include/nvml/nvml.h rename to tests/hwloc/ports/include/nvml/nvml.h diff --git a/tests/ports/include/opencl/CL/cl_ext.h b/tests/hwloc/ports/include/opencl/CL/cl_ext.h similarity index 100% rename from tests/ports/include/opencl/CL/cl_ext.h rename to tests/hwloc/ports/include/opencl/CL/cl_ext.h diff --git a/tests/ports/include/osf/cpuset.h b/tests/hwloc/ports/include/osf/cpuset.h similarity index 100% rename from tests/ports/include/osf/cpuset.h rename to tests/hwloc/ports/include/osf/cpuset.h diff --git a/tests/ports/include/osf/numa.h b/tests/hwloc/ports/include/osf/numa.h similarity index 100% rename from tests/ports/include/osf/numa.h rename to tests/hwloc/ports/include/osf/numa.h diff --git a/tests/ports/include/osf/radset.h b/tests/hwloc/ports/include/osf/radset.h similarity index 100% rename from tests/ports/include/osf/radset.h rename to tests/hwloc/ports/include/osf/radset.h diff --git a/tests/ports/include/solaris/kstat.h b/tests/hwloc/ports/include/solaris/kstat.h similarity index 100% rename from tests/ports/include/solaris/kstat.h rename to tests/hwloc/ports/include/solaris/kstat.h diff --git a/tests/ports/include/solaris/picl.h b/tests/hwloc/ports/include/solaris/picl.h similarity index 100% rename from tests/ports/include/solaris/picl.h rename to tests/hwloc/ports/include/solaris/picl.h diff --git a/tests/ports/include/solaris/sys/lgrp_user.h b/tests/hwloc/ports/include/solaris/sys/lgrp_user.h similarity index 100% rename from tests/ports/include/solaris/sys/lgrp_user.h rename to tests/hwloc/ports/include/solaris/sys/lgrp_user.h diff --git a/tests/ports/include/solaris/sys/processor.h b/tests/hwloc/ports/include/solaris/sys/processor.h similarity index 100% rename from tests/ports/include/solaris/sys/processor.h rename to tests/hwloc/ports/include/solaris/sys/processor.h diff --git a/tests/ports/include/solaris/sys/procset.h b/tests/hwloc/ports/include/solaris/sys/procset.h similarity index 100% rename from tests/ports/include/solaris/sys/procset.h rename to tests/hwloc/ports/include/solaris/sys/procset.h diff --git a/tests/ports/include/solaris/sys/systeminfo.h b/tests/hwloc/ports/include/solaris/sys/systeminfo.h similarity index 100% rename from tests/ports/include/solaris/sys/systeminfo.h rename to tests/hwloc/ports/include/solaris/sys/systeminfo.h diff --git a/tests/ports/include/windows/windows.h b/tests/hwloc/ports/include/windows/windows.h similarity index 100% rename from tests/ports/include/windows/windows.h rename to tests/hwloc/ports/include/windows/windows.h diff --git a/tests/rename/Makefile.am b/tests/hwloc/rename/Makefile.am similarity index 100% rename from tests/rename/Makefile.am rename to tests/hwloc/rename/Makefile.am diff --git a/tests/rename/main.c b/tests/hwloc/rename/main.c similarity index 100% rename from tests/rename/main.c rename to tests/hwloc/rename/main.c diff --git a/tests/wrapper.sh.in b/tests/hwloc/wrapper.sh.in similarity index 100% rename from tests/wrapper.sh.in rename to tests/hwloc/wrapper.sh.in diff --git a/tests/xml/16amd64-8n2c-cpusets.xml b/tests/hwloc/xml/16amd64-8n2c-cpusets.xml similarity index 100% rename from tests/xml/16amd64-8n2c-cpusets.xml rename to tests/hwloc/xml/16amd64-8n2c-cpusets.xml diff --git a/tests/xml/16em64t-4s2c2t-offlines.xml b/tests/hwloc/xml/16em64t-4s2c2t-offlines.xml similarity index 100% rename from tests/xml/16em64t-4s2c2t-offlines.xml rename to tests/hwloc/xml/16em64t-4s2c2t-offlines.xml diff --git a/tests/xml/16em64t-4s2c2t.xml b/tests/hwloc/xml/16em64t-4s2c2t.xml similarity index 100% rename from tests/xml/16em64t-4s2c2t.xml rename to tests/hwloc/xml/16em64t-4s2c2t.xml diff --git a/tests/xml/192em64t-12gr2n8c2t-distancegroups.env b/tests/hwloc/xml/192em64t-12gr2n8c2t-distancegroups.env similarity index 100% rename from tests/xml/192em64t-12gr2n8c2t-distancegroups.env rename to tests/hwloc/xml/192em64t-12gr2n8c2t-distancegroups.env diff --git a/tests/xml/192em64t-12gr2n8c2t-distancegroups.xml b/tests/hwloc/xml/192em64t-12gr2n8c2t-distancegroups.xml similarity index 100% rename from tests/xml/192em64t-12gr2n8c2t-distancegroups.xml rename to tests/hwloc/xml/192em64t-12gr2n8c2t-distancegroups.xml diff --git a/tests/xml/192em64t-24n8c2t-distancegroups.env b/tests/hwloc/xml/192em64t-24n8c2t-distancegroups.env similarity index 100% rename from tests/xml/192em64t-24n8c2t-distancegroups.env rename to tests/hwloc/xml/192em64t-24n8c2t-distancegroups.env diff --git a/tests/xml/192em64t-24n8c2t-distancegroups.source b/tests/hwloc/xml/192em64t-24n8c2t-distancegroups.source similarity index 100% rename from tests/xml/192em64t-24n8c2t-distancegroups.source rename to tests/hwloc/xml/192em64t-24n8c2t-distancegroups.source diff --git a/tests/xml/192em64t-24n8c2t-distancegroups.xml b/tests/hwloc/xml/192em64t-24n8c2t-distancegroups.xml similarity index 100% rename from tests/xml/192em64t-24n8c2t-distancegroups.xml rename to tests/hwloc/xml/192em64t-24n8c2t-distancegroups.xml diff --git a/tests/xml/192em64t-24n8c2t-nodistancegroups.env b/tests/hwloc/xml/192em64t-24n8c2t-nodistancegroups.env similarity index 100% rename from tests/xml/192em64t-24n8c2t-nodistancegroups.env rename to tests/hwloc/xml/192em64t-24n8c2t-nodistancegroups.env diff --git a/tests/xml/192em64t-24n8c2t-nodistancegroups.xml b/tests/hwloc/xml/192em64t-24n8c2t-nodistancegroups.xml similarity index 100% rename from tests/xml/192em64t-24n8c2t-nodistancegroups.xml rename to tests/hwloc/xml/192em64t-24n8c2t-nodistancegroups.xml diff --git a/tests/xml/24em64t-2n6c2t-pci.xml b/tests/hwloc/xml/24em64t-2n6c2t-pci.xml similarity index 100% rename from tests/xml/24em64t-2n6c2t-pci.xml rename to tests/hwloc/xml/24em64t-2n6c2t-pci.xml diff --git a/tests/xml/32em64t-2n8c2t-pci-noio.options b/tests/hwloc/xml/32em64t-2n8c2t-pci-noio.options similarity index 100% rename from tests/xml/32em64t-2n8c2t-pci-noio.options rename to tests/hwloc/xml/32em64t-2n8c2t-pci-noio.options diff --git a/tests/xml/32em64t-2n8c2t-pci-noio.source b/tests/hwloc/xml/32em64t-2n8c2t-pci-noio.source similarity index 100% rename from tests/xml/32em64t-2n8c2t-pci-noio.source rename to tests/hwloc/xml/32em64t-2n8c2t-pci-noio.source diff --git a/tests/xml/32em64t-2n8c2t-pci-noio.xml b/tests/hwloc/xml/32em64t-2n8c2t-pci-noio.xml similarity index 100% rename from tests/xml/32em64t-2n8c2t-pci-noio.xml rename to tests/hwloc/xml/32em64t-2n8c2t-pci-noio.xml diff --git a/tests/xml/32em64t-2n8c2t-pci-normalio.source b/tests/hwloc/xml/32em64t-2n8c2t-pci-normalio.source similarity index 100% rename from tests/xml/32em64t-2n8c2t-pci-normalio.source rename to tests/hwloc/xml/32em64t-2n8c2t-pci-normalio.source diff --git a/tests/xml/32em64t-2n8c2t-pci-normalio.xml b/tests/hwloc/xml/32em64t-2n8c2t-pci-normalio.xml similarity index 100% rename from tests/xml/32em64t-2n8c2t-pci-normalio.xml rename to tests/hwloc/xml/32em64t-2n8c2t-pci-normalio.xml diff --git a/tests/xml/32em64t-2n8c2t-pci-wholeio.options b/tests/hwloc/xml/32em64t-2n8c2t-pci-wholeio.options similarity index 100% rename from tests/xml/32em64t-2n8c2t-pci-wholeio.options rename to tests/hwloc/xml/32em64t-2n8c2t-pci-wholeio.options diff --git a/tests/xml/32em64t-2n8c2t-pci-wholeio.xml b/tests/hwloc/xml/32em64t-2n8c2t-pci-wholeio.xml similarity index 100% rename from tests/xml/32em64t-2n8c2t-pci-wholeio.xml rename to tests/hwloc/xml/32em64t-2n8c2t-pci-wholeio.xml diff --git a/tests/xml/8em64t-2mi2ma2c.xml b/tests/hwloc/xml/8em64t-2mi2ma2c.xml similarity index 100% rename from tests/xml/8em64t-2mi2ma2c.xml rename to tests/hwloc/xml/8em64t-2mi2ma2c.xml diff --git a/tests/xml/96em64t-4n4d3ca2co-pci.xml b/tests/hwloc/xml/96em64t-4n4d3ca2co-pci.xml similarity index 100% rename from tests/xml/96em64t-4n4d3ca2co-pci.xml rename to tests/hwloc/xml/96em64t-4n4d3ca2co-pci.xml diff --git a/tests/hwloc/xml/Makefile.am b/tests/hwloc/xml/Makefile.am new file mode 100644 index 0000000000..48041ca2e2 --- /dev/null +++ b/tests/hwloc/xml/Makefile.am @@ -0,0 +1,51 @@ +# Copyright © 2009-2014 Inria. All rights reserved. +# Copyright © 2009-2010 Université Bordeaux +# Copyright © 2009-2014 Cisco Systems, Inc. All rights reserved. +# See COPYING in top-level directory. + +AM_CFLAGS = $(HWLOC_CFLAGS) +AM_CPPFLAGS = $(HWLOC_CPPFLAGS) +AM_LDFLAGS = $(HWLOC_LDFLAGS) + +# Add your XML input files here. +xml_inputs = \ + 16amd64-8n2c-cpusets.xml \ + 16em64t-4s2c2t.xml \ + 16em64t-4s2c2t-offlines.xml \ + 24em64t-2n6c2t-pci.xml \ + 8em64t-2mi2ma2c.xml \ + 32em64t-2n8c2t-pci-noio.xml \ + 32em64t-2n8c2t-pci-normalio.xml \ + 32em64t-2n8c2t-pci-wholeio.xml \ + 96em64t-4n4d3ca2co-pci.xml \ + 192em64t-12gr2n8c2t-distancegroups.xml \ + 192em64t-24n8c2t-nodistancegroups.xml \ + 192em64t-24n8c2t-distancegroups.xml + +# Each output `xyz.source' may have a corresponding `xyz.source' +# file modifying its source file +xml_source = \ + 32em64t-2n8c2t-pci-noio.source \ + 32em64t-2n8c2t-pci-normalio.source \ + 192em64t-24n8c2t-distancegroups.source + +# Each output `xyz.xml' may have a corresponding `xyz.options' +# file modifying the behavior of lstopo +xml_options = \ + 32em64t-2n8c2t-pci-noio.options \ + 32em64t-2n8c2t-pci-wholeio.options + +# Each output `xyz.xml' may have a corresponding `xyz.env' +# modifying the environment of lstopo +xml_envs = \ + 192em64t-12gr2n8c2t-distancegroups.env \ + 192em64t-24n8c2t-nodistancegroups.env \ + 192em64t-24n8c2t-distancegroups.env + +# Only run the tests if we're building standalone, because the tests +# call hwloc executables. +TESTS = $(xml_inputs) + +EXTRA_DIST = $(xml_inputs) $(xml_source) $(xml_options) $(xml_envs) + +LOG_COMPILER = $(HWLOC_top_builddir)/tests/hwloc/xml/test-topology.sh diff --git a/tests/xml/test-topology.sh.in b/tests/hwloc/xml/test-topology.sh.in old mode 100755 new mode 100644 similarity index 90% rename from tests/xml/test-topology.sh.in rename to tests/hwloc/xml/test-topology.sh.in index 41ff55d669..1c1b857dd8 --- a/tests/xml/test-topology.sh.in +++ b/tests/hwloc/xml/test-topology.sh.in @@ -5,7 +5,7 @@ # Copyright © 2009 CNRS # Copyright © 2009-2013 Inria. All rights reserved. # Copyright © 2009-2012 Université Bordeaux -# Copyright © 2010 Cisco Systems, Inc. All rights reserved. +# Copyright © 2010-2014 Cisco Systems, Inc. All rights reserved. # See COPYING in top-level directory. # @@ -14,9 +14,9 @@ HWLOC_top_builddir="@HWLOC_top_builddir@" HWLOC_top_srcdir="@HWLOC_top_srcdir@" -lstopo="@HWLOC_top_builddir@/utils/lstopo/lstopo-no-graphics" +lstopo="$HWLOC_top_builddir/utils/lstopo/lstopo-no-graphics" -HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/src +HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc export HWLOC_PLUGINS_PATH if test x@HWLOC_XML_LOCALIZED@ = x1; then @@ -82,7 +82,7 @@ do_run() if [ -n "@XMLLINT@" ] then - cp -f "$HWLOC_top_srcdir"/src/hwloc.dtd "$tmp/" + cp -f "$HWLOC_top_srcdir"/hwloc/hwloc.dtd "$tmp/" ( cd $tmp ; @XMLLINT@ --valid lstopo_xml.output.xml ) > /dev/null fi diff --git a/tests/xmlbuffer.c b/tests/hwloc/xmlbuffer.c similarity index 100% rename from tests/xmlbuffer.c rename to tests/hwloc/xmlbuffer.c diff --git a/tests/ports/Makefile.am b/tests/ports/Makefile.am deleted file mode 100644 index 1649633d2e..0000000000 --- a/tests/ports/Makefile.am +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright © 2009-2012 Inria. All rights reserved. -# Copyright © 2009, 2011-2012 Université Bordeaux -# Copyright © 2009-2010 Cisco Systems, Inc. All rights reserved. -# See COPYING in top-level directory. - -AM_CFLAGS = $(HWLOC_CFLAGS) -AM_CPPFLAGS = $(HWLOC_CPPFLAGS) -AM_LDFLAGS = $(HWLOC_LDFLAGS) - -SRC = $(HWLOC_top_srcdir)/src - -if HWLOC_HAVE_LINUX -check_LTLIBRARIES = \ - libhwloc-port-aix.la \ - libhwloc-port-bgq.la \ - libhwloc-port-darwin.la \ - libhwloc-port-freebsd.la \ - libhwloc-port-hpux.la \ - libhwloc-port-netbsd.la \ - libhwloc-port-osf.la \ - libhwloc-port-solaris.la \ - libhwloc-port-windows.la \ - libhwloc-port-opencl.la \ - libhwloc-port-cuda.la \ - libhwloc-port-nvml.la \ - libhwloc-port-gl.la -endif HWLOC_HAVE_LINUX - -# Note that AC_CONFIG_LINKS sets up the sym links for the files in -# this directory (back to the $top_srcdir/src directory). So if you -# need more sym-linked files in here, go edit configure.ac. Note that -# we have to use sym links in here rather than just directly -# referencing the files via $HWLOC_top_srcdir/src/foo.c because of -# dependencies issues when using the Automake option "subdir-objects". -# We nodist these because they're created by configure. - -common_CPPFLAGS = \ - $(HWLOC_CPPFLAGS) \ - -I$(HWLOC_top_srcdir)/include \ - -DHWLOC_COMPILE_PORTS \ - -DHWLOC_INSIDE_LIBHWLOC - -nodist_libhwloc_port_aix_la_SOURCES = topology-aix.c -libhwloc_port_aix_la_SOURCES = \ - include/aix/procinfo.h \ - include/aix/sys/processor.h \ - include/aix/sys/rset.h \ - include/aix/sys/systemcfg.h \ - include/aix/sys/thread.h -libhwloc_port_aix_la_CPPFLAGS = $(common_CPPFLAGS) \ - -I$(HWLOC_top_srcdir)/tests/ports/include/aix \ - -DHWLOC_AIX_SYS \ - -DHWLOC_HAVE_PTHREAD_GETTHRDS_NP \ - -DHAVE__SC_LARGE_PAGESIZE -D_SC_LARGE_PAGESIZE=33 - -nodist_libhwloc_port_bgq_la_SOURCES = topology-bgq.c -libhwloc_port_bgq_la_SOURCES = \ - include/bgq/spi/include/kernel/location.h \ - include/bgq/spi/include/kernel/process.h -libhwloc_port_bgq_la_CPPFLAGS = $(common_CPPFLAGS) \ - -I$(HWLOC_top_srcdir)/tests/ports/include/bgq \ - -DHWLOC_BGQ_SYS - -nodist_libhwloc_port_darwin_la_SOURCES = topology-darwin.c -libhwloc_port_darwin_la_SOURCES = \ - include/darwin/sys/sysctl.h -libhwloc_port_darwin_la_CPPFLAGS = $(common_CPPFLAGS) \ - -I$(HWLOC_top_srcdir)/tests/ports/include/darwin \ - -DHWLOC_DARWIN_SYS \ - -DHAVE__SC_LARGE_PAGESIZE -D_SC_LARGE_PAGESIZE=33 - -nodist_libhwloc_port_freebsd_la_SOURCES = topology-freebsd.c -libhwloc_port_freebsd_la_SOURCES = \ - include/freebsd/pthread.h \ - include/freebsd/pthread_np.h \ - include/freebsd/sys/cpuset.h \ - include/freebsd/sys/sysctl.h -libhwloc_port_freebsd_la_CPPFLAGS = $(common_CPPFLAGS) \ - -I$(HWLOC_top_srcdir)/tests/ports/include/freebsd \ - -DHWLOC_FREEBSD_SYS \ - -DHAVE_PTHREAD_NP_H \ - -DHAVE_SYS_CPUSET_H \ - -DHAVE_SYS_SYSCTL_H \ - -DHAVE_SYSCTL \ - -DHAVE_CPUSET_SETAFFINITY \ - -Dhwloc_thread_t=pthread_t \ - -DHAVE_DECL_PTHREAD_SETAFFINITY_NP=1 \ - -DHAVE_DECL_PTHREAD_GETAFFINITY_NP=1 \ - -DHAVE_CPUSET_SETID - -nodist_libhwloc_port_hpux_la_SOURCES = topology-hpux.c -libhwloc_port_hpux_la_SOURCES = \ - include/hpux/sys/mpctl.h -libhwloc_port_hpux_la_CPPFLAGS = $(common_CPPFLAGS) \ - -I$(HWLOC_top_srcdir)/tests/ports/include/hpux \ - -DHWLOC_HPUX_SYS - -nodist_libhwloc_port_netbsd_la_SOURCES = topology-netbsd.c -libhwloc_port_netbsd_la_SOURCES = \ - include/netbsd/pthread.h \ - include/netbsd/sched.h -libhwloc_port_netbsd_la_CPPFLAGS = $(common_CPPFLAGS) \ - -I$(HWLOC_top_srcdir)/tests/ports/include/netbsd \ - -DHWLOC_NETBSD_SYS - -nodist_libhwloc_port_osf_la_SOURCES = topology-osf.c -libhwloc_port_osf_la_SOURCES = \ - include/osf/cpuset.h \ - include/osf/numa.h \ - include/osf/radset.h -libhwloc_port_osf_la_CPPFLAGS = $(common_CPPFLAGS) \ - -I$(HWLOC_top_srcdir)/tests/ports/include/osf \ - -DHWLOC_OSF_SYS \ - -DHAVE__SC_LARGE_PAGESIZE -D_SC_LARGE_PAGESIZE=33 - -nodist_libhwloc_port_solaris_la_SOURCES = topology-solaris.c topology-solaris-chiptype.c -libhwloc_port_solaris_la_SOURCES = \ - include/solaris/kstat.h \ - include/solaris/picl.h \ - include/solaris/sys/lgrp_user.h \ - include/solaris/sys/processor.h \ - include/solaris/sys/procset.h \ - include/solaris/sys/systeminfo.h -libhwloc_port_solaris_la_CPPFLAGS = $(common_CPPFLAGS) \ - -I$(HWLOC_top_srcdir)/tests/ports/include/solaris \ - -DHWLOC_SOLARIS_SYS \ - -DHAVE_LIBLGRP \ - -DHAVE__SC_LARGE_PAGESIZE -D_SC_LARGE_PAGESIZE=33 \ - -DHAVE_LGRP_LATENCY_COOKIE \ - -DHAVE_LIBKSTAT \ - -DHAVE_PICL_H - -nodist_libhwloc_port_windows_la_SOURCES = topology-windows.c -libhwloc_port_windows_la_SOURCES = \ - include/windows/windows.h -libhwloc_port_windows_la_CPPFLAGS = $(common_CPPFLAGS) \ - -I$(HWLOC_top_srcdir)/tests/ports/include/windows \ - -DHWLOC_WIN_SYS \ - -DHAVE__SC_LARGE_PAGESIZE -D_SC_LARGE_PAGESIZE=33 - -nodist_libhwloc_port_opencl_la_SOURCES = topology-opencl.c -libhwloc_port_opencl_la_SOURCES = \ - include/opencl/CL/cl_ext.h -libhwloc_port_opencl_la_CPPFLAGS = $(common_CPPFLAGS) \ - -I$(HWLOC_top_srcdir)/tests/ports/include/opencl - -nodist_libhwloc_port_cuda_la_SOURCES = topology-cuda.c -libhwloc_port_cuda_la_SOURCES = \ - include/cuda/cuda_runtime_api.h -libhwloc_port_cuda_la_CPPFLAGS = $(common_CPPFLAGS) \ - -I$(HWLOC_top_srcdir)/tests/ports/include/cuda - -nodist_libhwloc_port_nvml_la_SOURCES = topology-nvml.c -libhwloc_port_nvml_la_SOURCES = \ - include/nvml/nvml.h -libhwloc_port_nvml_la_CPPFLAGS = $(common_CPPFLAGS) \ - -I$(HWLOC_top_srcdir)/tests/ports/include/nvml - -nodist_libhwloc_port_gl_la_SOURCES = topology-gl.c -libhwloc_port_gl_la_SOURCES = \ - include/gl/X11/Xlib.h \ - include/gl/NVCtrl/NVCtrl.h \ - include/gl/NVCtrl/NVCtrlLib.h -libhwloc_port_gl_la_CPPFLAGS = $(common_CPPFLAGS) \ - -I$(HWLOC_top_srcdir)/tests/ports/include/gl diff --git a/tests/xml/Makefile.am b/tests/xml/Makefile.am deleted file mode 100644 index f451366df7..0000000000 --- a/tests/xml/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright © 2009-2014 Inria. All rights reserved. -# Copyright © 2009-2010 Université Bordeaux -# Copyright © 2009-2010 Cisco Systems, Inc. All rights reserved. -# See COPYING in top-level directory. - -AM_CFLAGS = $(HWLOC_CFLAGS) -AM_CPPFLAGS = $(HWLOC_CPPFLAGS) -AM_LDFLAGS = $(HWLOC_LDFLAGS) - -# Add your XML input files here. -xml_inputs = \ - 16amd64-8n2c-cpusets.xml \ - 16em64t-4s2c2t.xml \ - 16em64t-4s2c2t-offlines.xml \ - 24em64t-2n6c2t-pci.xml \ - 8em64t-2mi2ma2c.xml \ - 32em64t-2n8c2t-pci-noio.xml \ - 32em64t-2n8c2t-pci-normalio.xml \ - 32em64t-2n8c2t-pci-wholeio.xml \ - 96em64t-4n4d3ca2co-pci.xml \ - 192em64t-12gr2n8c2t-distancegroups.xml \ - 192em64t-24n8c2t-nodistancegroups.xml \ - 192em64t-24n8c2t-distancegroups.xml - -# Each output `xyz.source' may have a corresponding `xyz.source' -# file modifying its source file -xml_source = \ - 32em64t-2n8c2t-pci-noio.source \ - 32em64t-2n8c2t-pci-normalio.source \ - 192em64t-24n8c2t-distancegroups.source - -# Each output `xyz.xml' may have a corresponding `xyz.options' -# file modifying the behavior of lstopo -xml_options = \ - 32em64t-2n8c2t-pci-noio.options \ - 32em64t-2n8c2t-pci-wholeio.options - -# Each output `xyz.xml' may have a corresponding `xyz.env' -# modifying the environment of lstopo -xml_envs = \ - 192em64t-12gr2n8c2t-distancegroups.env \ - 192em64t-24n8c2t-nodistancegroups.env \ - 192em64t-24n8c2t-distancegroups.env - -# Only run the tests if we're building standalone, because the tests -# call hwloc executables. -TESTS = $(xml_inputs) - -EXTRA_DIST = $(xml_inputs) $(xml_source) $(xml_options) $(xml_envs) - -LOG_COMPILER = $(HWLOC_top_builddir)/tests/xml/test-topology.sh diff --git a/utils/.gitignore b/utils/.gitignore deleted file mode 100644 index 3980c76e90..0000000000 --- a/utils/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/topo-ls diff --git a/utils/hwloc/Makefile.am b/utils/hwloc/Makefile.am index 9081982f2a..1cb5e2913a 100644 --- a/utils/hwloc/Makefile.am +++ b/utils/hwloc/Makefile.am @@ -10,7 +10,7 @@ AM_CFLAGS = $(HWLOC_CFLAGS) AM_CPPFLAGS = $(HWLOC_CPPFLAGS) AM_LDFLAGS = $(HWLOC_LDFLAGS) -LDADD = $(HWLOC_top_builddir)/src/libhwloc.la +LDADD = $(HWLOC_top_builddir)/hwloc/libhwloc.la EXTRA_DIST = \ test-hwloc-annotate.input test-hwloc-annotate.output \ diff --git a/utils/hwloc/hwloc-compress-dir.in b/utils/hwloc/hwloc-compress-dir.in old mode 100755 new mode 100644 diff --git a/utils/hwloc/test-fake-plugin.sh.in b/utils/hwloc/test-fake-plugin.sh.in index ee24f4e62a..21c60c434b 100644 --- a/utils/hwloc/test-fake-plugin.sh.in +++ b/utils/hwloc/test-fake-plugin.sh.in @@ -4,13 +4,15 @@ # # Copyright © 2009-2014 Inria. All rights reserved. # Copyright © 2009, 2011 Université Bordeaux +# Copyright © 2014 Cisco Systems, Inc. All rights reserved. # See COPYING in top-level directory. # HWLOC_top_builddir="@HWLOC_top_builddir@" -lstopo="$HWLOC_top_builddir/utils/lstopo/lstopo-no-graphics" +builddir="$HWLOC_top_builddir/utils/lstopo" +lstopo="$builddir/lstopo-no-graphics" -HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/src +HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc export HWLOC_PLUGINS_PATH HWLOC_DEBUG_FAKE_COMPONENT=1 diff --git a/utils/hwloc/test-hwloc-annotate.sh.in b/utils/hwloc/test-hwloc-annotate.sh.in index cb311251b0..6cc66b32df 100644 --- a/utils/hwloc/test-hwloc-annotate.sh.in +++ b/utils/hwloc/test-hwloc-annotate.sh.in @@ -3,14 +3,17 @@ # # Copyright © 2009-2013 Inria. All rights reserved. +# Copyright © 2014 Cisco Systems, Inc. All rights reserved. # See COPYING in top-level directory. # -HWLOC_top_builddir="@HWLOC_top_builddir@" -annotate="$HWLOC_top_builddir/utils/hwloc/hwloc-annotate" HWLOC_top_srcdir="@HWLOC_top_srcdir@" +HWLOC_top_builddir="@HWLOC_top_builddir@" +srcdir="$HWLOC_top_srcdir/utils/hwloc" +builddir="$HWLOC_top_builddir/utils/hwloc" +annotate="$builddir/hwloc-annotate" -HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/src +HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc export HWLOC_PLUGINS_PATH if test x@HWLOC_XML_LOCALIZED@ = x1; then @@ -34,7 +37,7 @@ file="$tmp/test-hwloc-annotate.output" set -e -$annotate $HWLOC_top_srcdir/utils/hwloc/test-hwloc-annotate.input $file all info Foo Bar +$annotate $srcdir/test-hwloc-annotate.input $file all info Foo Bar $annotate --ci $file $file Core:all info Foo2 Bar2 $annotate --ci $file $file L2Cache:0 none $annotate --ri $file $file socket:all info Foo @@ -42,5 +45,5 @@ $annotate $file $file socket:0 info Foo2 Bar $annotate $file $file socket:0 info Foo2 Bar2 $annotate --ri $file $file socket:0 info Foo2 Bar3 -diff @HWLOC_DIFF_U@ $HWLOC_top_srcdir/utils/hwloc/test-hwloc-annotate.output "$file" +diff @HWLOC_DIFF_U@ $srcdir/test-hwloc-annotate.output "$file" rm -rf "$tmp" diff --git a/utils/hwloc/test-hwloc-assembler.sh.in b/utils/hwloc/test-hwloc-assembler.sh.in old mode 100755 new mode 100644 index ebb759fcac..8b50d4cddb --- a/utils/hwloc/test-hwloc-assembler.sh.in +++ b/utils/hwloc/test-hwloc-assembler.sh.in @@ -4,14 +4,17 @@ # # Copyright © 2009-2013 Inria. All rights reserved. # Copyright © 2009, 2011 Université Bordeaux +# Copyright © 2014 Cisco Systems, Inc. All rights reserved. # See COPYING in top-level directory. # -HWLOC_top_builddir="@HWLOC_top_builddir@" -assembler="$HWLOC_top_builddir/utils/hwloc/hwloc-assembler" HWLOC_top_srcdir="@HWLOC_top_srcdir@" +HWLOC_top_builddir="@HWLOC_top_builddir@" +srcdir="$HWLOC_top_srcdir/utils/hwloc" +builddir="$HWLOC_top_builddir/utils/hwloc" +assembler="$builddir/hwloc-assembler" -HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/src +HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc export HWLOC_PLUGINS_PATH if test x@HWLOC_XML_LOCALIZED@ = x1; then @@ -36,8 +39,8 @@ file="$tmp/test-hwloc-assembler.output" set -e $assembler $file \ - --name input1 $HWLOC_top_srcdir/utils/hwloc/test-hwloc-assembler.input1 \ - --name input2 $HWLOC_top_srcdir/utils/hwloc/test-hwloc-assembler.input2 \ - --name input1again $HWLOC_top_srcdir/utils/hwloc/test-hwloc-assembler.input1 -diff @HWLOC_DIFF_U@ $HWLOC_top_srcdir/utils/hwloc/test-hwloc-assembler.output "$file" + --name input1 $srcdir/test-hwloc-assembler.input1 \ + --name input2 $srcdir/test-hwloc-assembler.input2 \ + --name input1again $srcdir/test-hwloc-assembler.input1 +diff @HWLOC_DIFF_U@ $srcdir/test-hwloc-assembler.output "$file" rm -rf "$tmp" diff --git a/utils/hwloc/test-hwloc-calc.sh.in b/utils/hwloc/test-hwloc-calc.sh.in old mode 100755 new mode 100644 index 9909b8cdfc..a0fa0d40bf --- a/utils/hwloc/test-hwloc-calc.sh.in +++ b/utils/hwloc/test-hwloc-calc.sh.in @@ -5,14 +5,18 @@ # Copyright © 2009 CNRS # Copyright © 2009-2013 Inria. All rights reserved. # Copyright © 2009, 2011 Université Bordeaux +# Copyright © 2014 Cisco Systems, Inc. All rights reserved. # See COPYING in top-level directory. # -HWLOC_top_builddir="@HWLOC_top_builddir@" -calc="$HWLOC_top_builddir/utils/hwloc/hwloc-calc" HWLOC_top_srcdir="@HWLOC_top_srcdir@" +HWLOC_top_builddir="@HWLOC_top_builddir@" +srcdir="$HWLOC_top_srcdir/utils/hwloc" +builddir="$HWLOC_top_builddir/utils/hwloc" +calc="$builddir/hwloc-calc" +xmldir="$HWLOC_top_srcdir/tests/hwloc/xml" -HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/src +HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwlo export HWLOC_PLUGINS_PATH : ${TMPDIR=/tmp} @@ -72,14 +76,14 @@ set -e $calc --if synthetic --input "group:2 group:2 cache:2 cache:2 pu:1" Group2:1 Group1:0 $calc --if synthetic --input "group:2 group:2 cache:2 cache:2 pu:1" l2:0-2 L1cache:13:3 echo - $calc --if xml --input $HWLOC_top_srcdir/tests/xml/96em64t-4n4d3ca2co-pci.xml os=eth6 os=eth4 - $calc --if xml --input $HWLOC_top_srcdir/tests/xml/96em64t-4n4d3ca2co-pci.xml os=sdc os=sr0 ~os=sda - $calc --if xml --input $HWLOC_top_srcdir/tests/xml/96em64t-4n4d3ca2co-pci.xml pci:1000:0062:3:2 - $calc --if xml --input $HWLOC_top_srcdir/tests/xml/96em64t-4n4d3ca2co-pci.xml pci:14e4:1639:1 - $calc --if xml --input $HWLOC_top_srcdir/tests/xml/96em64t-4n4d3ca2co-pci.xml pci:14e4:1639:2-5 - $calc --if xml --input $HWLOC_top_srcdir/tests/xml/96em64t-4n4d3ca2co-pci.xml pci=0000:62:00.1 pci=0000:02:00.1 - $calc --if xml --input $HWLOC_top_srcdir/tests/xml/96em64t-4n4d3ca2co-pci.xml pci=0000:62:00.1 xpci=0000:02:00.0 - $calc --if xml --input $HWLOC_top_srcdir/tests/xml/96em64t-4n4d3ca2co-pci.xml pci=0000:02:00.0 xpci=0000:02:00.1 + $calc --if xml --input $xmldir/96em64t-4n4d3ca2co-pci.xml os=eth6 os=eth4 + $calc --if xml --input $xmldir/96em64t-4n4d3ca2co-pci.xml os=sdc os=sr0 ~os=sda + $calc --if xml --input $xmldir/96em64t-4n4d3ca2co-pci.xml pci:1000:0062:3:2 + $calc --if xml --input $xmldir/96em64t-4n4d3ca2co-pci.xml pci:14e4:1639:1 + $calc --if xml --input $xmldir/96em64t-4n4d3ca2co-pci.xml pci:14e4:1639:2-5 + $calc --if xml --input $xmldir/96em64t-4n4d3ca2co-pci.xml pci=0000:62:00.1 pci=0000:02:00.1 + $calc --if xml --input $xmldir/96em64t-4n4d3ca2co-pci.xml pci=0000:62:00.1 xpci=0000:02:00.0 + $calc --if xml --input $xmldir/96em64t-4n4d3ca2co-pci.xml pci=0000:02:00.0 xpci=0000:02:00.1 echo cat << EOF | $calc --if synthetic --input "node:4 core:4 pu:4" pu:0 @@ -91,5 +95,5 @@ node:0 node:3 root EOF ) > "$file" -diff @HWLOC_DIFF_U@ $HWLOC_top_srcdir/utils/hwloc/test-hwloc-calc.output "$file" +diff @HWLOC_DIFF_U@ $srcdir/test-hwloc-calc.output "$file" rm -rf "$tmp" diff --git a/utils/hwloc/test-hwloc-compress-dir.sh.in b/utils/hwloc/test-hwloc-compress-dir.sh.in old mode 100755 new mode 100644 index cf5e0ce6f2..dbb59d204a --- a/utils/hwloc/test-hwloc-compress-dir.sh.in +++ b/utils/hwloc/test-hwloc-compress-dir.sh.in @@ -3,14 +3,17 @@ # # Copyright © 2013 Inria. All rights reserved. +# Copyright © 2014 Cisco Systems, Inc. All rights reserved. # See COPYING in top-level directory. # -HWLOC_top_builddir="@HWLOC_top_builddir@" -compress="$HWLOC_top_builddir/utils/hwloc/hwloc-compress-dir" HWLOC_top_srcdir="@HWLOC_top_srcdir@" +HWLOC_top_builddir="@HWLOC_top_builddir@" +srcdir="$HWLOC_top_srcdir/utils/hwloc" +builddir="$HWLOC_top_builddir/utils/hwloc" +compress="$builddir/hwloc-compress-dir" -HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/src +HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc export HWLOC_PLUGINS_PATH if test x@HWLOC_XML_LOCALIZED@ = x1; then @@ -33,8 +36,8 @@ fi set -e -(cd "$tmp" && gunzip -c $HWLOC_top_srcdir/utils/hwloc/test-hwloc-compress-dir.input.tar.gz | tar xf -) -(cd "$tmp" && gunzip -c $HWLOC_top_srcdir/utils/hwloc/test-hwloc-compress-dir.output.tar.gz | tar xf -) +(cd "$tmp" && gunzip -c $srcdir/test-hwloc-compress-dir.input.tar.gz | tar xf -) +(cd "$tmp" && gunzip -c $srcdir/test-hwloc-compress-dir.output.tar.gz | tar xf -) (cd "$tmp" && mkdir test-hwloc-compress-dir.newoutput) (cd "$tmp" && mkdir test-hwloc-compress-dir.newoutput2) diff --git a/utils/hwloc/test-hwloc-diffpatch.sh.in b/utils/hwloc/test-hwloc-diffpatch.sh.in index c8fce2d0e2..8ef6a0e5b6 100644 --- a/utils/hwloc/test-hwloc-diffpatch.sh.in +++ b/utils/hwloc/test-hwloc-diffpatch.sh.in @@ -3,15 +3,18 @@ # # Copyright © 2009-2013 Inria. All rights reserved. +# Copyright © 2014 Cisco Systems, Inc. All rights reserved. # See COPYING in top-level directory. # -HWLOC_top_builddir="@HWLOC_top_builddir@" -diff="$HWLOC_top_builddir/utils/hwloc/hwloc-diff" -patch="$HWLOC_top_builddir/utils/hwloc/hwloc-patch" HWLOC_top_srcdir="@HWLOC_top_srcdir@" +HWLOC_top_builddir="@HWLOC_top_builddir@" +srcdir="$HWLOC_top_srcdir/utils/hwloc" +builddir="$HWLOC_top_builddir/utils/hwloc" +diff="$builddir/hwloc-diff" +patch="$builddir/hwloc-patch" -HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/src +HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc export HWLOC_PLUGINS_PATH if test x@HWLOC_XML_LOCALIZED@ = x1; then @@ -39,14 +42,15 @@ output2="test-hwloc-diffpatch.output2" set -e -$diff $HWLOC_top_srcdir/utils/hwloc/test-hwloc-diffpatch.input1 $HWLOC_top_srcdir/utils/hwloc/test-hwloc-diffpatch.input2 > $diffoutput -cp $HWLOC_top_srcdir/utils/hwloc/test-hwloc-diffpatch.input1 . -#cat $diffoutput | $patch $HWLOC_top_srcdir/utils/hwloc/test-hwloc-diffpatch.input1 - $output1 +$diff $srcdir/test-hwloc-diffpatch.input1 \ + $srcdir/test-hwloc-diffpatch.input2 > $diffoutput +cp $srcdir/test-hwloc-diffpatch.input1 . +#cat $diffoutput | $patch $srcdir/test-hwloc-diffpatch.input1 - $output1 cat $diffoutput | $patch refname - $output1 -$patch -R $HWLOC_top_srcdir/utils/hwloc/test-hwloc-diffpatch.input2 $diffoutput $output2 +$patch -R $srcdir/test-hwloc-diffpatch.input2 $diffoutput $output2 -diff -u $HWLOC_top_srcdir/utils/hwloc/test-hwloc-diffpatch.input1 "$output2" -diff -u $HWLOC_top_srcdir/utils/hwloc/test-hwloc-diffpatch.input2 "$output1" +diff -u $srcdir/test-hwloc-diffpatch.input1 "$output2" +diff -u $srcdir/test-hwloc-diffpatch.input2 "$output1" cd .. rm -rf "$tmp" diff --git a/utils/hwloc/test-hwloc-distances.sh.in b/utils/hwloc/test-hwloc-distances.sh.in index 1adb9df835..f895a9076c 100644 --- a/utils/hwloc/test-hwloc-distances.sh.in +++ b/utils/hwloc/test-hwloc-distances.sh.in @@ -3,14 +3,17 @@ # # Copyright © 2012-2013 Inria. All rights reserved. +# Copyright © 2014 Cisco Systems, Inc. All rights reserved. # See COPYING in top-level directory. # -HWLOC_top_builddir="@HWLOC_top_builddir@" -distances="$HWLOC_top_builddir/utils/hwloc/hwloc-distances" HWLOC_top_srcdir="@HWLOC_top_srcdir@" +HWLOC_top_builddir="@HWLOC_top_builddir@" +srcdir="$HWLOC_top_srcdir/utils/hwloc" +builddir="$HWLOC_top_builddir/utils/hwloc" +distances="$builddir/hwloc-distances" -HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/src +HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc export HWLOC_PLUGINS_PATH # make sure we use default numeric formats @@ -62,5 +65,5 @@ set -e HWLOC_NUMANode_DISTANCES=none echo ) > "$file" -diff @HWLOC_DIFF_U@ $HWLOC_top_srcdir/utils/hwloc/test-hwloc-distances.output "$file" +diff @HWLOC_DIFF_U@ $srcdir/test-hwloc-distances.output "$file" rm -rf "$tmp" diff --git a/utils/hwloc/test-hwloc-distrib.sh.in b/utils/hwloc/test-hwloc-distrib.sh.in old mode 100755 new mode 100644 index e7c0ca5b78..7a99eb2e7e --- a/utils/hwloc/test-hwloc-distrib.sh.in +++ b/utils/hwloc/test-hwloc-distrib.sh.in @@ -5,14 +5,17 @@ # Copyright © 2009 CNRS # Copyright © 2009-2014 Inria. All rights reserved. # Copyright © 2009 Université Bordeaux +# Copyright © 2014 Cisco Systems, Inc. All rights reserved. # See COPYING in top-level directory. # -HWLOC_top_builddir="@HWLOC_top_builddir@" -distrib="$HWLOC_top_builddir/utils/hwloc/hwloc-distrib" HWLOC_top_srcdir="@HWLOC_top_srcdir@" +HWLOC_top_builddir="@HWLOC_top_builddir@" +srcdir="$HWLOC_top_srcdir/utils/hwloc" +builddir="$HWLOC_top_builddir/utils/hwloc" +distrib="$builddir/hwloc-distrib" -HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/src +HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc export HWLOC_PLUGINS_PATH : ${TMPDIR=/tmp} @@ -55,5 +58,5 @@ set -e echo $distrib --if synthetic --input "4 4 4 4" 19 ) > "$file" -diff @HWLOC_DIFF_U@ $HWLOC_top_srcdir/utils/hwloc/test-hwloc-distrib.output "$file" +diff @HWLOC_DIFF_U@ $srcdir/test-hwloc-distrib.output "$file" rm -rf "$tmp" diff --git a/utils/hwloc/test-hwloc-info.sh.in b/utils/hwloc/test-hwloc-info.sh.in old mode 100755 new mode 100644 index e830d57afc..d8de4b18dc --- a/utils/hwloc/test-hwloc-info.sh.in +++ b/utils/hwloc/test-hwloc-info.sh.in @@ -5,14 +5,17 @@ # Copyright © 2009 CNRS # Copyright © 2009-2013 Inria. All rights reserved. # Copyright © 2009 Université Bordeaux +# Copyright © 2014 Cisco Systems, Inc. All rights reserved. # See COPYING in top-level directory. # -HWLOC_top_builddir="@HWLOC_top_builddir@" -info="$HWLOC_top_builddir/utils/hwloc/hwloc-info" HWLOC_top_srcdir="@HWLOC_top_srcdir@" +HWLOC_top_builddir="@HWLOC_top_builddir@" +srcdir="$HWLOC_top_srcdir/utils/hwloc" +builddir="$HWLOC_top_builddir/utils/hwloc" +info="$builddir/hwloc-info" -HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/src +HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc export HWLOC_PLUGINS_PATH : ${TMPDIR=/tmp} @@ -41,5 +44,5 @@ set -e echo $info --if synthetic --input "node:2 core:2 ca:2 ca:2 pu:2" --ancestor l1 -s pu:7-10 ) > "$file" -diff @HWLOC_DIFF_U@ $HWLOC_top_srcdir/utils/hwloc/test-hwloc-info.output "$file" +diff @HWLOC_DIFF_U@ $srcdir/test-hwloc-info.output "$file" rm -rf "$tmp" diff --git a/utils/lstopo/Makefile.am b/utils/lstopo/Makefile.am index b738722518..1ee942481d 100644 --- a/utils/lstopo/Makefile.am +++ b/utils/lstopo/Makefile.am @@ -11,7 +11,7 @@ AM_CFLAGS = $(HWLOC_CFLAGS) AM_CPPFLAGS = $(HWLOC_CPPFLAGS) -I$(top_srcdir)/utils/hwloc AM_LDFLAGS = $(HWLOC_LDFLAGS) -LDADD = $(HWLOC_top_builddir)/src/libhwloc.la +LDADD = $(HWLOC_top_builddir)/hwloc/libhwloc.la bin_PROGRAMS = \ lstopo-no-graphics diff --git a/utils/lstopo/test-hwloc-ls.sh.in b/utils/lstopo/test-hwloc-ls.sh.in old mode 100755 new mode 100644 index e4409827e4..c5320f159b --- a/utils/lstopo/test-hwloc-ls.sh.in +++ b/utils/lstopo/test-hwloc-ls.sh.in @@ -8,11 +8,13 @@ # See COPYING in top-level directory. # -HWLOC_top_builddir="@HWLOC_top_builddir@" -ls="$HWLOC_top_builddir/utils/lstopo/lstopo-no-graphics" HWLOC_top_srcdir="@HWLOC_top_srcdir@" +HWLOC_top_builddir="@HWLOC_top_builddir@" +srcdir="$HWLOC_top_srcdir/utils/lstopo" +builddir="$HWLOC_top_builddir/utils/lstopo" +ls="$builddir/lstopo-no-graphics" -HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/src +HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc export HWLOC_PLUGINS_PATH : ${TMPDIR=/tmp} @@ -51,5 +53,5 @@ $ls HWLOC_NO_LIBXML_EXPORT=1 $ls $tmp/test.xml $ls --input "ma:1 no:2 so:1 ca:2 2" $tmp/test.synthetic ) > "$file" -diff @HWLOC_DIFF_U@ $HWLOC_top_srcdir/utils/lstopo/test-hwloc-ls.output "$file" +diff @HWLOC_DIFF_U@ $srcdir/test-hwloc-ls.output "$file" rm -rf "$tmp"