Skip to content

Commit 927fe55

Browse files
bgoglinbgoglin
committed
netloc: remove
Doxy files still need some updates since main.doxy only includes hwloc.doxy now. The hwloc/ source directory isn't renamed to src/ (as in 1.x), not strictly required. tests/hwloc/ doesn't go back to tests either, could be nice since there's nothing else in tests/. utils/ still contains hwloc/ and lstopo/, we're fine there. Signed-off-by: Brice Goglin <[email protected]>
1 parent a676363 commit 927fe55

Some content is hidden

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

68 files changed

+15
-10769
lines changed

‎.gitignore

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -205,19 +205,6 @@ test-suite.log
205205
/utils/lstopo/test-*.sh.log
206206
/utils/lstopo/test-*.sh.trs
207207

208-
/netloc.pc
209-
/netlocscotch.pc
210-
211-
/utils/netloc/infiniband/netloc_ib_gather_raw
212-
/utils/netloc/infiniband/netloc_ib_extract_dats
213-
/utils/netloc/draw/netloc_draw_to_json
214-
/utils/netloc/mpi/netloc_mpi_find_hosts
215-
/utils/netloc/mpi/netloc_mpi_rank_file
216-
/utils/netloc/mpi/netloc_rank_order
217-
218-
/tests/netloc/tests.sh
219-
/tests/netloc/data/scotch/scotch_get_arch
220-
221208
/contrib/systemd/hwloc-dump-hwdata.service
222209
/contrib/misc/hwloc-tweak-osindex
223210

‎Makefile.am

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ EXTRA_DIST = \
2020
SUBDIRS = include hwloc
2121

2222
if HWLOC_BUILD_STANDALONE
23-
if BUILD_NETLOC
24-
SUBDIRS += netloc
25-
endif
2623
SUBDIRS += utils tests contrib/systemd contrib/completion contrib/misc contrib/hwloc-ps.www
2724
# We need doc/ if HWLOC_BUILD_DOXYGEN, or during make install if HWLOC_INSTALL_DOXYGEN.
2825
# There's no INSTALL_SUBDIRS, so always enter doc/ and check HWLOC_BUILD/INSTALL_DOXYGEN there
@@ -35,24 +32,12 @@ DIST_SUBDIRS = $(SUBDIRS)
3532
if HWLOC_BUILD_STANDALONE
3633
DIST_SUBDIRS += contrib/windows
3734
EXTRA_DIST += contrib/windows-cmake
38-
if !BUILD_NETLOC
39-
DIST_SUBDIRS += netloc
40-
endif
4135
endif
4236

4337
# Only install the pkg file if we're building in standalone mode (and not on Windows)
4438
if HWLOC_BUILD_STANDALONE
4539
hwlocpkgconfigdir = $(libdir)/pkgconfig
4640
hwlocpkgconfig_DATA = hwloc.pc
47-
if BUILD_NETLOC
48-
# JMS Need to compare hwloc.pc and netloc.pc -- I think netloc.pc is
49-
# missing some things.
50-
# pkgconfig_DATA += netloc.pc Disabled until the netloc API is public
51-
EXTRA_DIST += netloc.pc
52-
if BUILD_NETLOCSCOTCH
53-
hwlocpkgconfig_DATA += netlocscotch.pc
54-
endif BUILD_NETLOCSCOTCH
55-
endif BUILD_NETLOC
5641
endif HWLOC_BUILD_STANDALONE
5742

5843
# Only install the valgrind suppressions file if we're building in
@@ -69,7 +54,6 @@ else !HWLOC_BUILD_STANDALONE
6954
dist-hook:
7055
@MKDIR_P@ \
7156
$(distdir)/doc \
72-
$(distdir)/netloc \
7357
$(distdir)/utils \
7458
$(distdir)/tests \
7559
$(distdir)/contrib/completion \

‎NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ Version 3.0.0
3636
+ lstopo has a new --osf option to tune the displaying of object
3737
attributes and units.
3838
* Removed features
39+
+ Netloc.
3940
+ Importing and exporting from/to hwloc 1.x XML.
4041
+ BlueGene/Q support.
4142
+ Functions that were deprecated since 2.0:

