Skip to content

Commit 0823541

Browse files
authored
Merge pull request #1626 from SpiNNakerManchester/no_delaysupportadder_cfg
remove cfg [Mapping] delaysupportadder
2 parents 0616c8a + c52bac9 commit 0823541

2 files changed

Lines changed: 8 additions & 22 deletions

File tree

spynnaker/pyNN/spinnaker.py

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626

2727

2828
from spinn_utilities.log import FormatAdapter
29-
from spinn_utilities.config_holder import (
30-
get_config_bool, get_config_str_or_none)
29+
from spinn_utilities.config_holder import get_config_bool
3130
from spinn_utilities.overrides import overrides
3231

3332
from spinn_front_end_common.interface.abstract_spinnaker_base import (
@@ -36,7 +35,6 @@
3635
add_spinnaker_template)
3736
from spinn_front_end_common.interface.provenance import (
3837
FecTimer, GlobalProvenance, TimerCategory, TimerWork)
39-
from spinn_front_end_common.utilities.exceptions import ConfigurationException
4038

4139
from spynnaker import _version
4240
from spynnaker.pyNN import model_binaries
@@ -425,20 +423,15 @@ def _execute_splitter_selector(self) -> None:
425423
def _execute_delay_support_adder(self) -> None:
426424
"""
427425
Runs, times and logs the DelaySupportAdder if required.
426+
# Check for option removed Jan 2026
428427
"""
429-
name = get_config_str_or_none("Mapping", "delay_support_adder")
430-
if name is None:
431-
return
432428
with FecTimer("DelaySupportAdder", TimerWork.OTHER):
433-
if name == "DelaySupportAdder":
434-
d_vertices, d_edges = delay_support_adder()
435-
for vertex in d_vertices:
436-
self.__writer.add_vertex(vertex)
437-
for edge, partition_id in d_edges:
438-
self.__writer.add_edge(edge, partition_id)
439-
return
440-
raise ConfigurationException(
441-
f"Unexpected cfg setting delay_support_adder: {name}")
429+
d_vertices, d_edges = delay_support_adder()
430+
for vertex in d_vertices:
431+
self.__writer.add_vertex(vertex)
432+
for edge, partition_id in d_edges:
433+
self.__writer.add_edge(edge, partition_id)
434+
return
442435

443436
@overrides(AbstractSpinnakerBase.reset)
444437
def reset(self) -> None:

spynnaker/pyNN/spynnaker.cfg

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,6 @@ n_colour_bits = 4
6363
error_on_non_spynnaker_pynn = True
6464
@error_on_non_spynnaker_pynn = Whether to error or just warn on non-spynnaker-compatible PyNN
6565

66-
[Mapping]
67-
delay_support_adder = DelaySupportAdder
68-
@delay_support_adder = Algorthm for adding Delay verteices.</br>
69-
Currently supported options:
70-
* DelaySupportAdder: Adds the standard Delays Vertcies if needed
71-
* None: will skip the adder (Not Recommended) </br></br>
72-
7366
[Recording]
7467
@ = Section for the sending of live spikes.
7568

0 commit comments

Comments
 (0)