Merge pull request #1373 from SpiNNakerManchester/version

Version

spynnaker_integration_tests/test_many_boards/many_boards.py

@@ -15,6 +15,7 @@
 from unittest import SkipTest
 from spinn_utilities.config_holder import get_config_bool
 from spinn_front_end_common.interface.provenance import GlobalProvenance
+from spynnaker.pyNN.data import SpynnakerDataView
 from spynnaker.pyNN.exceptions import ConfigurationException
 import pyNN.spiNNaker as sim
 from spynnaker_integration_tests.scripts import check_data
@@ -56,7 +57,8 @@ def setup(self):
         for i, chip in enumerate(machine.ethernet_connected_chips):
             if i >= self.n_boards:
                 break
-            offset = machine.BOARD_48_CHIPS[i % 48]
+            version = SpynnakerDataView.get_machine_version()
+            offset = version.expected_xys[i % 48]
             x = chip.x + offset[0]
             y = chip.y + offset[1]
             # safety code in case there is a hole in the board

unittests/model_tests/neuron/test_synaptic_manager.py

@@ -19,7 +19,7 @@
 import pytest
 
 from spinn_utilities.overrides import overrides
-from spinn_utilities.config_holder import load_config, set_config
+from spinn_utilities.config_holder import set_config
 from spinnman.model import CPUInfo
 from spinnman.processes.get_cpu_info_process import _INFO_PATTERN
 from spinnman.transceiver import Transceiver
@@ -104,11 +104,11 @@ def say_false(self, weights, delays):
 
 def test_write_data_spec():
     unittest_setup()
+    set_config("Machine", "version", 5)
     writer = SpynnakerDataWriter.mock()
     # UGLY but the mock transceiver NEED generate_on_machine to be False
     AbstractGenerateConnectorOnMachine.generate_on_machine = say_false
 
-    load_config()
     set_config("Machine", "enable_advanced_monitor_support", "False")
     set_config("Java", "use_java", "False")
 
@@ -434,6 +434,7 @@ def test_pop_based_master_pop_table_standard(
         undelayed_indices_connected, delayed_indices_connected,
         n_pre_neurons, neurons_per_core, max_delay):
     unittest_setup()
+    set_config("Machine", "version", 5)
     writer = SpynnakerDataWriter.mock()
 
     # Build a from list connector with the delays we want

unittests/test_integration_using_virtual_board/spynnaker.cfg

@@ -2,9 +2,9 @@
 machine_spec_file = None
 width = 8
 height = 8
+version = 5
 virtual_board = True
 machineName = None
 spalloc_server  = None
 remote_spinnaker_url  = None
-version = None
 time_scale_factor = None

unittests/test_using_virtual_board/spynnaker.cfg

@@ -1,9 +1,9 @@
 [Machine]
 width = 8
 height = 8
+version = 5
 virtual_board = True
 machineName = None
 spalloc_server  = None
 remote_spinnaker_url  = None
-version = None
 time_scale_factor = None

unittests/test_using_virtual_board/test_debug_mode/spynnaker.cfg

@@ -1,11 +1,11 @@
 [Machine]
 width = 8
 height = 8
+version = 5
 virtual_board = True
 machineName = None
 spalloc_server  = None
 remote_spinnaker_url  = None
-version = None
 time_scale_factor = None
 
 [Mode]

unittests/test_using_virtual_board/test_do_not_allow_violate/spynnaker.cfg

@@ -2,6 +2,7 @@
 machine_spec_file = None
 width = 8
 height = 8
+version = 5
 virtual_board = True
 machineName = None
 spalloc_server  = None

unittests/test_virtual_board_no_vertices_supported/spynnaker.cfg

@@ -2,6 +2,7 @@
 virtual_board = True
 width = 8
 height = 8
+version = 5
 machine_name = None
 remote_spinnaker_url = None
 spalloc_server = None