Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stop ResourceTracker from looking at the Whole Machine #1098

Merged
merged 8 commits into from
Aug 26, 2021
Merged

Stop ResourceTracker from looking at the Whole Machine #1098

Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
13b0ec1
LivePacketGatherParameters no longer support board_address
Christian-B Jun 16, 2021
778f8aa
merged in master
Christian-B Jun 17, 2021
07f48e0
merged in master
Christian-B Jun 21, 2021
8772ff5
Merge remote-tracking branch 'origin/no_memory' into pre_allocator2
Christian-B Jul 1, 2021
11a22a1
merged in master
Christian-B Jul 2, 2021
54f11eb
merged in master
Christian-B Jul 7, 2021
9a4394b
merged in master
Christian-B Jul 8, 2021
cfa2b7c
Merge branch 'master' into pre_allocator2
rowleya Aug 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions spynnaker/pyNN/spynnaker_external_device_plugin_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,8 @@ def add_database_socket_address(
def activate_live_output_for(
population, database_notify_host=None,
database_notify_port_num=None,
database_ack_port_num=None, board_address=None, port=None,
host=None, tag=None, strip_sdp=True, use_prefix=False,
key_prefix=None,
database_ack_port_num=None, port=None, host=None, tag=None,
strip_sdp=True, use_prefix=False, key_prefix=None,
prefix_type=None, message_type=EIEIOType.KEY_32_BIT,
right_shift=0, payload_as_time_stamps=True, notify=True,
use_payload_prefix=True, payload_prefix=None,
Expand All @@ -95,9 +94,6 @@ def activate_live_output_for(
:param int database_notify_port_num:
The port number to which a external device will receive the
database is ready command
:param str board_address:
A fixed board address required for the tag, or None if any
address is OK
:param key_prefix: the prefix to be applied to the key
:type key_prefix: int or None
:param ~spinnman.messages.eieio.EIEIOPrefix prefix_type:
Expand Down Expand Up @@ -145,10 +141,10 @@ def activate_live_output_for(

# add new edge and vertex if required to SpiNNaker graph
SpynnakerExternalDevicePluginManager.update_live_packet_gather_tracker(
population._vertex, "LiveSpikeReceiver", port, host, board_address,
tag, strip_sdp, use_prefix, key_prefix, prefix_type,
message_type, right_shift, payload_as_time_stamps,
use_payload_prefix, payload_prefix, payload_right_shift,
population._vertex, "LiveSpikeReceiver", port, host, tag,
strip_sdp, use_prefix, key_prefix, prefix_type, message_type,
right_shift, payload_as_time_stamps, use_payload_prefix,
payload_prefix, payload_right_shift,
number_of_packets_sent_per_time_step,
partition_ids=[SPIKE_PARTITION_ID])

Expand Down Expand Up @@ -194,9 +190,8 @@ def add_socket_address(socket_address):
@staticmethod
def update_live_packet_gather_tracker(
vertex_to_record_from, lpg_label, port=None, hostname=None,
board_address=None, tag=None, strip_sdp=True, use_prefix=False,
key_prefix=None, prefix_type=None,
message_type=EIEIOType.KEY_32_BIT,
tag=None, strip_sdp=True, use_prefix=False, key_prefix=None,
prefix_type=None, message_type=EIEIOType.KEY_32_BIT,
right_shift=0, payload_as_time_stamps=True,
use_payload_prefix=True, payload_prefix=None,
payload_right_shift=0, number_of_packets_sent_per_time_step=0,
Expand All @@ -212,7 +207,6 @@ def update_live_packet_gather_tracker(
:param str lpg_label:
:param int port:
:param str hostname:
:param str board_address:
:param int tag:
:param bool strip_sdp:
:param bool use_prefix:
Expand All @@ -229,8 +223,8 @@ def update_live_packet_gather_tracker(
"""
# pylint: disable=too-many-arguments, too-many-locals
params = LivePacketGatherParameters(
port=port, hostname=hostname, tag=tag, board_address=board_address,
strip_sdp=strip_sdp, use_prefix=use_prefix, key_prefix=key_prefix,
port=port, hostname=hostname, tag=tag, strip_sdp=strip_sdp,
use_prefix=use_prefix, key_prefix=key_prefix,
prefix_type=prefix_type, message_type=message_type,
right_shift=right_shift, payload_prefix=payload_prefix,
payload_as_time_stamps=payload_as_time_stamps,
Expand Down