Merge branch 'master' into tidy-up-debug-code

SpiNNakerManchester · Aug 22, 2022 · 7cdbdf0 · 7cdbdf0
2 parents 5154481 + 0eb84d9
commit 7cdbdf0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 113 deletions.
diff --git a/spinn_front_end_common/interface/splitter_selectors/splitter_selector.py b/spinn_front_end_common/interface/splitter_selectors/splitter_selector.py
@@ -17,11 +17,11 @@
 from spinn_utilities.log import FormatAdapter
 from pacman.data import PacmanDataView
 from pacman.model.partitioner_splitters import (
-    SplitterOneAppOneMachine, SplitterOneToOneLegacy, SplitterFixedLegacy)
+    SplitterOneAppOneMachine, SplitterFixedLegacy)
 from pacman.model.graphs.application.abstract import (
     AbstractOneAppOneMachineVertex)
 from spinn_front_end_common.utility_models import (
-    ReverseIpTagMultiCastSource, ChipPowerMonitor)
+    ReverseIpTagMultiCastSource)
 
 logger = FormatAdapter(logging.getLogger(__name__))
 
@@ -51,8 +51,6 @@ def vertex_selector(app_vertex):
         app_vertex.splitter = SplitterOneAppOneMachine()
     elif isinstance(app_vertex, ReverseIpTagMultiCastSource):
         app_vertex.splitter = SplitterFixedLegacy()
-    elif isinstance(app_vertex, ChipPowerMonitor):
-        app_vertex.splitter = SplitterOneToOneLegacy()
     else:
         logger.warning(
             f"The SplitterSelector has not seen the {app_vertex} vertex "

diff --git a/spinn_front_end_common/utility_models/__init__.py b/spinn_front_end_common/utility_models/__init__.py
@@ -13,11 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from .chip_power_monitor import ChipPowerMonitor
 from .chip_power_monitor_machine_vertex import ChipPowerMonitorMachineVertex
 from .command_sender import CommandSender
 from .command_sender_machine_vertex import CommandSenderMachineVertex
-from .data_speed_up_packet_gatherer import DataSpeedUpPacketGather
 from .data_speed_up_packet_gatherer_machine_vertex import (
     DataSpeedUpPacketGatherMachineVertex)
 from .extra_monitor_support_machine_vertex import (
@@ -31,8 +29,8 @@
 from .streaming_context_manager import StreamingContextManager
 
 __all__ = ["CommandSender", "CommandSenderMachineVertex",
-           "ChipPowerMonitor", "ChipPowerMonitorMachineVertex",
-           "DataSpeedUpPacketGather", "DataSpeedUpPacketGatherMachineVertex",
+           "ChipPowerMonitorMachineVertex",
+           "DataSpeedUpPacketGatherMachineVertex",
            "ExtraMonitorSupportMachineVertex",
            "LivePacketGather", "LivePacketGatherMachineVertex",
            "MultiCastCommand", "ReverseIpTagMultiCastSource",

diff --git a/spinn_front_end_common/utility_models/chip_power_monitor.py b/spinn_front_end_common/utility_models/chip_power_monitor.py
diff --git a/spinn_front_end_common/utility_models/data_speed_up_packet_gatherer.py b/spinn_front_end_common/utility_models/data_speed_up_packet_gatherer.py
diff --git a/spinn_front_end_common/utility_models/data_speed_up_packet_gatherer_machine_vertex.py b/spinn_front_end_common/utility_models/data_speed_up_packet_gatherer_machine_vertex.py
@@ -394,6 +394,7 @@ def generate_data_specification(self, spec, placement):
         # write the broad cast keys for timeouts
         router_timeout_key = (
             FecDataView.get_system_multicast_router_timeout_keys())
+        # pylint: disable=unsubscriptable-object
         reinjection_base_key = router_timeout_key[(placement.x, placement.y)]
         spec.write_value(reinjection_base_key)
 
@@ -1147,6 +1148,7 @@ def _determine_which_routers_were_used(placement):
         """
         routers = [(placement.x, placement.y)]
         fixed_routes = FecDataView.get_fixed_routes()
+        # pylint: disable=unsubscriptable-object
         entry = fixed_routes[placement.x, placement.y]
         chip_x = placement.x
         chip_y = placement.y