From 1f70362952af62a2c6abdc0f8355b795afc23a76 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 2 Apr 2024 14:53:07 +0100 Subject: [PATCH] move v_to_p_map from Chip to DataView --- spinnman/messages/sdp/sdp_header.py | 10 +++------- spinnman/processes/get_machine_process.py | 5 ++--- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/spinnman/messages/sdp/sdp_header.py b/spinnman/messages/sdp/sdp_header.py index 98523a341..370e1ab81 100644 --- a/spinnman/messages/sdp/sdp_header.py +++ b/spinnman/messages/sdp/sdp_header.py @@ -330,13 +330,9 @@ def get_physical_cpu_id(self) -> str: :rtype: str """ - if SpiNNManDataView.has_machine(): - chip = SpiNNManDataView.get_machine().get_chip_at( - self._destination_chip_x, self._destination_chip_y) - if chip is not None: - return chip.get_physical_core_string( - self._destination_cpu) - return "" + return SpiNNManDataView.get_physical_core_string( + self._destination_chip_x, self._destination_chip_y, + self._destination_cpu) def update_for_send(self, source_x: int, source_y: int): """ diff --git a/spinnman/processes/get_machine_process.py b/spinnman/processes/get_machine_process.py index 7df2ab18d..fee4fe108 100644 --- a/spinnman/processes/get_machine_process.py +++ b/spinnman/processes/get_machine_process.py @@ -144,9 +144,7 @@ def _make_chip(self, chip_info: ChipSummaryInfo, machine: Machine) -> Chip: ip_address=chip_info.ethernet_ip_address, nearest_ethernet_x=chip_info.nearest_ethernet_x, nearest_ethernet_y=chip_info.nearest_ethernet_y, - down_cores=down_cores, parent_link=chip_info.parent_link, - v_to_p_map=self._virtual_to_physical_map.get( - (chip_info.x, chip_info.y))) + down_cores=down_cores, parent_link=chip_info.parent_link) def _make_router( self, chip_info: ChipSummaryInfo, machine: Machine) -> Router: @@ -255,6 +253,7 @@ def get_machine_details( ReadMemory((x, y, 0), P_TO_V_ADDR, P_MAPS_SIZE), functools.partial(self._receive_p_maps, x, y)) self._progress.end() + SpiNNManDataView.set_v_to_p_map(self._virtual_to_physical_map) # Warn about unexpected missing chips for (x, y) in p2p_table.iterchips():