From ea66c3a7bd67ef9fe1767c4147fa8308f7fb3dbb Mon Sep 17 00:00:00 2001
From: EdmundGoodman <egoodman3141@gmail.com>
Date: Mon, 11 Mar 2024 23:35:40 +0000
Subject: [PATCH] Fix bug with environment variables

---
 src/hpc_multibench/tui/interactive_ui.py   |  1 +
 src/hpc_multibench/tui/interactive_ui.tcss |  3 +++
 src/hpc_multibench/yaml_model.py           |  5 ++--
 yaml_examples/project_demo/long.yaml       | 31 +++++++++++++++++++---
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/hpc_multibench/tui/interactive_ui.py b/src/hpc_multibench/tui/interactive_ui.py
index a480c2f..b6c39ad 100755
--- a/src/hpc_multibench/tui/interactive_ui.py
+++ b/src/hpc_multibench/tui/interactive_ui.py
@@ -380,6 +380,7 @@ def update_plot_tab(self) -> None:
         assert self.current_test_bench is not None
         aggregated_metrics = self.get_aggregated_metrics()
         if aggregated_metrics is None:
+            metrics_plot.clear_figure()
             metrics_plot.title("No run data to show!")
             return
 
diff --git a/src/hpc_multibench/tui/interactive_ui.tcss b/src/hpc_multibench/tui/interactive_ui.tcss
index fff0260..00b1a7d 100644
--- a/src/hpc_multibench/tui/interactive_ui.tcss
+++ b/src/hpc_multibench/tui/interactive_ui.tcss
@@ -17,6 +17,9 @@
     content-align: center middle;
 }
 
+#run-information {
+    max-height: 40vh;
+}
 #sbatch-contents {
     margin: 1 0 0 0;
 }
diff --git a/src/hpc_multibench/yaml_model.py b/src/hpc_multibench/yaml_model.py
index 3481a75..4efb9ec 100755
--- a/src/hpc_multibench/yaml_model.py
+++ b/src/hpc_multibench/yaml_model.py
@@ -45,8 +45,9 @@ def realise(
                 # TODO: Error checking on keys
                 if key == "sbatch_config":
                     run.sbatch_config.update(value)  # type: ignore
-                elif key == "environment_variables":
-                    run.environment_variables.update(value)  # type: ignore
+                # TODO: Further root cause why this was causing duplicate runs
+                # elif key == "environment_variables":
+                #     run.environment_variables.update(value)  # type: ignore
                 else:
                     setattr(run, key, value)
 
diff --git a/yaml_examples/project_demo/long.yaml b/yaml_examples/project_demo/long.yaml
index cb580d3..56bc8be 100644
--- a/yaml_examples/project_demo/long.yaml
+++ b/yaml_examples/project_demo/long.yaml
@@ -148,7 +148,7 @@ run_configurations:
 
 benches:
   "serial":
-    # enabled: False
+    enabled: False
     run_configurations:
       - "cpp-reference"
       - "rust-reference"
@@ -193,9 +193,11 @@ benches:
         - "300 300 300"
         - "400 400 400"
       environment_variables:
+        - { "OMP_NUM_THREADS": 1, "RAYON_NUM_THREADS": 1 }
+        - { "OMP_NUM_THREADS": 2, "RAYON_NUM_THREADS": 2 }
+        - { "OMP_NUM_THREADS": 4, "RAYON_NUM_THREADS": 4 }
         - { "OMP_NUM_THREADS": 8, "RAYON_NUM_THREADS": 8 }
         - { "OMP_NUM_THREADS": 16, "RAYON_NUM_THREADS": 16 }
-        - { "OMP_NUM_THREADS": 24, "RAYON_NUM_THREADS": 24 }
         - { "OMP_NUM_THREADS": 32, "RAYON_NUM_THREADS": 32 }
     analysis:
       metrics:
@@ -208,9 +210,23 @@ benches:
           y: "Wall time (s)"
           split_metrics:
             - "Num threads"
+        - title: "Parallel Implementation Comparison"
+          x: "Mesh x size"
+          y: "Wall time (s)"
+          split_metrics:
+            - "Num threads"
+          fix_metrics:
+            "Num threads": 32
+      bar_charts:
+        - title: "MPI Configuration Sweep"
+          y: "Wall time (s)"
+          split_metrics:
+            - "Num threads"
+          fix_metrics:
+            "Mesh x size": "400"
 
   "mpi-config-sweep":
-    # enabled: False
+    enabled: False
     run_configurations:
       - "cpp-mpi"
       - "rust-mpi"
@@ -248,6 +264,13 @@ benches:
           split_metrics:
             - "Nodes"
             - "Tasks per Node"
+        - title: "MPI Configuration Sweep"
+          x: "Mesh x size"
+          y: "Wall time (s)"
+          split_metrics:
+            - "Nodes"
+          fix_metrics:
+            "Tasks per Node": 2
       bar_charts:
         - title: "MPI Configuration Sweep"
           y: "Wall time (s)"
@@ -350,7 +373,7 @@ benches:
             "Mesh x size": "100"
 
   "mpi-best-config":
-    # enabled: False
+    enabled: False
     run_configurations:
       - "cpp-mpi"
       - "rust-mpi"