From 8ea75c8277c1e7f829533fa92a2e056f28513920 Mon Sep 17 00:00:00 2001 From: Andrew Rowley Date: Thu, 10 Oct 2024 13:29:14 +0100 Subject: [PATCH] Fix ReverseIPTagMulticastSource usage --- .../pyNN/models/spike_source/spike_source_array_vertex.py | 4 +--- .../utility_models/spike_injector/spike_injector_vertex.py | 7 ++----- spynnaker/pyNN/spynnaker_external_device_plugin_manager.py | 3 +-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/spynnaker/pyNN/models/spike_source/spike_source_array_vertex.py b/spynnaker/pyNN/models/spike_source/spike_source_array_vertex.py index cbc10da99b..22f78770a0 100644 --- a/spynnaker/pyNN/models/spike_source/spike_source_array_vertex.py +++ b/spynnaker/pyNN/models/spike_source/spike_source_array_vertex.py @@ -115,8 +115,7 @@ def __init__( max_atoms_per_core: Union[int, Tuple[int, ...]], model: SpikeSourceArray, splitter: Optional[AbstractSplitterCommon], - n_colour_bits: Optional[int], - partition_id: str): + n_colour_bits: Optional[int]): # pylint: disable=too-many-arguments self.__model_name = "SpikeSourceArray" self.__model = model @@ -134,7 +133,6 @@ def __init__( n_keys=n_neurons, label=label, max_atoms_per_core=max_atoms_per_core, send_buffer_times=_send_buffer_times(spike_times, time_step), - send_buffer_partition_id=partition_id, splitter=splitter) self._check_spike_density(spike_times) diff --git a/spynnaker/pyNN/models/utility_models/spike_injector/spike_injector_vertex.py b/spynnaker/pyNN/models/utility_models/spike_injector/spike_injector_vertex.py index 7e3f1ed9fe..e82b57e589 100644 --- a/spynnaker/pyNN/models/utility_models/spike_injector/spike_injector_vertex.py +++ b/spynnaker/pyNN/models/utility_models/spike_injector/spike_injector_vertex.py @@ -45,8 +45,7 @@ class SpikeInjectorVertex( "__structure") default_parameters = { - 'label': "spikeInjector", 'port': None, 'virtual_key': None, - 'partition_id': SPIKE_PARTITION_ID} + 'label': "spikeInjector", 'port': None, 'virtual_key': None} SPIKE_RECORDING_REGION_ID = 0 @@ -56,14 +55,12 @@ def __init__( reserve_reverse_ip_tag: bool, splitter: Optional[AbstractSplitterCommon], max_atoms_per_core: Optional[ - Union[int, Tuple[int, ...]]] = sys.maxsize, - partition_id: str = SPIKE_PARTITION_ID): + Union[int, Tuple[int, ...]]] = sys.maxsize): # pylint: disable=too-many-arguments super().__init__( n_keys=n_neurons, label=label, receive_port=port, virtual_key=virtual_key, reserve_reverse_ip_tag=reserve_reverse_ip_tag, - injection_partition_id=partition_id, splitter=splitter, max_atoms_per_core=max_atoms_per_core) # Set up for recording diff --git a/spynnaker/pyNN/spynnaker_external_device_plugin_manager.py b/spynnaker/pyNN/spynnaker_external_device_plugin_manager.py index e4624955f3..2618872f4f 100644 --- a/spynnaker/pyNN/spynnaker_external_device_plugin_manager.py +++ b/spynnaker/pyNN/spynnaker_external_device_plugin_manager.py @@ -272,8 +272,7 @@ def add_poisson_live_rate_control( controller = ReverseIpTagMultiCastSource( n_keys=vertex.n_atoms, label=control_label, receive_port=receive_port, - reserve_reverse_ip_tag=reserve_reverse_ip_tag, - injection_partition_id=LIVE_POISSON_CONTROL_PARTITION_ID) + reserve_reverse_ip_tag=reserve_reverse_ip_tag) SpynnakerExternalDevicePluginManager.add_application_vertex(controller) edge = SpynnakerExternalDevicePluginManager.add_edge( controller, vertex, LIVE_POISSON_CONTROL_PARTITION_ID)