‎README

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ hwloc is actually made of two subprojects distributed together:
1414
It is described in details starting at section Hardware Locality (hwloc)
1515
Introduction.
1616
* The network-oriented companion called netloc (Network Locality), described
17-
in details starting with section Network Locality (netloc).
17+
in details starting with section netloc_intro.
1818

1919
See also the Related pages tab above for links to other sections.
2020

@@ -38,7 +38,7 @@ shell$ make
3838
shell$ make install
3939

4040
hwloc- and netloc-specific configure options and requirements are documented in
41-
sections hwloc Installation and Netloc Installation respectively.
41+
sections hwloc Installation and netloc_installation respectively.
4242

4343
Also note that if you install supplemental libraries in non-standard locations,
4444
hwloc's configure script may not be able to find them without some help. You

‎VERSION

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,5 @@ snapshot_version=${major}.${minor}.${release}${greek}-git
4242
# format.
4343

4444
libhwloc_so_version=0:0:0
45-
libnetloc_so_version=0:0:0
4645

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

‎config/hwloc.m4

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1849,11 +1849,6 @@ AC_DEFUN([HWLOC_DO_AM_CONDITIONALS],[
18491849
AM_CONDITIONAL([HWLOC_HAVE_CXX], [test "x$hwloc_have_cxx" = "xyes"])
18501850
])
18511851
hwloc_did_am_conditionals=yes
1852-
1853-
# For backwards compatibility (i.e., packages that only call
1854-
# HWLOC_DO_AM_CONDITIONS, not NETLOC DO_AM_CONDITIONALS), we also have to
1855-
# do the netloc AM conditionals here
1856-
NETLOC_DO_AM_CONDITIONALS
18571852
])dnl
18581853

18591854
#-----------------------------------------------------------------------

‎config/hwloc_internal.m4

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -410,21 +410,11 @@ EOF
410410
])
411411
412412
# Only generate this if we're building the utilities
413-
# Even the netloc library Makefile is here because
414-
# we don't embed libnetloc yet, it's useless without tools
415413
AC_CONFIG_FILES(
416414
hwloc_config_prefix[utils/Makefile]
417415
hwloc_config_prefix[utils/hwloc/Makefile]
418416
hwloc_config_prefix[utils/lstopo/Makefile]
419417
hwloc_config_prefix[hwloc.pc]
420-
421-
hwloc_config_prefix[netloc/Makefile]
422-
hwloc_config_prefix[utils/netloc/infiniband/Makefile]
423-
hwloc_config_prefix[utils/netloc/draw/Makefile]
424-
hwloc_config_prefix[utils/netloc/scotch/Makefile]
425-
hwloc_config_prefix[utils/netloc/mpi/Makefile]
426-
hwloc_config_prefix[netloc.pc]
427-
hwloc_config_prefix[netlocscotch.pc]
428418
)
429419
])dnl
430420

@@ -521,14 +511,11 @@ int foo(void) {
521511
hwloc_config_prefix[utils/hwloc/test-hwloc-dump-hwdata/test-hwloc-dump-hwdata.sh]
522512
hwloc_config_prefix[utils/lstopo/test-lstopo.sh]
523513
hwloc_config_prefix[utils/lstopo/test-lstopo-shmem.sh]
524-
hwloc_config_prefix[utils/netloc/infiniband/netloc_ib_gather_raw]
525514
hwloc_config_prefix[contrib/hwloc-ps.www/Makefile]
526515
hwloc_config_prefix[contrib/systemd/Makefile]
527516
hwloc_config_prefix[contrib/completion/Makefile]
528517
hwloc_config_prefix[contrib/misc/Makefile]
529518
hwloc_config_prefix[contrib/windows/Makefile]
530-
hwloc_config_prefix[tests/netloc/Makefile]
531-
hwloc_config_prefix[tests/netloc/tests.sh]
532519
)
533520
534521
AC_CONFIG_COMMANDS([chmoding-scripts], [chmod +x] \
@@ -552,9 +539,7 @@ int foo(void) {
552539
hwloc_config_prefix[utils/hwloc/test-parsing-flags.sh] \
553540
hwloc_config_prefix[utils/hwloc/test-hwloc-dump-hwdata/test-hwloc-dump-hwdata.sh] \
554541
hwloc_config_prefix[utils/lstopo/test-lstopo.sh] \
555-
hwloc_config_prefix[utils/lstopo/test-lstopo-shmem.sh] \
556-
hwloc_config_prefix[utils/netloc/infiniband/netloc_ib_gather_raw] \
557-
hwloc_config_prefix[tests/netloc/tests.sh])
542+
hwloc_config_prefix[utils/lstopo/test-lstopo-shmem.sh])
558543
559544
# These links are only needed in standalone mode. It would
560545
# be nice to m4 foreach this somehow, but whenever I tried

