Merge pull request #1596 from SpiNNakerManchester/spalloc_allocate_job_old

get machine from simulation not view

Author: Christian-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):
@@ -23,7 +22,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(

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()