diff --git a/spinn_machine/version/version_248.py b/spinn_machine/version/version_248.py index 1a745399..88abe5e1 100644 --- a/spinn_machine/version/version_248.py +++ b/spinn_machine/version/version_248.py @@ -12,17 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -from typing import Final, List, Mapping, Optional, Sequence, Tuple +from typing import Final, List, Mapping, Tuple -from spinn_utilities.abstract_base import AbstractBase from spinn_utilities.typing.coords import XY from spinn_utilities.overrides import overrides -from spinn_machine.exceptions import SpinnMachineException -from spinn_machine.no_wrap_machine import NoWrapMachine -from spinn_machine.machine import Machine -from spinn_machine import SpiNNakerTriadGeometry - from .version_48_chips import Version48Chips from .version_factory import SPIN2_48CHIP from .version_spin2 import VersionSpin2 @@ -41,6 +35,7 @@ (7, 5): 152, (7, 6): 152, (7, 7): 152 } + class Version248(VersionSpin2, Version48Chips): # pylint: disable=abstract-method """ diff --git a/spinn_machine/version/version_48_chips.py b/spinn_machine/version/version_48_chips.py index d2978479..ee214507 100644 --- a/spinn_machine/version/version_48_chips.py +++ b/spinn_machine/version/version_48_chips.py @@ -38,7 +38,6 @@ class Version48Chips(AbstractVersion): def board_shape(self) -> Tuple[int, int]: return (8, 8) - @overrides(AbstractVersion.get_potential_ethernet_chips) def get_potential_ethernet_chips( self, width: int, height: int) -> Sequence[XY]: diff --git a/spinn_machine/version/version_spin2.py b/spinn_machine/version/version_spin2.py index f14488dd..627d4cb8 100644 --- a/spinn_machine/version/version_spin2.py +++ b/spinn_machine/version/version_spin2.py @@ -12,16 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -from typing import Final, List, Mapping, Optional, Sequence, Tuple +from typing import Final, List from spinn_utilities.abstract_base import AbstractBase -from spinn_utilities.typing.coords import XY from spinn_utilities.overrides import overrides -from spinn_machine.exceptions import SpinnMachineException -from spinn_machine.no_wrap_machine import NoWrapMachine -from spinn_machine.machine import Machine - from .abstract_version import AbstractVersion CHIPS_PER_BOARD: Final = {(0, 0): 152} diff --git a/unittests/test_virtual_machine248.py b/unittests/test_virtual_machine248.py index 77da07ef..4bb4498c 100644 --- a/unittests/test_virtual_machine248.py +++ b/unittests/test_virtual_machine248.py @@ -17,14 +17,9 @@ from spinn_machine import virtual_machine from spinn_machine.config_setup import unittest_setup -from spinn_machine.data import MachineDataView from spinn_machine.exceptions import SpinnMachineException -from spinn_machine.link_data_objects import SpinnakerLinkData from spinn_machine.version import SPIN2_48CHIP from spinn_machine.version.version_248 import CHIPS_PER_BOARD -from spinn_machine.virtual_machine import ( - virtual_machine_by_boards, virtual_machine_by_chips, - virtual_machine_by_cores, virtual_machine_by_min_size) class TestVirtualMachine248(unittest.TestCase): @@ -88,13 +83,13 @@ def test_version_5_8_by_8(self): count = sum(_chip.n_processors for _chip in vm.chips) # TODO check this is correct self.assertEqual(count, 7283) + # TODO LINKS + """ spinnaker_links = (list(vm.spinnaker_links)) expected = [] sp = SpinnakerLinkData(0, 0, 0, 4, '127.0.0.0') expected.append((('127.0.0.0', 0), sp)) expected.append((((0, 0), 0), sp)) - # TODO LINKS - """ self.assertEqual(expected, spinnaker_links) # 8 links on each of the 6 sides recorded 3 times # Except for the Ethernet Chip's 3 links which are only recorded twice @@ -324,5 +319,6 @@ def test_fpga_links_3_board(self): self._assert_fpga_link(machine, fpga, fpga_link, x, y, link, ip) """ + if __name__ == '__main__': unittest.main() diff --git a/unittests/test_virtual_machine5.py b/unittests/test_virtual_machine5.py index d1bc5f58..9dad23c1 100644 --- a/unittests/test_virtual_machine5.py +++ b/unittests/test_virtual_machine5.py @@ -17,13 +17,9 @@ from spinn_machine import virtual_machine from spinn_machine.config_setup import unittest_setup -from spinn_machine.data import MachineDataView from spinn_machine.link_data_objects import SpinnakerLinkData from spinn_machine.version import FIVE from spinn_machine.version.version_5 import CHIPS_PER_BOARD -from spinn_machine.virtual_machine import ( - virtual_machine_by_boards, virtual_machine_by_chips, - virtual_machine_by_cores, virtual_machine_by_min_size) class TestVirtualMachine5(unittest.TestCase): diff --git a/unittests/test_virtual_machine_48chips.py b/unittests/test_virtual_machine_48chips.py index f0841bf5..85a0009a 100644 --- a/unittests/test_virtual_machine_48chips.py +++ b/unittests/test_virtual_machine_48chips.py @@ -19,7 +19,6 @@ from spinn_machine.config_setup import unittest_setup from spinn_machine.data import MachineDataView from spinn_machine.exceptions import SpinnMachineException -from spinn_machine.link_data_objects import SpinnakerLinkData from spinn_machine.version.version_strings import VersionStrings from spinn_machine.virtual_machine import ( virtual_machine_by_boards, virtual_machine_by_chips,