Merge pull request #1150 from SpiNNakerManchester/region_sizes

Use the Data Spec database more
SpiNNakerManchester · Feb 22, 2022 · 513fabe · 513fabe
2 parents bd848bd + a454862
commit 513fabe
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/spynnaker/pyNN/abstract_spinnaker_common.py b/spynnaker/pyNN/abstract_spinnaker_common.py
@@ -378,10 +378,9 @@ def id_counter(self, new_value):
     @overrides(AbstractSpinnakerBase._execute_graph_data_specification_writer)
     def _execute_graph_data_specification_writer(self):
         with FecTimer(DATA_GENERATION, "Spynnaker data specification writer"):
-            self._dsg_targets, self._region_sizes = \
-                spynnaker_data_specification_writer(
-                    self._placements, self._ipaddress, self._machine,
-                    self._max_run_time_steps)
+            self._dsg_targets = spynnaker_data_specification_writer(
+                self._placements, self._ipaddress, self._machine,
+                self._app_id, self._max_run_time_steps)
 
     def _execute_spynnaker_ordered_covering_compressor(self):
         with FecTimer(

diff --git a/spynnaker/pyNN/extra_algorithms/spynnaker_data_specification_writer.py b/spynnaker/pyNN/extra_algorithms/spynnaker_data_specification_writer.py
@@ -20,7 +20,7 @@
 
 
 def spynnaker_data_specification_writer(
-        placements, hostname, machine, data_n_timesteps):
+        placements, hostname, machine, app_id, data_n_timesteps):
     """
     Executes data specification generation for sPyNNaker
 
@@ -50,4 +50,5 @@ def spynnaker_data_specification_writer(
     placement_order.extend(delay_extensions)
 
     return graph_data_specification_writer(
-        placements, hostname, machine, data_n_timesteps, placement_order)
+        placements, hostname, machine, app_id, data_n_timesteps,
+        placement_order)
diff --git a/spynnaker_integration_tests/test_debug_mode/check_debug.py b/spynnaker_integration_tests/test_debug_mode/check_debug.py
@@ -23,6 +23,9 @@
 from spinn_front_end_common.utilities.report_functions.\
     routing_table_from_machine_report import _FOLDER_NAME as \
     routing_tables_from_machine_report
+from spinn_front_end_common.utilities.report_functions.\
+    memory_map_on_host_report import _FOLDER_NAME as \
+    memory_map_on_host_report
 # from spinn_front_end_common.utilities.report_functions.energy_report \
 #    import EnergyReport
 from spinn_front_end_common.utilities.report_functions.board_chip_report \
@@ -69,7 +72,7 @@ def debug(self, run_zero):
             # write_routing_tables_from_machine_report
             routing_tables_from_machine_report,
             # write_memory_map_report
-            # ??? used by MachineExecuteDataSpecification but not called ???
+            memory_map_on_host_report,
             # write_network_specification_report
             network_specification_file_name,
             # write_provenance_data