From 227f5df9272536312ab801d44379e8ab45d544f6 Mon Sep 17 00:00:00 2001 From: Andrew Rowley Date: Fri, 8 Dec 2023 11:15:02 +0000 Subject: [PATCH 1/7] Add a port --- spinnman/model/enums/sdp_ports.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spinnman/model/enums/sdp_ports.py b/spinnman/model/enums/sdp_ports.py index 078501dd7..12beb02b8 100644 --- a/spinnman/model/enums/sdp_ports.py +++ b/spinnman/model/enums/sdp_ports.py @@ -35,3 +35,5 @@ class SDP_PORTS(Enum): #: Extra monitor core inbound data transfer protocol #: See :py:class:`SpeedupInSCPCommands` EXTRA_MONITOR_CORE_DATA_IN_SPEED_UP = 6 + #: Extra monitor core data copy + EXTRA_MONITOR_CORE_COPY_DATA_IN = 7 From fe10262e0ad5e94071d219ed99e8f8f3616f5ddf Mon Sep 17 00:00:00 2001 From: Andrew Rowley Date: Mon, 22 Jul 2024 08:22:26 +0100 Subject: [PATCH 2/7] Add "return type" --- spinnman/utilities/locate_connected_machine_ip_address.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spinnman/utilities/locate_connected_machine_ip_address.py b/spinnman/utilities/locate_connected_machine_ip_address.py index eaa734033..fada9048e 100644 --- a/spinnman/utilities/locate_connected_machine_ip_address.py +++ b/spinnman/utilities/locate_connected_machine_ip_address.py @@ -20,7 +20,7 @@ from spinnman.connections.udp_packet_connections import IPAddressesConnection -def locate_connected_machine(handler: Callable[[str, float], None]): +def locate_connected_machine(handler: Callable[[str, float], None]) -> None: """ Locates any SpiNNaker machines IP addresses from the auto-transmitted packets from non-booted SpiNNaker machines. From d37ff21bfbaa26e7e758e9f2061748083257e7ed Mon Sep 17 00:00:00 2001 From: Andrew Rowley Date: Mon, 22 Jul 2024 08:38:29 +0100 Subject: [PATCH 3/7] Shouldn't be changing this! --- .github/workflows/python_actions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index de69522ee..ef36ddf42 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -27,5 +27,5 @@ jobs: coverage-package: spinnman flake8-packages: spinnman unittests spinnman_integration_tests pylint-packages: spinnman - mypy-packages: spinnman unittests spinnman_integration_tests - secrets: inherit \ No newline at end of file + mypy-packages: spinnman + secrets: inherit From 3be3641f08cd7a3c7212ce873296b063ad0dafff Mon Sep 17 00:00:00 2001 From: Andrew Rowley Date: Mon, 22 Jul 2024 08:43:48 +0100 Subject: [PATCH 4/7] Should match master almost exactly! --- pyproject.toml | 2 +- spinnman/model/enums/sdp_ports.py | 3 --- spinnman/utilities/locate_connected_machine_ip_address.py | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 730bf08ab..ad1abdeed 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,4 +17,4 @@ requires = ["setuptools"] build-backend = "setuptools.build_meta" [tool.mypy] -exclude = ["doc", "setup.py", "quick_tests"] +exclude = ["doc", "setup.py", "unittests", "quick_tests"] diff --git a/spinnman/model/enums/sdp_ports.py b/spinnman/model/enums/sdp_ports.py index ec47823f2..14fc7c62c 100644 --- a/spinnman/model/enums/sdp_ports.py +++ b/spinnman/model/enums/sdp_ports.py @@ -33,8 +33,5 @@ class SDP_PORTS(Enum): EXTRA_MONITOR_CORE_REINJECTION = 4 #: Extra monitor core outbound data transfer protocol EXTRA_MONITOR_CORE_DATA_SPEED_UP = 5 - #: Extra monitor core inbound data transfer protocol - #: See :py:class:`SpeedupInSCPCommands` - EXTRA_MONITOR_CORE_DATA_IN_SPEED_UP = 6 #: Extra monitor core data copy EXTRA_MONITOR_CORE_COPY_DATA_IN = 7 diff --git a/spinnman/utilities/locate_connected_machine_ip_address.py b/spinnman/utilities/locate_connected_machine_ip_address.py index fada9048e..eaa734033 100644 --- a/spinnman/utilities/locate_connected_machine_ip_address.py +++ b/spinnman/utilities/locate_connected_machine_ip_address.py @@ -20,7 +20,7 @@ from spinnman.connections.udp_packet_connections import IPAddressesConnection -def locate_connected_machine(handler: Callable[[str, float], None]) -> None: +def locate_connected_machine(handler: Callable[[str, float], None]): """ Locates any SpiNNaker machines IP addresses from the auto-transmitted packets from non-booted SpiNNaker machines. From 2d517e1e61e09a76b5598866f42aff23bd5a07cb Mon Sep 17 00:00:00 2001 From: Andrew Rowley Date: Mon, 22 Jul 2024 08:49:59 +0100 Subject: [PATCH 5/7] Need this still! --- spinnman/model/enums/sdp_ports.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spinnman/model/enums/sdp_ports.py b/spinnman/model/enums/sdp_ports.py index 14fc7c62c..ec47823f2 100644 --- a/spinnman/model/enums/sdp_ports.py +++ b/spinnman/model/enums/sdp_ports.py @@ -33,5 +33,8 @@ class SDP_PORTS(Enum): EXTRA_MONITOR_CORE_REINJECTION = 4 #: Extra monitor core outbound data transfer protocol EXTRA_MONITOR_CORE_DATA_SPEED_UP = 5 + #: Extra monitor core inbound data transfer protocol + #: See :py:class:`SpeedupInSCPCommands` + EXTRA_MONITOR_CORE_DATA_IN_SPEED_UP = 6 #: Extra monitor core data copy EXTRA_MONITOR_CORE_COPY_DATA_IN = 7 From b6b812069e436e37bf7acfd7702ef73caa93f27a Mon Sep 17 00:00:00 2001 From: Andrew Rowley Date: Mon, 22 Jul 2024 08:55:18 +0100 Subject: [PATCH 6/7] Fix this (even though it isn't changed here) --- spinnman/utilities/locate_connected_machine_ip_address.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spinnman/utilities/locate_connected_machine_ip_address.py b/spinnman/utilities/locate_connected_machine_ip_address.py index eaa734033..d7b4680d5 100644 --- a/spinnman/utilities/locate_connected_machine_ip_address.py +++ b/spinnman/utilities/locate_connected_machine_ip_address.py @@ -20,7 +20,7 @@ from spinnman.connections.udp_packet_connections import IPAddressesConnection -def locate_connected_machine(handler: Callable[[str, float], None]): +def locate_connected_machine(handler: Callable[[str, float], bool]): """ Locates any SpiNNaker machines IP addresses from the auto-transmitted packets from non-booted SpiNNaker machines. From b0e97ddb9b59ce0de6aadbdbed6172ab430d6616 Mon Sep 17 00:00:00 2001 From: Andrew Rowley Date: Mon, 22 Jul 2024 08:55:37 +0100 Subject: [PATCH 7/7] And this too --- spinnman/utilities/locate_connected_machine_ip_address.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spinnman/utilities/locate_connected_machine_ip_address.py b/spinnman/utilities/locate_connected_machine_ip_address.py index d7b4680d5..6ed26c419 100644 --- a/spinnman/utilities/locate_connected_machine_ip_address.py +++ b/spinnman/utilities/locate_connected_machine_ip_address.py @@ -51,7 +51,7 @@ def _ctrlc_handler(sig, frame): print("Exiting") sys.exit() - def _print_connected(ip_address: str, timestamp: float): + def _print_connected(ip_address: str, timestamp: float) -> bool: try: hostname = f" ({socket.gethostbyaddr(ip_address)[0]})" except Exception: # pylint: disable=broad-except