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 <Brice.Goglin@inria.fr>

.gitignore

@@ -205,19 +205,6 @@ test-suite.log
 /utils/lstopo/test-*.sh.log
 /utils/lstopo/test-*.sh.trs
 
-/netloc.pc
-/netlocscotch.pc
-
-/utils/netloc/infiniband/netloc_ib_gather_raw
-/utils/netloc/infiniband/netloc_ib_extract_dats
-/utils/netloc/draw/netloc_draw_to_json
-/utils/netloc/mpi/netloc_mpi_find_hosts
-/utils/netloc/mpi/netloc_mpi_rank_file
-/utils/netloc/mpi/netloc_rank_order
-
-/tests/netloc/tests.sh
-/tests/netloc/data/scotch/scotch_get_arch
-
 /contrib/systemd/hwloc-dump-hwdata.service
 /contrib/misc/hwloc-tweak-osindex
 

Makefile.am

@@ -20,9 +20,6 @@ EXTRA_DIST = \
 SUBDIRS = include hwloc
 
 if HWLOC_BUILD_STANDALONE
-if BUILD_NETLOC
-SUBDIRS += netloc
-endif
 SUBDIRS += utils tests contrib/systemd contrib/completion contrib/misc contrib/hwloc-ps.www
 # We need doc/ if HWLOC_BUILD_DOXYGEN, or during make install if HWLOC_INSTALL_DOXYGEN.
 # There's no INSTALL_SUBDIRS, so always enter doc/ and check HWLOC_BUILD/INSTALL_DOXYGEN there
@@ -35,24 +32,12 @@ DIST_SUBDIRS = $(SUBDIRS)
 if HWLOC_BUILD_STANDALONE
 DIST_SUBDIRS += contrib/windows
 EXTRA_DIST += contrib/windows-cmake
-if !BUILD_NETLOC
-DIST_SUBDIRS += netloc
-endif
 endif
 
 # Only install the pkg file if we're building in standalone mode (and not on Windows)
 if HWLOC_BUILD_STANDALONE
 hwlocpkgconfigdir = $(libdir)/pkgconfig
 hwlocpkgconfig_DATA = hwloc.pc
-if BUILD_NETLOC
-# JMS Need to compare hwloc.pc and netloc.pc -- I think netloc.pc is
-# missing some things.
-# pkgconfig_DATA += netloc.pc Disabled until the netloc API is public
-EXTRA_DIST += netloc.pc
-if BUILD_NETLOCSCOTCH
-hwlocpkgconfig_DATA += netlocscotch.pc
-endif BUILD_NETLOCSCOTCH
-endif BUILD_NETLOC
 endif HWLOC_BUILD_STANDALONE
 
 # Only install the valgrind suppressions file if we're building in
@@ -69,7 +54,6 @@ else !HWLOC_BUILD_STANDALONE
 dist-hook:
 	@MKDIR_P@	\
 		$(distdir)/doc \
-		$(distdir)/netloc \
 		$(distdir)/utils \
 		$(distdir)/tests \
 		$(distdir)/contrib/completion \

NEWS

@@ -36,6 +36,7 @@ Version 3.0.0
   + lstopo has a new --osf option to tune the displaying of object
     attributes and units.
 * Removed features
+  + Netloc.
   + Importing and exporting from/to hwloc 1.x XML.
   + BlueGene/Q support.
   + Functions that were deprecated since 2.0:

README

@@ -14,7 +14,7 @@ hwloc is actually made of two subprojects distributed together:
  It is described in details starting at section Hardware Locality (hwloc)
  Introduction.
   * The network-oriented companion called netloc (Network Locality), described
- in details starting with section Network Locality (netloc).
+ in details starting with section netloc_intro.
 
 See also the Related pages tab above for links to other sections.
 
@@ -38,7 +38,7 @@ shell$ make
 shell$ make install
 
 hwloc- and netloc-specific configure options and requirements are documented in
-sections hwloc Installation and Netloc Installation respectively.
+sections hwloc Installation and netloc_installation respectively.
 
 Also note that if you install supplemental libraries in non-standard locations,
 hwloc's configure script may not be able to find them without some help. You

VERSION

@@ -42,6 +42,5 @@ snapshot_version=${major}.${minor}.${release}${greek}-git
 # format.
 
 libhwloc_so_version=0:0:0
-libnetloc_so_version=0:0:0
 
 # Please also update the <TargetName> lines in contrib/windows/libhwloc.vcxproj

config/hwloc.m4

@@ -1849,11 +1849,6 @@ AC_DEFUN([HWLOC_DO_AM_CONDITIONALS],[
         AM_CONDITIONAL([HWLOC_HAVE_CXX], [test "x$hwloc_have_cxx" = "xyes"])
     ])
     hwloc_did_am_conditionals=yes
