From b5deac4c7cb987bf61e92c8e03c225ea29d46bdc Mon Sep 17 00:00:00 2001
From: Kor de Jong <k.dejong1@uu.nl>
Date: Tue, 21 Jan 2025 17:21:55 +0100
Subject: [PATCH] Use single partition on single core

---
 .../command/scalability/core/process.py       |  1 -
 .../strong_scalability/generate_script.py     | 19 ++++++++-----------
 .../weak_scalability/generate_script.py       |  4 ++--
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/source/quality_assurance/scalability/command/scalability/core/process.py b/source/quality_assurance/scalability/command/scalability/core/process.py
index 84b95df44..7886ee332 100644
--- a/source/quality_assurance/scalability/command/scalability/core/process.py
+++ b/source/quality_assurance/scalability/command/scalability/core/process.py
@@ -79,7 +79,6 @@ def create_dot_graph(lue_dataset_pathname, pdf_graph_pathname):
         dot_properties_file.seek(0)
 
         with tempfile.NamedTemporaryFile(suffix=".dot") as dot_graph_file:
-            print(open(dot_properties_file.name, "r").read())
             commands = []
             commands.append(
                 "{} export --meta {} {} {}".format(
diff --git a/source/quality_assurance/scalability/command/scalability/experiment/strong_scalability/generate_script.py b/source/quality_assurance/scalability/command/scalability/experiment/strong_scalability/generate_script.py
index ae1b4a37f..b6548e1a8 100644
--- a/source/quality_assurance/scalability/command/scalability/experiment/strong_scalability/generate_script.py
+++ b/source/quality_assurance/scalability/command/scalability/experiment/strong_scalability/generate_script.py
@@ -21,11 +21,9 @@ def generate_script_slurm_threads(
     for benchmark_idx in range(benchmark.worker.nr_benchmarks):
         nr_workers = benchmark.worker.nr_workers(benchmark_idx)
         nr_threads = nr_workers
-        result_pathname = experiment.benchmark_result_pathname(
-            result_prefix, cluster.name, benchmark.scenario_name, nr_workers, "json"
-        )
-
-        a = 3
+        # result_pathname = experiment.benchmark_result_pathname(
+        #     result_prefix, cluster.name, benchmark.scenario_name, nr_workers, "json"
+        # )
 
         job_steps += [
             # Run the benchmark, resulting in a json file
@@ -46,7 +44,7 @@ def generate_script_slurm_threads(
                     benchmark,
                     experiment,
                     array_shape,
-                    partition_shape,
+                    partition_shape if nr_workers > 1 else array_shape,
                     nr_workers=nr_workers,
                 ),
             )
@@ -115,9 +113,9 @@ def generate_script_slurm_numa_nodes(
     for benchmark_idx in range(benchmark.worker.nr_benchmarks):
         nr_workers = benchmark.worker.nr_workers(benchmark_idx)
         nr_localities = nr_workers
-        result_pathname = experiment.benchmark_result_pathname(
-            result_prefix, cluster.name, benchmark.scenario_name, nr_workers, "json"
-        )
+        # result_pathname = experiment.benchmark_result_pathname(
+        #     result_prefix, cluster.name, benchmark.scenario_name, nr_workers, "json"
+        # )
 
         job_steps += [
             # Run the benchmark, resulting in a json file
@@ -220,7 +218,6 @@ def generate_script_slurm_cluster_nodes(
     for benchmark_idx in range(benchmark.worker.nr_benchmarks):
         nr_workers = benchmark.worker.nr_workers(benchmark_idx)
         nr_localities = nr_workers * benchmark.worker.nr_numa_nodes
-
         result_pathname = experiment.benchmark_result_pathname(
             result_prefix, cluster.name, benchmark.scenario_name, nr_workers, "json"
         )
@@ -357,7 +354,7 @@ def generate_script_shell(
                     benchmark,
                     experiment,
                     array_shape,
-                    partition_shape,
+                    partition_shape if nr_workers > 1 else array_shape,
                     nr_workers=nr_workers,
                 ),
             ),
diff --git a/source/quality_assurance/scalability/command/scalability/experiment/weak_scalability/generate_script.py b/source/quality_assurance/scalability/command/scalability/experiment/weak_scalability/generate_script.py
index 870582df9..fe96c2269 100644
--- a/source/quality_assurance/scalability/command/scalability/experiment/weak_scalability/generate_script.py
+++ b/source/quality_assurance/scalability/command/scalability/experiment/weak_scalability/generate_script.py
@@ -72,7 +72,7 @@ def generate_script_slurm_threads(
                     benchmark,
                     experiment,
                     array_shape,
-                    partition_shape,
+                    partition_shape if nr_workers > 1 else array_shape,
                     nr_workers=nr_workers,
                 ),
             )
@@ -396,7 +396,7 @@ def generate_script_shell(
                     benchmark,
                     experiment,
                     array_shape,
-                    partition_shape,
+                    partition_shape if nr_workers > 1 else array_shape,
                     nr_workers=nr_workers,
                 ),
             ),