Merge branch 'master' into simplify_data_in

mypy.bash

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Copyright (c) 2024 The University of Manchester
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This bash assumes that other repositories are installed in paralled
+
+# requires the latest mypy
+# pip install --upgrade mypy
+
+utils="../SpiNNUtils/spinn_utilities"
+machine="../SpiNNMachine/spinn_machine"
+
+mypy $utils $machine spinnman

setup.cfg

@@ -47,7 +47,7 @@ packages = find:
 zip_safe = True
 include_package_data = True
 install_requires =
-        SpiNNMachine == 1!7.2.2
+        SpiNNMachine == 1!7.3.1
         websocket-client
 
 [options.packages.find]

spinnman/_version.py

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1!7.2.2"
+__version__ = "1!7.3.1"
 __version_month__ = "TBD"
 __version_year__ = "TBD"
 __version_day__ = "TBD"
-__version_name__ = "TO DO"
+__version_name__ = "To Do"

spinnman/model/cpu_info.py

@@ -61,6 +61,7 @@ class CPUInfo(object):
         "__processor_state_register",
         "__registers",
         "__run_time_error",
+        "__run_time_error_value",
         "__software_error_count",
         "__filename_address",
         "__line_number",
@@ -102,7 +103,11 @@ def __init__(self, x: int, y: int, p: int, cpu_data: _vcpu_t):
         self.__application_name = app_name.decode('ascii')
 
         self.__registers: Sequence[int] = _REGISTERS_PATTERN.unpack(registers)
-        self.__run_time_error = RunTimeError(run_time_error)
+        self.__run_time_error_value = run_time_error
+        try:
+            self.__run_time_error = RunTimeError(run_time_error)
+        except ValueError:
+            self.__run_time_error = RunTimeError.UNRECOGNISED
         self.__state = CPUState(state)
 
         self.__application_mailbox_command = MailboxCommand(app_mailbox_cmd)
@@ -353,10 +358,13 @@ def get_status_string(self) -> str:
         :rtype: str
         """
         if self.state == CPUState.RUN_TIME_EXCEPTION:
+            rte_string = f"{self.run_time_error.name}"
+            if self.run_time_error == RunTimeError.UNRECOGNISED:
+                rte_string += f" ({self.__run_time_error_value})"
             return (
                 f"{self.__x}:{self.__y}:{self.__p} "
                 f"(ph: {self.__physical_cpu_id}) "
-                f"in state {self.__state.name}:{self.__run_time_error.name}\n"
+                f"in state {self.__state.name}:{rte_string}\n"
                 f"    r0={self.__registers[0]}, r1={self.__registers[1]}, "
                 f"r2={self.__registers[2]}, r3={self.__registers[3]}\n"
                 f"    r4={self.__registers[4]}, r5={self.__registers[5]}, "

spinnman/model/enums/run_time_error.py

@@ -61,3 +61,5 @@ class RunTimeError(Enum):
     API = 19
     #: Sark software version conflict
     SARK_VERSRION_INCORRECT = 20
+    #: Unhandled exception
+    UNRECOGNISED = 99999

spinnman_integration_tests/test_job.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import unittest
-
+from requests.exceptions import ConnectionError
 from spinn_utilities.config_holder import set_config
 
 from spinn_machine.version import FIVE
@@ -30,7 +30,10 @@ def setUp(self):
         self.spalloc_machine = "SpiNNaker1M"
 
     def test_create_job(self):
-        client = SpallocClient(self.spalloc_url)
+        try:
+            client = SpallocClient(self.spalloc_url)
+        except ConnectionError as ex:
+            raise unittest.SkipTest(str(ex))
         # job = client.create_job_rect_at_board(
         #    WIDTH, HEIGHT, triad=(x, y, b), machine_name=SPALLOC_MACHINE,
         #    max_dead_boards=1)