-
-    # For backwards compatibility (i.e., packages that only call
-    # HWLOC_DO_AM_CONDITIONS, not NETLOC DO_AM_CONDITIONALS), we also have to
-    # do the netloc AM conditionals here
-    NETLOC_DO_AM_CONDITIONALS
 ])dnl
 
 #-----------------------------------------------------------------------

config/hwloc_internal.m4

@@ -410,21 +410,11 @@ EOF
     ])
 
     # Only generate this if we're building the utilities
-    # Even the netloc library Makefile is here because
-    # we don't embed libnetloc yet, it's useless without tools
     AC_CONFIG_FILES(
         hwloc_config_prefix[utils/Makefile]
         hwloc_config_prefix[utils/hwloc/Makefile]
         hwloc_config_prefix[utils/lstopo/Makefile]
         hwloc_config_prefix[hwloc.pc]
-
-        hwloc_config_prefix[netloc/Makefile]
-        hwloc_config_prefix[utils/netloc/infiniband/Makefile]
-        hwloc_config_prefix[utils/netloc/draw/Makefile]
-        hwloc_config_prefix[utils/netloc/scotch/Makefile]
-        hwloc_config_prefix[utils/netloc/mpi/Makefile]
-        hwloc_config_prefix[netloc.pc]
-        hwloc_config_prefix[netlocscotch.pc]
    )
 ])dnl
 
@@ -521,14 +511,11 @@ int foo(void) {
         hwloc_config_prefix[utils/hwloc/test-hwloc-dump-hwdata/test-hwloc-dump-hwdata.sh]
         hwloc_config_prefix[utils/lstopo/test-lstopo.sh]
         hwloc_config_prefix[utils/lstopo/test-lstopo-shmem.sh]
-        hwloc_config_prefix[utils/netloc/infiniband/netloc_ib_gather_raw]
         hwloc_config_prefix[contrib/hwloc-ps.www/Makefile]
         hwloc_config_prefix[contrib/systemd/Makefile]
         hwloc_config_prefix[contrib/completion/Makefile]
         hwloc_config_prefix[contrib/misc/Makefile]
         hwloc_config_prefix[contrib/windows/Makefile]
-        hwloc_config_prefix[tests/netloc/Makefile]
-        hwloc_config_prefix[tests/netloc/tests.sh]
     )
 
     AC_CONFIG_COMMANDS([chmoding-scripts], [chmod +x] \
@@ -552,9 +539,7 @@ int foo(void) {
       hwloc_config_prefix[utils/hwloc/test-parsing-flags.sh] \
       hwloc_config_prefix[utils/hwloc/test-hwloc-dump-hwdata/test-hwloc-dump-hwdata.sh] \
       hwloc_config_prefix[utils/lstopo/test-lstopo.sh] \
-      hwloc_config_prefix[utils/lstopo/test-lstopo-shmem.sh] \
-      hwloc_config_prefix[utils/netloc/infiniband/netloc_ib_gather_raw] \
-      hwloc_config_prefix[tests/netloc/tests.sh])
+      hwloc_config_prefix[utils/lstopo/test-lstopo-shmem.sh])
 
     # These links are only needed in standalone mode.  It would
     # be nice to m4 foreach this somehow, but whenever I tried

configure.ac

@@ -133,25 +133,6 @@ AC_SUBST([libhwloc_so_name])
 # Setup the hwloc core
 HWLOC_SETUP_CORE([], [], [AC_MSG_ERROR([Cannot build hwloc core])], [1])
 
-####################################################################
-# Setup the netloc API
-####################################################################
-
-AC_SUBST([libnetloc_so_version])
-
-AC_ARG_ENABLE([netloc],
-              [AS_HELP_STRING([--enable-netloc],
-                              [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.])
-              ])
-
-AS_IF([test "$enable_netloc" != "no" -a "$hwloc_mode" = "standalone"],
-      [NETLOC_SETUP_CORE([], [],
-           [AS_IF([test "$enable_netloc" = "yes"],
-                  [AC_MSG_ERROR([Cannot build netloc core])])
-           ],
-           [1])
-      ])
-
 ####################################################################
 # Version information
 ####################################################################
@@ -198,7 +179,6 @@ EOF
 
 # Run the AM_CONDITIONALs
 HWLOC_DO_AM_CONDITIONALS
-NETLOC_DO_AM_CONDITIONALS
 
 ####################################################################
 # Final output
@@ -226,12 +206,6 @@ fi
 # Show which optional support we'll be building
 hwloc_xml_status=basic
 AS_IF([test "$hwloc_libxml2_happy" = "yes"], [hwloc_xml_status=full])
