Merge branch 'master' into list_map

Author: Christian-B

spinn_front_end_common/interface/abstract_spinnaker_base.py

@@ -722,7 +722,6 @@ def get_machine(self) -> Machine:
         self._data_writer.set_user_accessed_machine()
         if self._data_writer.is_user_mode() and \
                 self._data_writer.is_soft_reset():
-            self._data_writer.clear_machine()
             # Make the reset hard
             logger.warning(
                 "Calling Get machine after a reset force a hard reset and "

spinn_front_end_common/utilities/report_functions/reports.py

@@ -448,8 +448,10 @@ def _sdram_usage_report_per_chip_with_timesteps(
             sdram_by_chip[key] += vertex_sdram
     for chip in progress.over(FecDataView.get_machine().chips, end_progress):
         try:
-            if chip in sdram_by_chip:
-                chip_sdram = sdram_by_chip[chip]
+            # convert to key as mypy was confused.
+            key = (chip.x, chip.y)
+            if key in sdram_by_chip:
+                chip_sdram = sdram_by_chip[key]
                 used_sdram = chip_sdram.get_total_sdram(timesteps)
                 f.write(
                     f"**** Chip: ({chip.x}, {chip.y}) has total memory usage "

spinn_front_end_common/utilities/sqlite_db.py

@@ -21,15 +21,16 @@
 import struct
 from types import TracebackType
 from typing import Literal, Optional, Type, Union
-
 from typing_extensions import Self
 
+from spinn_utilities.log import FormatAdapter
+
 from pacman.exceptions import PacmanValueError
 
 from spinn_front_end_common.utilities.utility_calls import check_file_exists
 from spinn_front_end_common.utilities.exceptions import DatabaseException
 
-logger = logging.getLogger(__name__)
+logger = FormatAdapter(logging.getLogger(__name__))
 
 
 class SQLiteDB(object):