diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index c59de60a..907b5483 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -31,7 +31,7 @@ jobs: with: packages: doxygen gcc-arm-none-eabi - name: Set up Python 3.12 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.12 - name: Checkout SpiNNaker Dependencies diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index 71096bbe..6a9974c1 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -37,7 +37,7 @@ jobs: path: support - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install pip, etc @@ -98,7 +98,7 @@ jobs: path: support - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install pip, etc diff --git a/.gitignore b/.gitignore index 94473b00..9eb3ea46 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ __pycache__ **/modified_src/ **/Debug/ *.dict +/.mypy_cache/ diff --git a/gfe_examples/live_io/live_io.py b/gfe_examples/live_io/live_io.py index 1ec45f39..00a22d52 100644 --- a/gfe_examples/live_io/live_io.py +++ b/gfe_examples/live_io/live_io.py @@ -16,7 +16,6 @@ from time import sleep from random import randint from pacman.model.graphs.machine.machine_edge import MachineEdge -from spinn_front_end_common.data.fec_data_view import FecDataView from spinn_front_end_common.utilities.connections import LiveEventConnection from spinn_front_end_common.utility_models import ( EIEIOParameters, LivePacketGatherMachineVertex, @@ -95,7 +94,6 @@ def receive(label, time, keys): front_end.add_machine_edge_instance( MachineEdge(vertex, live_out), sender_partition) live_out.add_incoming_source(vertex, sender_partition) - FecDataView.add_live_output_vertex(vertex, sender_partition) front_end.run(10000) diff --git a/spinnaker_graph_front_end/utilities/simulator_vertex.py b/spinnaker_graph_front_end/utilities/simulator_vertex.py index 1cc510e7..77fd14e6 100644 --- a/spinnaker_graph_front_end/utilities/simulator_vertex.py +++ b/spinnaker_graph_front_end/utilities/simulator_vertex.py @@ -47,7 +47,7 @@ def __init__(self, label, binary_name: str, vertex_slice=None): implements. :type vertex_slice: ~pacman.model.graphs.common.Slice or None """ - super().__init__(label) + super().__init__(label, vertex_slice=vertex_slice) self._binary_name = binary_name if not binary_name.lower().endswith(".aplx"): log.warning("APLX protocol used but name not matching; " diff --git a/unittests/test_using_virtual_board/spiNNakerGraphFrontEnd.cfg b/unittests/test_using_virtual_board/spiNNakerGraphFrontEnd.cfg index 49308cef..fa2d67a8 100644 --- a/unittests/test_using_virtual_board/spiNNakerGraphFrontEnd.cfg +++ b/unittests/test_using_virtual_board/spiNNakerGraphFrontEnd.cfg @@ -1,9 +1,7 @@ [Machine] -width = 8 -height = 8 virtual_board = True machineName = None spalloc_server = None remote_spinnaker_url = None -version = None +version = 5 time_scale_factor = None