Merge pull request #1185 from SpiNNakerManchester/HostBasedBitFieldRo…

…uterCompressor

remove broken HostBasedBitFieldRouterCompressor

spinn_front_end_common/interface/abstract_spinnaker_base.py

@@ -92,8 +92,7 @@
     reload_dsg_regions, energy_provenance_reporter,
     load_application_data_specs, load_system_data_specs,
     graph_binary_gatherer, graph_data_specification_writer,
-    graph_provenance_gatherer,
-    host_based_bit_field_router_compressor, hbp_allocator,
+    graph_provenance_gatherer, hbp_allocator,
     insert_chip_power_monitors_to_graphs,
     insert_extra_monitor_vertices_to_graphs, split_lpg_vertices,
     load_app_images, load_fixed_routes, load_sys_images,
@@ -1445,27 +1444,6 @@ def _execute_graph_binary_gatherer(self) -> None:
                     return
                 raise
 
-    @final
-    def _execute_host_bitfield_compressor(self) -> Optional[
-            MulticastRoutingTables]:
-        """
-        Runs, times and logs the HostBasedBitFieldRouterCompressor
-
-        .. note::
-            Calling of this method is based on the configuration compressor or
-            virtual_compressor value
-
-        :return: Compressed routing tables
-        :rtype: ~pacman.model.routing_tables.MulticastRoutingTables
-        """
-        with FecTimer("Host based bitfield router compressor",
-                      TimerWork.OTHER) as timer:
-            if timer.skip_if_virtual_board():
-                return None
-            self._multicast_routes_loaded = False
-            compressed = host_based_bit_field_router_compressor()
-            return compressed
-
     @final
     def _execute_ordered_covering_compressor(self) -> MulticastRoutingTables:
         """
@@ -1641,39 +1619,6 @@ def _do_early_compression(self, name: str) -> Optional[
         # delay compression until later
         return None
 
-    def _do_delayed_compression(
-            self, name: str,
-            compressed: Optional[MulticastRoutingTables]) -> Optional[
-                MulticastRoutingTables]:
-        """
-        Run compression that must be delayed until later.
-
-        .. note::
-            This method is the entry point for adding a new compressor that
-            can not run at the normal place
-
-        :param str name: Name of a compressor
-        :return: CompressedRoutingTables (likely to be `None`),
-            RouterCompressorProvenanceItems (may be an empty list)
-        :rtype: ~pacman.model.routing_tables.MulticastRoutingTables or None
-        :raise ConfigurationException: if the name is not expected
-        """
-        if self._multicast_routes_loaded or compressed:
-            # Already compressed
-            return compressed
-        # overridden in spy to handle:
-        # SpynnakerMachineBitFieldOrderedCoveringCompressor
-        # SpynnakerMachineBitFieldPairRouterCompressor
-
-        if name == "HostBasedBitFieldRouterCompressor":
-            return self._execute_host_bitfield_compressor()
-        if "," in name:
-            raise ConfigurationException(
-                "Only a single algorithm is supported for compressor")
-
-        raise ConfigurationException(
-            f"Unexpected cfg setting compressor: {name}")
-
     @final
     def _execute_load_routing_tables(
             self, compressed: Optional[MulticastRoutingTables]) -> None:
@@ -1893,7 +1838,6 @@ def _do_load(self) -> None:
         self._execute_load_application_data_specification()
 
         self._do_extra_load_algorithms()
-        compressed = self._do_delayed_compression(compressor, compressed)
         self._execute_load_routing_tables(compressed)
         self._report_bit_field_compressor()
 

spinn_front_end_common/interface/interface_functions/__init__.py

@@ -30,8 +30,6 @@
     graph_data_specification_writer)
 from .graph_provenance_gatherer import graph_provenance_gatherer
 from .hbp_allocator import hbp_allocator
-from .host_bit_field_router_compressor import (
-    host_based_bit_field_router_compressor)
 from .load_data_specification import (
     load_application_data_specs, load_system_data_specs)
 from .insert_chip_power_monitors_to_graphs import (
@@ -68,7 +66,7 @@
     "load_system_data_specs", "FindApplicationChipsUsed",
     "graph_binary_gatherer", "graph_data_specification_writer",
     "graph_provenance_gatherer",
-    "hbp_allocator", "host_based_bit_field_router_compressor",
+    "hbp_allocator",
     "insert_chip_power_monitors_to_graphs",
     "insert_extra_monitor_vertices_to_graphs",
     "split_lpg_vertices",