refactor formatting and improve clarity in performance table generation

Author: allnes

scoreboard/main.py

@@ -676,19 +676,29 @@ def _compute_display_deadlines_processes(n_items: int) -> list[date]:
 
     # Locate perf CSVs from CI or local runs (threads and processes)
     candidates_threads = [
-        script_dir.parent / "build" / "perf_stat_dir" / "threads_task_run_perf_table.csv",
+        script_dir.parent
+        / "build"
+        / "perf_stat_dir"
+        / "threads_task_run_perf_table.csv",
         script_dir.parent / "perf_stat_dir" / "threads_task_run_perf_table.csv",
         # Fallback to old single-file name
         script_dir.parent / "build" / "perf_stat_dir" / "task_run_perf_table.csv",
         script_dir.parent / "perf_stat_dir" / "task_run_perf_table.csv",
     ]
-    threads_csv = next((p for p in candidates_threads if p.exists()), candidates_threads[0])
+    threads_csv = next(
+        (p for p in candidates_threads if p.exists()), candidates_threads[0]
+    )
 
     candidates_processes = [
-        script_dir.parent / "build" / "perf_stat_dir" / "processes_task_run_perf_table.csv",
+        script_dir.parent
+        / "build"
+        / "perf_stat_dir"
+        / "processes_task_run_perf_table.csv",
         script_dir.parent / "perf_stat_dir" / "processes_task_run_perf_table.csv",
     ]
-    processes_csv = next((p for p in candidates_processes if p.exists()), candidates_processes[0])
+    processes_csv = next(
+        (p for p in candidates_processes if p.exists()), candidates_processes[0]
+    )
 
     # Read and merge performance statistics CSVs
     perf_stats_threads = load_performance_data_threads(threads_csv)

scripts/create_perf_table.py

@@ -36,10 +36,19 @@ def _infer_category(task_name: str) -> str:
 
 
 def _columns_for_category(category: str) -> list[str]:
-    return ["seq", "omp", "tbb", "stl", "all"] if category == "threads" else ["seq", "mpi"]
-
-
-def _write_excel_sheet(workbook, worksheet, cpu_num: int, tasks_list: list[str], cols: list[str], table: dict):
+    return (
+        ["seq", "omp", "tbb", "stl", "all"] if category == "threads" else ["seq", "mpi"]
+    )
+
+
+def _write_excel_sheet(
+    workbook,
+    worksheet,
+    cpu_num: int,
+    tasks_list: list[str],
+    cols: list[str],
+    table: dict,
+):
     worksheet.set_column("A:Z", 23)
     right_bold_border = workbook.add_format({"bold": True, "right": 2, "bottom": 2})
     bottom_bold_border = workbook.add_format({"bold": True, "bottom": 2})
@@ -59,13 +68,17 @@ def _write_excel_sheet(workbook, worksheet, cpu_num: int, tasks_list: list[str],
             bottom_bold_border,
         )
         col += 1
-        worksheet.write(0, col, f"Eff({cpu_num}) = S({cpu_num}) / {cpu_num}", right_bold_border)
+        worksheet.write(
+            0, col, f"Eff({cpu_num}) = S({cpu_num}) / {cpu_num}", right_bold_border
+        )
         col += 1
 
     # Task rows
     row = 1
     for task_name in tasks_list:
-        worksheet.write(row, 0, task_name, workbook.add_format({"bold": True, "right": 2}))
+        worksheet.write(
+            row, 0, task_name, workbook.add_format({"bold": True, "right": 2})
+        )
         row += 1
 
     # Values
@@ -75,9 +88,12 @@ def _write_excel_sheet(workbook, worksheet, cpu_num: int, tasks_list: list[str],
         for ttype in cols:
             if task_name not in table:
                 # no data for task at all
-                worksheet.write(row, col, "—"); col += 1
-                worksheet.write(row, col, "—"); col += 1
-                worksheet.write(row, col, "—", right_border); col += 1
+                worksheet.write(row, col, "—")
+                col += 1
+                worksheet.write(row, col, "—")
+                col += 1
+                worksheet.write(row, col, "—", right_border)
+                col += 1
                 continue
             par_time = table[task_name].get(ttype, -1.0)
             seq_time = table[task_name].get("seq", -1.0)
@@ -87,9 +103,12 @@ def _write_excel_sheet(workbook, worksheet, cpu_num: int, tasks_list: list[str],
             else:
                 speed_up = seq_time / par_time
                 efficiency = speed_up / cpu_num
-            worksheet.write(row, col, par_time if par_time != -1.0 else "?"); col += 1
-            worksheet.write(row, col, speed_up); col += 1
-            worksheet.write(row, col, efficiency, right_border); col += 1
+            worksheet.write(row, col, par_time if par_time != -1.0 else "?")
+            col += 1
+            worksheet.write(row, col, speed_up)
+            col += 1
+            worksheet.write(row, col, efficiency, right_border)
+            col += 1
         row += 1
 
 
@@ -109,6 +128,7 @@ def _write_csv(path: str, header: list[str], tasks_list: list[str], table: dict)
                 row.append(val / seq_time if val != -1.0 else "?")
             writer.writerow(row)
 
+
 parser = argparse.ArgumentParser()
 parser.add_argument(
     "-i", "--input", help="Input file path (logs of perf tests, .txt)", required=True
@@ -236,18 +256,24 @@ def _write_csv(path: str, header: list[str], tasks_list: list[str], table: dict)
 
         cpu_num_env = os.environ.get("PPC_NUM_PROC")
         if cpu_num_env is None:
-            raise EnvironmentError("Required environment variable 'PPC_NUM_PROC' is not set.")
+            raise EnvironmentError(
+                "Required environment variable 'PPC_NUM_PROC' is not set."
+            )
         cpu_num = int(cpu_num_env)
         cols = _columns_for_category(category)
 
         # Excel
-        wb_path = os.path.join(xlsx_path, f"{category}_" + table_name + "_perf_table.xlsx")
+        wb_path = os.path.join(
+            xlsx_path, f"{category}_" + table_name + "_perf_table.xlsx"
+        )
         workbook = xlsxwriter.Workbook(wb_path)
         worksheet = workbook.add_worksheet()
         _write_excel_sheet(workbook, worksheet, cpu_num, tasks_list, cols, table_data)
         workbook.close()
 
         # CSV
         header = ["Task", "SEQ"] + [c.upper() for c in cols[1:]]
-        csv_path = os.path.join(xlsx_path, f"{category}_" + table_name + "_perf_table.csv")
+        csv_path = os.path.join(
+            xlsx_path, f"{category}_" + table_name + "_perf_table.csv"
+        )
         _write_csv(csv_path, header, tasks_list, table_data)