diff --git a/spinn_front_end_common/interface/abstract_spinnaker_base.py b/spinn_front_end_common/interface/abstract_spinnaker_base.py index 4e796063d..92682008b 100644 --- a/spinn_front_end_common/interface/abstract_spinnaker_base.py +++ b/spinn_front_end_common/interface/abstract_spinnaker_base.py @@ -1611,7 +1611,7 @@ def _report_memory_on_host(self) -> None: if timer.skip_if_virtual_board(): return if timer.skip_if_cfg_false( - "Reports", "write_memory_map_report"): + "Reports", "write_memory_map_report_summary"): return memory_map_on_host_report() @@ -1623,7 +1623,7 @@ def _report_memory_on_chip(self) -> None: if timer.skip_if_virtual_board(): return if timer.skip_if_cfg_false( - "Reports", "write_memory_map_report"): + "Reports", "write_memory_map_report_detailed"): return memory_map_on_host_chip_report() diff --git a/spinn_front_end_common/interface/config_handler.py b/spinn_front_end_common/interface/config_handler.py index 2fef6e445..1ce09d97d 100644 --- a/spinn_front_end_common/interface/config_handler.py +++ b/spinn_front_end_common/interface/config_handler.py @@ -143,6 +143,9 @@ def _previous_handler(self) -> None: "run_compression_checker") self._replaced_cfg("Reports", "report_enabled", "[Mode]mode = Production to turn off most reports") + self._replaced_cfg("Reports", "write_memory_map_report", + "write_memory_map_report_summary and" + " write_memory_map_report_detailed") def _error_on_previous(self, option: str) -> None: try: diff --git a/spinn_front_end_common/interface/spinnaker.cfg b/spinn_front_end_common/interface/spinnaker.cfg index d3feb977a..6a88258b3 100644 --- a/spinn_front_end_common/interface/spinnaker.cfg +++ b/spinn_front_end_common/interface/spinnaker.cfg @@ -57,12 +57,13 @@ write_compression_summary = Debug See [write_compressed](write_compressed) path_compression_summary = compressed_routing_summary.rpt -write_memory_map_report = Debug -@write_memory_map_report = Writes all the memry map reports. the summary and one per Core.. -path_memory_map_report_map = memory_map_from_processor_to_address_space -@group_path_memory_map_report_map = write_memory_map_report -path_memory_map_reports = memory_map_reports -@group_path_memory_map_reports = write_memory_map_report +write_memory_map_report_summary = Debug +@write_memory_map_report_summary = Writes the summary memory map report +path_memory_map_report_summary = memory_map_from_processor_to_address_space.txt + +write_memory_map_report_detailed = Debug +@write_memory_map_report_detailed = Writes the per core memory map report +path_memory_map_report_detailed = memory_map_reports write_network_specification_report = Info @write_network_specification_report = Write the details of the network. diff --git a/spinn_front_end_common/utilities/report_functions/memory_map_on_host_chip_report.py b/spinn_front_end_common/utilities/report_functions/memory_map_on_host_chip_report.py index 311b30d76..d0dcb553a 100644 --- a/spinn_front_end_common/utilities/report_functions/memory_map_on_host_chip_report.py +++ b/spinn_front_end_common/utilities/report_functions/memory_map_on_host_chip_report.py @@ -39,7 +39,8 @@ def memory_map_on_host_chip_report() -> None: Report on memory usage. Creates a report that states where in SDRAM each region is (read from machine). """ - directory_name = get_report_path("path_memory_map_reports", is_dir=True) + directory_name = get_report_path( + "path_memory_map_report_detailed", is_dir=True) if not os.path.exists(directory_name): os.makedirs(directory_name) diff --git a/spinn_front_end_common/utilities/report_functions/memory_map_on_host_report.py b/spinn_front_end_common/utilities/report_functions/memory_map_on_host_report.py index ebfe548c3..a77f35e48 100644 --- a/spinn_front_end_common/utilities/report_functions/memory_map_on_host_report.py +++ b/spinn_front_end_common/utilities/report_functions/memory_map_on_host_report.py @@ -26,7 +26,7 @@ def memory_map_on_host_report() -> None: """ Report on memory usage. """ - file_name = get_report_path("path_memory_map_report_map") + file_name = get_report_path("path_memory_map_report_summary") try: with open(file_name, "w", encoding="utf-8") as f: f.write("On host data specification executor\n")