-netloc_status=no
-AS_IF([test "$netloc_happy" = "yes"], [
-  netlocscotch_status=without
-  AS_IF([test "$scotch_found_headers" = "yes"], [netlocscotch_status=with])
-  netloc_status="yes ($netlocscotch_status scotch)"
-])
 
 AS_IF([test "$enable_embedded_mode" = "yes"],
       [hwloc_graphical_lstopo_status="no (disabled in embedded mode)"],
@@ -340,7 +314,6 @@ fi
 cat <<EOF
 Graphical output:            $hwloc_graphical_lstopo_status
 XML input / output:          $hwloc_xml_status
-Netloc functionality:        $netloc_status
 EOF
 
 # Plugin support

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

@@ -633,9 +633,6 @@
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
 #define LT_OBJDIR ".libs/"
 
-/* Define to 1 if scotch is netlocscotch is enabled */
-/* #undef NETLOC_SCOTCH */
-
 /* Name of package */
 #define PACKAGE "hwloc"
 

contrib/ci.inria.fr/job-3-sonarscanner.sh

@@ -78,7 +78,7 @@ scan-build -plist --intercept-first --analyze-headers -o analyzer_reports make |
 test x$NO_CHECK = xtrue || scan-build -plist --intercept-first --analyze-headers -o analyzer_reports make check | tee -a scan-build.log
 
 # Run cppcheck analysis
-SOURCES_TO_ANALYZE="hwloc netloc tests utils"
+SOURCES_TO_ANALYZE="hwloc tests utils"
 SOURCES_TO_EXCLUDE="-itests/hwloc/ports -ihwloc/topology-aix.c -ihwloc/topology-darwin.c -ihwloc/topology-freebsd.c -ihwloc/topology-hpux.c -ihwloc/topology-netbsd.c -ihwloc/topology-solaris.c -ihwloc/topology-solaris-chiptype.c -ihwloc/topology-windows.c -ihwloc/topology-cuda.c -ihwloc/topology-gl.c -ihwloc/topology-nvml.c -ihwloc/topology-rsmi.c -ihwloc/topology-levelzero.c -ihwloc/topology-opencl.c -iutils/lstopo/lstopo-windows.c -iutils/lstopo/lstopo-android.c"
 CPPCHECK_INCLUDES="-Iinclude -Ihwloc -Iutils/lstopo -Iutils/hwloc"
 CPPCHECK="cppcheck -v -f --language=c --platform=unix64 --enable=all --xml --xml-version=2 --suppress=purgedConfiguration --suppress=missingIncludeSystem ${CPPCHECK_INCLUDES}"
@@ -154,8 +154,8 @@ sonar.projectVersion=$hwloc_branch
 sonar.scm.disabled=false
 # sonar.scm.provider=git requires sonar-scanner to run inside a git clone
 sonar.sourceEncoding=UTF-8
-sonar.sources=hwloc, netloc, tests, utils
-sonar.exclusions=tests/hwloc/ports/**,utils/netloc/draw/**,tests/hwloc/xml/*.xml
+sonar.sources=hwloc, tests, utils
+sonar.exclusions=tests/hwloc/ports/**,tests/hwloc/xml/*.xml
 sonar.c.clangsa.reportPath=analyzer_reports/*/*.plist
 sonar.c.errorRecoveryEnabled=true
 sonar.c.compiler.parser=GCC

contrib/update-my-copyright.pl

@@ -125,7 +125,7 @@ sub quiet_print {
 # Find the top-level HWLOC source tree dir
 my $start = defined $ARGV[0] ? $ARGV[0] : cwd();
 my $top = $start;
-while (! -d "$top/hwloc" && ! -d "$top/netloc") {
+while (! -d "$top/hwloc") {
     chdir("..");
     $top = cwd();
     die "Can't find top-level hwloc directory"

doc/Makefile.am

@@ -28,15 +28,13 @@ DOX_TAG = $(DOX_DIR)/$(PACKAGE).tag
 # images already available in repository
 PREBUILT_IMAGES = images/dudley.png images/emmett.png images/hagrid.png \
         images/ppc64-with-smt.png images/ppc64-without-smt.png images/ppc64-full-with-smt.png \
-        images/devel09-pci.png \
-        images/netloc_design.png images/netloc_draw.png
+        images/devel09-pci.png
 # images built from repository before inclusion in make dist
 BUILT_IMAGES = images/diagram.png images/diagram.eps
 
 EXTRA_DIST = \
         main.doxy \
         hwloc.doxy \
-        netloc.doxy \
         README.sed \
         doxygen.css \
         doxygen.cfg \
@@ -85,9 +83,7 @@ dox_inputs = $(DOX_CONFIG) \
        $(hwloc_include_dir)/hwloc/levelzero.h \
        $(hwloc_include_dir)/hwloc/gl.h \
        $(hwloc_include_dir)/hwloc/windows.h \
-       $(hwloc_include_dir)/hwloc/openfabrics-verbs.h \
-       $(srcdir)/netloc.doxy \
-       $(hwloc_include_dir)/netloc.h
+       $(hwloc_include_dir)/hwloc/openfabrics-verbs.h
 
 #
 # Create the images that we need for the PDF output and the HTML