From 06586000d0a9e8f5cc8f0f65b5688c90c3a4986f Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Sun, 12 Oct 2025 10:50:48 +0100 Subject: [PATCH 1/3] get machine from simulation not view --- .../test_only_cores_recorded/test_only_core_recording.py | 2 +- spynnaker_integration_tests/test_many_boards/many_boards.py | 2 +- spynnaker_integration_tests/test_various/test_get_machine.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spynnaker_integration_tests/test_iobuf/test_only_cores_recorded/test_only_core_recording.py b/spynnaker_integration_tests/test_iobuf/test_only_cores_recorded/test_only_core_recording.py index 9bf393cd91b..18f8cd27967 100644 --- a/spynnaker_integration_tests/test_iobuf/test_only_cores_recorded/test_only_core_recording.py +++ b/spynnaker_integration_tests/test_iobuf/test_only_cores_recorded/test_only_core_recording.py @@ -23,7 +23,7 @@ def do_run(self) -> None: sim.setup(timestep=1.0, n_boards_required=1) sim.set_number_of_neurons_per_core(sim.IF_curr_exp, 100) - machine = SpynnakerDataView.get_machine() + machine = sim.get_machine() input1 = sim.Population( 1, sim.SpikeSourceArray(spike_times=[0]), label="input1") input2 = sim.Population( diff --git a/spynnaker_integration_tests/test_many_boards/many_boards.py b/spynnaker_integration_tests/test_many_boards/many_boards.py index 34f10abd433..55a81b803e0 100644 --- a/spynnaker_integration_tests/test_many_boards/many_boards.py +++ b/spynnaker_integration_tests/test_many_boards/many_boards.py @@ -60,7 +60,7 @@ def setup(self) -> None: for i, chip in enumerate(machine.ethernet_connected_chips): if i >= self.n_boards: break - version = SpynnakerDataView.get_machine_version() + version = sim.get_machine_version() offset = version.expected_xys[i % 48] x = chip.x + offset[0] y = chip.y + offset[1] diff --git a/spynnaker_integration_tests/test_various/test_get_machine.py b/spynnaker_integration_tests/test_various/test_get_machine.py index 1f1cb381a1a..e480e575ba4 100644 --- a/spynnaker_integration_tests/test_various/test_get_machine.py +++ b/spynnaker_integration_tests/test_various/test_get_machine.py @@ -55,7 +55,7 @@ def do_run(self) -> None: sim.run(3) self.assertFalse(MachineDataModel._user_accessed_machine, "run 3") # Normal detected get machine - machine = SpynnakerDataView.get_machine() + machine = sim.get_machine() self.assertEqual(id(machine), id(machine1), "run 3") self.assertTrue(MachineDataModel._user_accessed_machine, "run 3 get") @@ -125,7 +125,7 @@ def do_run(self) -> None: sim.run(8) # Normal detected get machine - machine = SpynnakerDataView.get_machine() + machine = sim.get_machine() self.assertEqual(id(machine), id(machine4), "run 8") sim.end() From 6bcb5b02ec5d16bb22759378234449c9d515938f Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Sun, 12 Oct 2025 16:25:30 +0100 Subject: [PATCH 2/3] View.get_machine_version() --- spynnaker_integration_tests/test_many_boards/many_boards.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spynnaker_integration_tests/test_many_boards/many_boards.py b/spynnaker_integration_tests/test_many_boards/many_boards.py index 55a81b803e0..34f10abd433 100644 --- a/spynnaker_integration_tests/test_many_boards/many_boards.py +++ b/spynnaker_integration_tests/test_many_boards/many_boards.py @@ -60,7 +60,7 @@ def setup(self) -> None: for i, chip in enumerate(machine.ethernet_connected_chips): if i >= self.n_boards: break - version = sim.get_machine_version() + version = SpynnakerDataView.get_machine_version() offset = version.expected_xys[i % 48] x = chip.x + offset[0] y = chip.y + offset[1] From 76d2e16d0f10e4b0933ff61dab48dd604765d408 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Sun, 12 Oct 2025 16:26:07 +0100 Subject: [PATCH 3/3] flake8 --- .../test_only_cores_recorded/test_only_core_recording.py | 1 - 1 file changed, 1 deletion(-) diff --git a/spynnaker_integration_tests/test_iobuf/test_only_cores_recorded/test_only_core_recording.py b/spynnaker_integration_tests/test_iobuf/test_only_cores_recorded/test_only_core_recording.py index 18f8cd27967..2d3d0334233 100644 --- a/spynnaker_integration_tests/test_iobuf/test_only_cores_recorded/test_only_core_recording.py +++ b/spynnaker_integration_tests/test_iobuf/test_only_cores_recorded/test_only_core_recording.py @@ -14,7 +14,6 @@ import pyNN.spiNNaker as sim from spinnaker_testbase import BaseTestCase -from spynnaker.pyNN.data import SpynnakerDataView class TestOnlyCoresRecording(BaseTestCase):