Skip to content

Commit

Permalink
Move src/* to hwloc/ to prepare for netloc addition
Browse files Browse the repository at this point in the history 
Also move tests/* to tests/hwloc/

Utils were already in specific directories.
  • Loading branch information
@jsquyres @bgoglin
jsquyres authored and bgoglin committed Oct 29, 2014
1 parent 12f229d commit 245a239
Show file tree
Hide file tree
Showing 308 changed files with 615 additions and 550 deletions.
149 changes: 78 additions & 71 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -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
Expand Down Expand Up @@ -165,4 +173,3 @@ test-suite.log
/utils/lstopo/test-hwloc-ls.sh
/utils/lstopo/test-*.sh.log
/utils/lstopo/test-*.sh.trs

45 changes: 24 additions & 21 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand All @@ -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
#
Expand All @@ -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
4 changes: 2 additions & 2 deletions VERSION
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ snapshot_version=gitclone
# major, minor, and release are generally combined in the form
# <major>.<minor>.<release>. 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,
Expand Down
8 changes: 4 additions & 4 deletions config/hwloc.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down
68 changes: 43 additions & 25 deletions config/hwloc_internal.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 245a239

Please sign in to comment.