merged in master

SpiNNakerManchester · May 1, 2024 · 36d0180 · 36d0180
2 parents 5af5025 + 94fff93
commit 36d0180
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 22 deletions.
diff --git a/unittests/operations_tests/placer_algorithms_tests/test_application_placer.py b/unittests/operations_tests/placer_algorithms_tests/test_application_placer.py
@@ -94,7 +94,7 @@ def _make_vertices(
 
 def test_application_placer():
     unittest_setup()
-    set_config("Machine", "versions", VersionStrings.MULTIPLE_BOARDS.text)
+    set_config("Machine", "versions", VersionStrings.BIG.text)
     writer = PacmanDataWriter.mock()
     # fixed early works as this vertex is looked at first
     fixed = SimpleTestVertex(10, "FIXED", max_atoms_per_core=1)
@@ -112,7 +112,7 @@ def test_application_placer():
 
 def test_application_placer_large_groups():
     unittest_setup()
-    set_config("Machine", "versions", VersionStrings.MULTIPLE_BOARDS.text)
+    set_config("Machine", "versions", VersionStrings.BIG.text)
     writer = PacmanDataWriter.mock()
     version = writer.get_machine_version()
     # fixed early works as this vertex is looked at first
@@ -133,16 +133,18 @@ def test_application_placer_large_groups():
 
 def test_application_placer_too_few_boards():
     unittest_setup()
-    set_config("Machine", "versions", VersionStrings.MULTIPLE_BOARDS.text)
+    set_config("Machine", "versions", VersionStrings.BIG.text)
     writer = PacmanDataWriter.mock()
     # fixed early works as this vertex is looked at first
     fixed = SimpleTestVertex(10, "FIXED", max_atoms_per_core=1)
     fixed.splitter = SplitterFixedLegacy()
     fixed.set_fixed_location(0, 0)
     writer.add_vertex(fixed)
+    version = writer.get_machine_version()
+    n_machine_vertices = version.max_cores_per_chip - 2
     fixed.splitter.create_machine_vertices(ChipCounter())
     for i in range(56):
-        _make_vertices(writer, 1000, 14, 5, f"app_vertex_{i}")
+        _make_vertices(writer, 1000, 14, n_machine_vertices, f"app_vertex_{i}")
     # intentionally too small
     writer.set_machine(virtual_machine_by_cores(
         n_cores=writer.get_n_machine_vertices() / 2))
@@ -155,7 +157,7 @@ def test_application_placer_too_few_boards():
 
 def test_application_placer_restart_needed():
     unittest_setup()
-    set_config("Machine", "versions", VersionStrings.MULTIPLE_BOARDS.text)
+    set_config("Machine", "versions", VersionStrings.BIG.text)
     writer = PacmanDataWriter.mock()
     for (x, y) in [(1, 0), (1, 1), (0, 1)]:
         fixed = SimpleTestVertex(15, f"FIXED {x}:{y}", max_atoms_per_core=1)
@@ -173,7 +175,7 @@ def test_application_placer_restart_needed():
 
 def test_application_placer_late_fixed():
     unittest_setup()
-    set_config("Machine", "versions", VersionStrings.MULTIPLE_BOARDS.text)
+    set_config("Machine", "versions", VersionStrings.BIG.text)
     writer = PacmanDataWriter.mock()
     for i in range(56):
         _make_vertices(writer, 1000, 14, 5, f"app_vertex_{i}")
@@ -191,7 +193,7 @@ def test_application_placer_late_fixed():
 
 def test_application_placer_fill_chips():
     unittest_setup()
-    set_config("Machine", "versions", VersionStrings.MULTIPLE_BOARDS.text)
+    set_config("Machine", "versions", VersionStrings.BIG.text)
     writer = PacmanDataWriter.mock()
     # fixed early works as this vertex is looked at first
     fixed = SimpleTestVertex(10, "FIXED", max_atoms_per_core=1)

diff --git a/unittests/operations_tests/router_algorithms_tests/test_routers.py b/unittests/operations_tests/router_algorithms_tests/test_routers.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 from spinn_utilities.timer import Timer
 from spinn_utilities.config_holder import set_config
+from spinn_machine.version import FIVE
 from spinn_machine.version.version_strings import VersionStrings
 from spinn_machine.virtual_machine import (
     virtual_machine_by_boards, virtual_machine_by_cores)
@@ -625,7 +626,7 @@ def test_internal_only(params):
 def test_internal_and_split(params):
     algorithm, n_vertices, n_m_vertices = params
     unittest_setup()
-    set_config("Machine", "versions", VersionStrings.MULTIPLE_BOARDS.text)
+    set_config("Machine", "versions", VersionStrings.BIG.text)
     writer = PacmanDataWriter.mock()
     for i in range(n_vertices):
         _make_vertices_split(
@@ -646,7 +647,8 @@ def test_internal_and_split(params):
 def test_spinnaker_link(params):
     algorithm, n_vertices, n_m_vertices = params
     unittest_setup()
-    set_config("Machine", "versions", VersionStrings.BIG.text)
+    # TODO SPIN2 spinnaker links
+    set_config("Machine", "version", FIVE)
     writer = PacmanDataWriter.mock()
     in_device = ApplicationSpiNNakerLinkVertex(100, 0)
     in_device.splitter = SplitterExternalDevice()
@@ -670,7 +672,8 @@ def test_spinnaker_link(params):
 def test_fpga_link(params):
     algorithm, n_vertices, n_m_vertices = params
     unittest_setup()
-    set_config("Machine", "versions", VersionStrings.BIG.text)
+    # TODO spin2 fpga
+    set_config("Machine", "version", 5)
     writer = PacmanDataWriter.mock()
     in_device = ApplicationFPGAVertex(
         100, [FPGAConnection(0, 0, None, None)], None)
@@ -697,7 +700,8 @@ def test_fpga_link(params):
 def test_fpga_link_overlap(params):
     algorithm, _n_vertices, _n_m_vertices = params
     unittest_setup()
-    set_config("Machine", "versions", VersionStrings.BIG.text)
+    # TODO Spin2 links
+    set_config("Machine", "version", 5)
     writer = PacmanDataWriter.mock()
     set_config("Machine", "down_chips", "6,1")
     in_device = ApplicationFPGAVertex(

diff --git a/...tests/operations_tests/router_compressor_tests/test_checked_unordered_pair_compression.py b/...tests/operations_tests/router_compressor_tests/test_checked_unordered_pair_compression.py
@@ -18,7 +18,7 @@
 
 from spinn_utilities.config_holder import set_config
 from spinn_machine import virtual_machine
-from spinn_machine.version.version_strings import VersionStrings
+from spinn_machine.version import FIVE
 from pacman.config_setup import unittest_setup
 from pacman.data.pacman_data_writer import PacmanDataWriter
 from pacman.model.routing_tables.multicast_routing_tables import (from_json)
@@ -31,7 +31,8 @@ class TestUnorderedPairCompressor(unittest.TestCase):
 
     def setUp(self):
         unittest_setup()
-        set_config("Machine", "versions", VersionStrings.WRAPPABLE.text)
+        # This tests needs exactly version 5 as on Spin2 it would fit
+        set_config("Machine", "version", FIVE)
 
     def test_onordered_pair_big(self):
 

diff --git a/unittests/operations_tests/router_compressor_tests/test_ordered_covering_compression.py b/unittests/operations_tests/router_compressor_tests/test_ordered_covering_compression.py
@@ -18,7 +18,7 @@
 
 from spinn_utilities.config_holder import set_config
 from spinn_machine import virtual_machine
-from spinn_machine.version.version_strings import VersionStrings
+from spinn_machine.version import FIVE
 from pacman.config_setup import unittest_setup
 from pacman.data.pacman_data_writer import PacmanDataWriter
 from pacman.model.routing_tables.multicast_routing_tables import (from_json)
@@ -32,7 +32,8 @@ class TestOrderedCoveringCompressor(unittest.TestCase):
 
     def setUp(self):
         unittest_setup()
-        set_config("Machine", "versions", VersionStrings.WRAPPABLE.text)
+        # tests against version 5 as Spin2 would not need compression
+        set_config("Machine", "version", FIVE)
 
     def test_oc_big(self):
         class_file = sys.modules[self.__module__].__file__

diff --git a/unittests/operations_tests/router_compressor_tests/test_pair_compression.py b/unittests/operations_tests/router_compressor_tests/test_pair_compression.py
@@ -18,7 +18,7 @@
 
 from spinn_utilities.config_holder import set_config
 from spinn_machine import virtual_machine
-from spinn_machine.version.version_strings import VersionStrings
+from spinn_machine.version import FIVE
 from pacman.config_setup import unittest_setup
 from pacman.data.pacman_data_writer import PacmanDataWriter
 from pacman.model.routing_tables.multicast_routing_tables import (from_json)
@@ -31,7 +31,8 @@ class TestPairCompressor(unittest.TestCase):
 
     def setUp(self):
         unittest_setup()
-        set_config("Machine", "versions", VersionStrings.WRAPPABLE.text)
+        # tests against version 5 as Spin2 would not need compression
+        set_config("Machine", "version", FIVE)
 
     def do_pair_big(self, c_sort):
         class_file = sys.modules[self.__module__].__file__

diff --git a/unittests/operations_tests/router_compressor_tests/test_range_compressor.py b/unittests/operations_tests/router_compressor_tests/test_range_compressor.py
@@ -16,7 +16,7 @@
 import sys
 import unittest
 from spinn_utilities.config_holder import set_config
-from spinn_machine.version.version_strings import VersionStrings
+from spinn_machine.version import FIVE
 from pacman.config_setup import unittest_setup
 from pacman.data.pacman_data_writer import PacmanDataWriter
 from pacman.model.routing_tables import MulticastRoutingTables
@@ -32,7 +32,8 @@ class TestRangeCompressor(unittest.TestCase):
 
     def setUp(self):
         unittest_setup()
-        set_config("Machine", "versions", VersionStrings.WRAPPABLE.text)
+        # tests against version 5 as Spin2 would not need compression
+        set_config("Machine", "version", FIVE)
         set_config(
             "Mapping", "router_table_compress_as_far_as_possible", True)
 

diff --git a/unittests/operations_tests/router_compressor_tests/test_unordered_pair_compression.py b/unittests/operations_tests/router_compressor_tests/test_unordered_pair_compression.py
@@ -18,7 +18,7 @@
 
 from spinn_utilities.config_holder import set_config
 from spinn_machine import virtual_machine
-from spinn_machine.version.version_strings import VersionStrings
+from spinn_machine.version import FIVE
 from pacman.config_setup import unittest_setup
 from pacman.data.pacman_data_writer import PacmanDataWriter
 from pacman.model.routing_tables.multicast_routing_tables import (from_json)
@@ -32,7 +32,8 @@ class TestUnorderedPairCompressor(unittest.TestCase):
 
     def setUp(self):
         unittest_setup()
-        set_config("Machine", "versions", VersionStrings.WRAPPABLE.text)
+        # tests against version 5 as Spin2 would not need compression
+        set_config("Machine", "version", FIVE)
 
     def test_onordered_pair_big(self):
         class_file = sys.modules[self.__module__].__file__

diff --git a/unittests/operations_tests/tag_allocator_tests/test_tags_board_addresses.py b/unittests/operations_tests/tag_allocator_tests/test_tags_board_addresses.py
@@ -33,7 +33,7 @@ class TestTagsBoardAddresses(unittest.TestCase):
     """
     def setUp(self):
         unittest_setup()
-        set_config("Machine", "versions", VersionStrings.MULTIPLE_BOARDS.text)
+        set_config("Machine", "versions", VersionStrings.BIG.text)
 
     def test_ip_tags(self):
         writer = PacmanDataWriter.mock()