‎config/netloc.m4

Lines changed: 0 additions & 102 deletions
This file was deleted.

‎configure.ac

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -133,25 +133,6 @@ AC_SUBST([libhwloc_so_name])
133133
# Setup the hwloc core
134134
HWLOC_SETUP_CORE([], [], [AC_MSG_ERROR([Cannot build hwloc core])], [1])
135135

136-
####################################################################
137-
# Setup the netloc API
138-
####################################################################
139-
140-
AC_SUBST([libnetloc_so_version])
141-
142-
AC_ARG_ENABLE([netloc],
143-
[AS_HELP_STRING([--enable-netloc],
144-
[The Netloc functionality is enabled by default, but will be silently skipped it if cannot be built (e.g., not supported on your platform). Using --enable-netloc will cause configure to abort if Netloc cannot be build. Using --disable-netloc will cause configure to skip attempting to build netloc at all.])
145-
])
146-
147-
AS_IF([test "$enable_netloc" != "no" -a "$hwloc_mode" = "standalone"],
148-
[NETLOC_SETUP_CORE([], [],
149-
[AS_IF([test "$enable_netloc" = "yes"],
150-
[AC_MSG_ERROR([Cannot build netloc core])])
151-
],
152-
[1])
153-
])
154-
155136
####################################################################
156137
# Version information
157138
####################################################################
@@ -198,7 +179,6 @@ EOF
198179

199180
# Run the AM_CONDITIONALs
200181
HWLOC_DO_AM_CONDITIONALS
201-
NETLOC_DO_AM_CONDITIONALS
202182

203183
####################################################################
204184
# Final output
@@ -226,12 +206,6 @@ fi
226206
# Show which optional support we'll be building
227207
hwloc_xml_status=basic
228208
AS_IF([test "$hwloc_libxml2_happy" = "yes"], [hwloc_xml_status=full])
229-
netloc_status=no
230-
AS_IF([test "$netloc_happy" = "yes"], [
231-
netlocscotch_status=without
232-
AS_IF([test "$scotch_found_headers" = "yes"], [netlocscotch_status=with])
233-
netloc_status="yes ($netlocscotch_status scotch)"
234-
])
235209

236210
AS_IF([test "$enable_embedded_mode" = "yes"],
237211
[hwloc_graphical_lstopo_status="no (disabled in embedded mode)"],
@@ -340,7 +314,6 @@ fi
340314
cat <<EOF
341315
Graphical output: $hwloc_graphical_lstopo_status
342316
XML input / output: $hwloc_xml_status
343-
Netloc functionality: $netloc_status
344317
EOF
345318

346319
# Plugin support

‎contrib/android/include/private/autogen/config.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -633,9 +633,6 @@
633633
/* Define to the sub-directory where libtool stores uninstalled libraries. */
634634
#define LT_OBJDIR ".libs/"
635635

636-
/* Define to 1 if scotch is netlocscotch is enabled */
637-
/* #undef NETLOC_SCOTCH */
638-
639636
/* Name of package */
640637
#define PACKAGE "hwloc"
641638

0 commit comments

Comments
 (0)