From c35c9356db3dcd9ea4e5e418930b619f12e0d5b0 Mon Sep 17 00:00:00 2001
From: EdmundGoodman <egoodman3141@gmail.com>
Date: Sun, 25 Feb 2024 22:37:30 +0000
Subject: [PATCH] Update YAML test plans

---
 yaml_examples/kudu/original_versions.yaml   |  9 ++--
 yaml_examples/kudu/simple_rust.yaml         | 53 +++++++++++++++++++++
 yaml_examples/kudu/strong_weak_scaling.yaml |  4 +-
 3 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/yaml_examples/kudu/original_versions.yaml b/yaml_examples/kudu/original_versions.yaml
index c583f0c..6099f74 100644
--- a/yaml_examples/kudu/original_versions.yaml
+++ b/yaml_examples/kudu/original_versions.yaml
@@ -5,7 +5,7 @@ run_configurations:
       "ntasks-per-node": 1
       "cpus-per-task": 16
       "exclusive": "mcs"
-      "mem-per-cpu": 1500
+      "mem": 60000
     module_loads: []
     environment_variables: {}
     directory: "../0_cpp_versions/0_ref"
@@ -19,7 +19,7 @@ run_configurations:
       "ntasks-per-node": 1
       "cpus-per-task": 16
       "exclusive": "mcs"
-      "mem-per-cpu": 1500
+      "mem-per-cpu": 1875
     module_loads: []
     environment_variables:
       "OMP_NUM_THREADS": 16
@@ -34,7 +34,7 @@ run_configurations:
       "ntasks-per-node": 16
       "cpus-per-task": 2
       "exclusive": "mcs"
-      "mem-per-cpu": 1500
+      "mem-per-cpu": 1875
     module_loads:
       - "cs402-mpi"
     environment_variables: {}
@@ -49,7 +49,7 @@ run_configurations:
       "ntasks-per-node": 16
       "cpus-per-task": 2
       "exclusive": "mcs"
-      "mem-per-cpu": 1500
+      "mem-per-cpu": 1875
     module_loads:
       - "cs402-mpi"
     environment_variables:
@@ -73,6 +73,7 @@ benches:
         - "150 150 150"
         - "200 200 200"
         - "250 250 250"
+        - "300 300 300"
     analysis:
       metrics:
         "Mesh x size": "nx: (\\d+)"
diff --git a/yaml_examples/kudu/simple_rust.yaml b/yaml_examples/kudu/simple_rust.yaml
index 7d4f634..8503a50 100644
--- a/yaml_examples/kudu/simple_rust.yaml
+++ b/yaml_examples/kudu/simple_rust.yaml
@@ -27,6 +27,21 @@ run_configurations:
       - "make -j 8"
     run_command: "./test_HPCCG"
 
+  "cpp-mpi":
+    sbatch_config:
+      "nodes": 2
+      "ntasks-per-node": 8
+      "cpus-per-task": 1
+      "exclusive": "mcs"
+      "mem-per-cpu": 1875
+    module_loads:
+      - "cs402-mpi"
+    environment_variables: {}
+    directory: "../0_cpp_versions/2_mpi"
+    build_commands:
+      - "make -j 8"
+    run_command: "mpirun -n 16 ./test_HPCCG"
+
   "rust-reference":
     sbatch_config:
       "nodes": 1
@@ -55,6 +70,22 @@ run_configurations:
       - "cargo build --release"
     run_command: "./target/release/hpccg-rs"
 
+  "rust-mpi":
+    sbatch_config:
+      "nodes": 2
+      "ntasks-per-node": 8
+      "cpus-per-task": 1
+      "exclusive": "mcs"
+      "mem-per-cpu": 1875
+    module_loads:
+      - "cs402-mpi"
+    environment_variables: {}
+    directory: "../7_mpi"
+    build_commands:
+      - "cargo build --release"
+    run_command: "mpirun -n 16 ./target/release/hpccg-rs"
+
+
 benches:
   "serial":
     run_configurations:
@@ -109,3 +140,25 @@ benches:
         - title: "Parallel Implementation Comparison"
           x: "Mesh x size"
           y: "Wall time (s)"
+
+
+  "mpi-config-sweep":
+    run_configurations:
+      - "cpp-mpi"
+      - "rust-mpi"
+    matrix:
+      args:
+        - "100 100 100"
+    analysis:
+      metrics:
+        "Mesh x size": "nx: (\\d+)"
+        "Mesh y size": "ny: (\\d+)"
+        "Mesh z size": "nz: (\\d+)"
+        "Total time (s)": "Time Summary:[\\s\\S]*Total\\s*: ([\\d\\.]+)[\\s\\S]*\nFLOPS Summary"
+        "Total flops": "FLOPS Summary:[\\s\\S]*Total\\s*: ([\\d\\.]+)[\\s\\S]*\nMFLOPS Summary"
+        "Total mflops": "MFLOPS Summary:[\\s\\S]*Total\\s*: ([\\d\\.]+)"
+        "Wall time (s)": "real\\s([\\d\\.]+)\nuser"
+      line_plots:
+        - title: "Parallel Implementation Comparison"
+          x: "Mesh x size"
+          y: "Wall time (s)"
diff --git a/yaml_examples/kudu/strong_weak_scaling.yaml b/yaml_examples/kudu/strong_weak_scaling.yaml
index 1e138d3..a74a1e2 100644
--- a/yaml_examples/kudu/strong_weak_scaling.yaml
+++ b/yaml_examples/kudu/strong_weak_scaling.yaml
@@ -5,7 +5,7 @@ run_configurations:
       "ntasks-per-node": 16
       "cpus-per-task": 2
       "exclusive": "mcs"
-      "mem-per-cpu": 1500
+      "mem-per-cpu": 1875
     module_loads:
       - "cs402-mpi"
     environment_variables: {}
@@ -20,7 +20,7 @@ run_configurations:
       "ntasks-per-node": 16
       "cpus-per-task": 2
       "exclusive": "mcs"
-      "mem-per-cpu": 1500
+      "mem-per-cpu": 1875
     module_loads:
       - "cs402-mpi"
     environment_variables: