Merge pull request #1330 from SpiNNakerManchester/board_report

Board report

Author: Christian-B

spinn_front_end_common/utilities/report_functions/board_chip_report.py

@@ -41,44 +41,40 @@ def board_chip_report() -> None:
 
 def _write_report(
         writer: TextIO, machine: Machine, progress_bar: ProgressBar) -> None:
-    down_links: List[Tuple[int, int, int, str]] = []
-    down_chips: List[Tuple[int, int, str]] = []
-    down_cores: List[Tuple[int, int, str, str]] = []
+    n_cores = FecDataView.get_machine_version().max_cores_per_chip
+    n_links = Router.MAX_LINKS_PER_ROUTER
+    cores = set(range(n_cores))
     for e_chip in progress_bar.over(machine.ethernet_connected_chips):
-        assert e_chip.ip_address is not None
-        existing_chips: List[str] = []
+        writer.write(
+            f"board with IP address: {e_chip.ip_address}\n")
         for l_x, l_y in machine.local_xys:
+            down_chips: List[Tuple[int, int]] = list()
             x, y = machine.get_global_xy(l_x, l_y, e_chip.x, e_chip.y)
             if machine.is_chip_at(x, y):
                 chip = machine[x, y]
-                existing_chips.append(
-                    f"({x}, {y}, "
-                    f"{FecDataView.get_physical_string((x, y), 0)})")
-                n_cores = FecDataView.get_machine_version().max_cores_per_chip
-                down_procs = set(range(n_cores))
-                for p in chip.all_processor_ids:
-                    down_procs.remove(p)
-                for p in down_procs:
-                    phys_p = FecDataView.get_physical_string((x, y), p)
-                    if not phys_p:   # ""
-                        phys_p = str(-p)
-                    down_cores.append((l_x, l_y, phys_p, e_chip.ip_address))
-            else:
-                down_chips.append((l_x, l_y, e_chip.ip_address))
-            for link in range(Router.MAX_LINKS_PER_ROUTER):
-                if not machine.is_link_at(x, y, link):
-                    down_links.append((l_x, l_y, link, e_chip.ip_address))
+                writer.write(
+                    f"\t{x}, {y}, scamp core 0:"
+                    f"{FecDataView.get_physical_string(chip, 0)}\n")
 
-        writer.write(
-            f"board with IP address: {e_chip.ip_address} has chips"
-            f" {', '.join(existing_chips)}\n")
+                if chip.n_processors < n_cores:
+                    physical = FecDataView.get_physical_cores(chip)
+                    down_cores = list(cores - physical)
+                    down_cores.sort()
+                    writer.write(f"\t\tDown Cores: {down_cores}\n")
+
+                router = chip.router
+                if len(router) < n_links:
+                    down_links = list()
+                    for link in range(n_links):
+                        if chip.router.is_link(link):
+                            continue
+                        tx, ty = machine.xy_over_link(x, y, link)
+                        if machine.is_chip_at(tx, ty):
+                            down_links.append(link)
+                    if down_links:
+                        writer.write(f"\t\tDown Links: {down_links}\n")
+            else:
+                down_chips.append((x, y))
 
-    down_chips_out = ":".join(
-        f"{x},{y},{ip}" for x, y, ip in down_chips)
-    down_cores_out = ":".join(
-        f"{x},{y},{phys_p},{ip}" for x, y, phys_p, ip in down_cores)
-    down_links_out = ":".join(
-        f"{x},{y},{l},{ip}" for x, y, l, ip in down_links)
-    writer.write(f"Down chips: {down_chips_out}\n")
-    writer.write(f"Down cores: {down_cores_out}\n")
-    writer.write(f"Down Links: {down_links_out}\n")
+        if down_chips:
+            writer.write(f"\t\tDown chips: {down_chips}\n")