Merge pull request #753 from kordejong/gh752

computationalgeography · Dec 9, 2024 · 584b830 · 584b830
2 parents 3ba2882 + 4a455d5
commit 584b830
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/...y_assurance/scalability/command/scalability/experiment/partition_shape/generate_script.py b/...y_assurance/scalability/command/scalability/experiment/partition_shape/generate_script.py
@@ -51,7 +51,7 @@ def generate_script_slurm(
                     os.path.dirname(result_pathname)
                 ),
                 # Run the benchmark, resulting in a json file
-                f'mpirun --n {nr_tasks} {mpirun_configuration} {experiment.command_pathname} "{experiment.command_arguments}" '
+                f"mpirun --n {nr_tasks} {mpirun_configuration} {experiment.command_pathname} {experiment.command_arguments} "
                 # '--hpx:ini="hpx.parcel.mpi.enable=1" '
                 # '--hpx:ini="hpx.os_threads={nr_threads}" '
                 '--hpx:threads="{nr_threads}" '
@@ -147,7 +147,7 @@ def generate_script_shell(
                 # Create directory for the resulting json file
                 "mkdir -p {}".format(os.path.dirname(result_pathname)),
                 # Run the benchmark, resulting in a json file
-                f'{experiment.command_pathname} "{experiment.command_arguments}" '
+                f"{experiment.command_pathname} {experiment.command_arguments} "
                 # '--hpx:ini="hpx.os_threads={nr_threads}" '
                 '--hpx:threads="{nr_threads}" '
                 # '--hpx:bind="{thread_binding}" '

diff --git a/...ssurance/scalability/command/scalability/experiment/strong_scalability/generate_script.py b/...ssurance/scalability/command/scalability/experiment/strong_scalability/generate_script.py
@@ -29,7 +29,7 @@ def generate_script_slurm_threads(
 
         job_steps += [
             # Run the benchmark, resulting in a json file
-            f'mpirun --n {nr_tasks} {mpirun_configuration} {experiment.command_pathname} "{experiment.command_arguments}" '
+            f"mpirun --n {nr_tasks} {mpirun_configuration} {experiment.command_pathname} {experiment.command_arguments} "
             # '--hpx:ini="hpx.parcel.mpi.enable=1" '
             # '--hpx:ini="hpx.os_threads={nr_threads}" '
             '--hpx:threads="{nr_threads}" '
@@ -121,7 +121,7 @@ def generate_script_slurm_numa_nodes(
 
         job_steps += [
             # Run the benchmark, resulting in a json file
-            f'mpirun --n {nr_tasks} {mpirun_configuration} {experiment.command_pathname} "{experiment.command_arguments}" '
+            f"mpirun --n {nr_tasks} {mpirun_configuration} {experiment.command_pathname} {experiment.command_arguments} "
             # '--hpx:ini="hpx.parcel.mpi.enable=1" '
             # '--hpx:ini="hpx.os_threads={nr_threads}" '
             '--hpx:threads="{nr_threads}" '
@@ -227,7 +227,7 @@ def generate_script_slurm_cluster_nodes(
 
         job_steps = [
             # Run the benchmark, resulting in a json file
-            f'mpirun --n {nr_tasks} {mpirun_configuration} {experiment.command_pathname} "{experiment.command_arguments}" '
+            f"mpirun --n {nr_tasks} {mpirun_configuration} {experiment.command_pathname} {experiment.command_arguments} "
             # '--hpx:ini="hpx.parcel.mpi.enable=1" '
             # '--hpx:ini="hpx.os_threads={nr_threads}" '
             '--hpx:threads="{nr_threads}" '
@@ -344,7 +344,7 @@ def generate_script_shell(
             # Create directory for the resulting json file
             "mkdir -p {}".format(os.path.dirname(result_pathname)),
             # Run the benchmark, resulting in a json file
-            f'{experiment.command_pathname} "{experiment.command_arguments}" '
+            f"{experiment.command_pathname} {experiment.command_arguments} "
             # '--hpx:ini="hpx.os_threads={nr_threads}" '
             '--hpx:threads="{nr_threads}" '
             # '--hpx:bind="{thread_binding}" '

diff --git a/..._assurance/scalability/command/scalability/experiment/weak_scalability/generate_script.py b/..._assurance/scalability/command/scalability/experiment/weak_scalability/generate_script.py
@@ -55,7 +55,7 @@ def generate_script_slurm_threads(
 
         job_steps += [
             # Run the benchmark, resulting in a json file
-            f'mpirun --n {nr_tasks} {mpirun_configuration} {experiment.command_pathname} "{experiment.command_arguments}" '
+            f"mpirun --n {nr_tasks} {mpirun_configuration} {experiment.command_pathname} {experiment.command_arguments} "
             # '--hpx:ini="hpx.parcel.mpi.enable=1" '
             # '--hpx:ini="hpx.os_threads={nr_threads}" '
             '--hpx:threads="{nr_threads}" '
@@ -154,7 +154,7 @@ def generate_script_slurm_numa_nodes(
 
         job_steps += [
             # Run the benchmark, resulting in a json file
-            f'mpirun --n {nr_tasks} {mpirun_configuration} {experiment.command_pathname} "{experiment.command_arguments}" '
+            f"mpirun --n {nr_tasks} {mpirun_configuration} {experiment.command_pathname} {experiment.command_arguments} "
             # '--hpx:ini="hpx.parcel.mpi.enable=1" '
             # '--hpx:ini="hpx.os_threads={nr_threads}" '
             '--hpx:threads="{nr_threads}" '
@@ -265,7 +265,7 @@ def generate_script_slurm_cluster_nodes(
 
         job_steps = [
             # Run the benchmark, resulting in a json file
-            f'mpirun --n {nr_tasks} {mpirun_configuration} {experiment.command_pathname} "{experiment.command_arguments}" '
+            f"mpirun --n {nr_tasks} {mpirun_configuration} {experiment.command_pathname} {experiment.command_arguments} "
             # '--hpx:ini="hpx.parcel.mpi.enable=1" '
             # '--hpx:ini="hpx.os_threads={nr_threads}" '
             '--hpx:threads="{nr_threads}" '
@@ -383,7 +383,7 @@ def generate_script_shell(
             # Create directory for the resulting json file
             "mkdir -p {}".format(os.path.dirname(result_pathname)),
             # Run the benchmark, resulting in a json file
-            f'{experiment.command_pathname} "{experiment.command_arguments}" '
+            f"{experiment.command_pathname} {experiment.command_arguments} "
             # '--hpx:ini="hpx.os_threads={nr_threads}" '
             '--hpx:threads="{nr_threads}" '
             # '--hpx:bind="{thread_binding}" '