Skip to content

Commit

Permalink
Merge branch 'master' into pylint_default
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian-B authored May 2, 2024
2 parents c9c8a8a + 7a9e289 commit 89e0d70
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/c_actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python_actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ __pycache__
**/modified_src/
**/Debug/
*.dict
/.mypy_cache/
2 changes: 0 additions & 2 deletions gfe_examples/live_io/live_io.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion spinnaker_graph_front_end/utilities/simulator_vertex.py
Original file line number Diff line number Diff line change
Expand Up @@ -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; "
Expand Down
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 89e0d70

Please sign in to comment.