Fix strong/weak scaling test plan for Avon

EdmundGoodman · Feb 23, 2024 · 531be38 · 531be38
1 parent 77691fb
commit 531be38
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/TODO.md b/TODO.md
@@ -14,6 +14,7 @@
     - [ ] Default groups for executables
     - [ ] Optional key to disable test benches in YAML
   - [ ] Optional extras
+    - [ ] dry run flag
     - [x] Argument parsing from the command line
     - [ ] Unit tests
     - [ ] Documentations

diff --git a/src/hpc_multibench/yaml_model.py b/src/hpc_multibench/yaml_model.py
@@ -211,6 +211,7 @@ def run(self) -> None:
         for bench_name, bench in self.benches.items():
             for run in bench.get_runs(bench_name, self.run_configurations):
                 print(run)
+                run.run()
                 # Run the configurations with `run.run()`
 
     def analyse(self) -> None:

diff --git a/yaml_examples/avon/strong_weak_scaling.yaml b/yaml_examples/avon/strong_weak_scaling.yaml
@@ -2,6 +2,7 @@ run_configurations:
   "cpp-mpi":
     sbatch_config:
       "nodes": 1
+      "ntasks-per-node": 16
       "cpus-per-task": 2
       "mem-per-cpu": 3700
     module_loads:
@@ -16,6 +17,7 @@ run_configurations:
   "cpp-hybrid":
     sbatch_config:
       "nodes": 1
+      "ntasks-per-node": 16
       "cpus-per-task": 2
       "mem-per-cpu": 3700
     module_loads:
@@ -31,6 +33,7 @@ run_configurations:
 benches:
   "strong-scaling":
     run_configurations:
+      # - "cpp-mpi"
       - "cpp-hybrid"
     matrix:
       [args, run_command]:
@@ -39,8 +42,8 @@ benches:
         - ["64 64 256", "mpirun -np 4 ./test_HPCCG"]
         - ["64 64 128", "mpirun -np 8 ./test_HPCCG"]
         - ["64 64 64", "mpirun -np 16 ./test_HPCCG"]
-        - ["64 64 32", "mpirun -np 32 ./test_HPCCG"]
-        - ["64 64 16", "mpirun -np 64 ./test_HPCCG"]
+        # - ["64 64 32", "mpirun -np 32 ./test_HPCCG"]  # Exceeds Avon's resource capacity...
+        # - ["64 64 16", "mpirun -np 64 ./test_HPCCG"]
     analysis:
       metrics:
         "Mesh x size": "nx: (\\d+)"
@@ -64,16 +67,19 @@ benches:
 
   "weak-scaling":
     run_configurations:
+      # - "cpp-mpi"
       - "cpp-hybrid"
     matrix:
+      args:
+        - "64 64 64"
       run_command:
         - "mpirun -np 1 ./test_HPCCG"
         - "mpirun -np 2 ./test_HPCCG"
         - "mpirun -np 4 ./test_HPCCG"
         - "mpirun -np 8 ./test_HPCCG"
         - "mpirun -np 16 ./test_HPCCG"
-        - "mpirun -np 32 ./test_HPCCG"
-        - "mpirun -np 64 ./test_HPCCG"
+        # - "mpirun -np 32 ./test_HPCCG"  # Exceeds Avon's resource capacity...
+        # - "mpirun -np 64 ./test_HPCCG"
     analysis:
       metrics:
         "Mesh x size": "nx: (\\d+)"