From f11e6d00369566326c42803f36a81e42d4654839 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Mon, 22 Apr 2024 15:52:09 +0100 Subject: [PATCH] mark tests as version Five as that is the boards the data came from --- .../test_checked_unordered_pair_compression.py | 5 +++-- .../test_ordered_covering_compression.py | 5 +++-- .../router_compressor_tests/test_pair_compression.py | 5 +++-- .../router_compressor_tests/test_range_compressor.py | 5 +++-- .../test_unordered_pair_compression.py | 5 +++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/unittests/operations_tests/router_compressor_tests/test_checked_unordered_pair_compression.py b/unittests/operations_tests/router_compressor_tests/test_checked_unordered_pair_compression.py index 17d8ba794..30f4fb944 100644 --- a/unittests/operations_tests/router_compressor_tests/test_checked_unordered_pair_compression.py +++ b/unittests/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 index 455fee7b9..096d7b55e 100644 --- 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 index 0b69868f3..8dcb8562d 100644 --- 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 index 7aabbf7eb..99a224a06 100644 --- 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 index 957286c13..5c8f28e13 100644 --- 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__