Fix tui bug from derived metrics

EdmundGoodman · Apr 13, 2024 · 34c7b25 · 34c7b25
1 parent e0e9235
commit 34c7b25
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/hpc_multibench/tui/interactive_ui.py b/src/hpc_multibench/tui/interactive_ui.py
@@ -340,7 +340,8 @@ def get_aggregated_metrics(
         if run_outputs is None:
             return None
         run_metrics = self.current_test_bench.get_run_metrics(run_outputs)
-        return self.current_test_bench.aggregate_run_metrics(run_metrics)
+        derived_metrics = self.current_test_bench.calculate_derived_metrics(run_metrics)
+        return self.current_test_bench.aggregate_run_metrics(derived_metrics)
 
     def update_metrics_tab(self) -> None:
         """Update the metrics tab of the user interface."""
@@ -357,6 +358,9 @@ def update_metrics_tab(self) -> None:
             metrics_table.add_columns(
                 "Name",
                 *list(self.current_test_bench.bench_model.analysis.metrics.keys()),
+                *list(
+                    self.current_test_bench.bench_model.analysis.derived_metrics.keys()
+                ),
             )
             for run_configuration, metrics in aggregated_metrics:
                 metrics_table.add_row(
@@ -367,7 +371,10 @@ def update_metrics_tab(self) -> None:
             assert self.current_run_configuration is not None
             assert self.current_run_configuration_name is not None
             metrics_table.add_columns(
-                *list(self.current_test_bench.bench_model.analysis.metrics.keys())
+                *list(self.current_test_bench.bench_model.analysis.metrics.keys()),
+                *list(
+                    self.current_test_bench.bench_model.analysis.derived_metrics.keys()
+                ),
             )
             for run_configuration, metrics in aggregated_metrics:
                 if run_configuration.name != self.current_run_configuration_name: