Merge pull request #708 from douglasjacobsen/cleanup-quotes

Remove unneeded quotes from example configs
GoogleCloudPlatform · Oct 18, 2024 · 5523b87 · 5523b87
2 parents ae1ded2 + 4910859
commit 5523b87
Show file tree

Hide file tree

Showing 21 changed files with 89 additions and 89 deletions.
diff --git a/examples/basic_expansion_config.yaml b/examples/basic_expansion_config.yaml
@@ -10,7 +10,7 @@ ramble:
   variants:
     package_manager: spack
   variables:
-    mpi_command: 'mpirun -n {n_ranks} -ppn {processes_per_node}'
+    mpi_command: mpirun -n {n_ranks} -ppn {processes_per_node}
     batch_submit: '{execute_experiment}'
     n_ranks: '{processes_per_node}*{n_nodes}'
   applications:
@@ -20,10 +20,10 @@ ramble:
           experiments:
             test_{partition}_{processes_per_node}_{n_nodes}:
               variables:
-                partition: ['part1', 'part2']
-                processes_per_node: ['16', '32']
+                partition: [part1, part2]
+                processes_per_node: [16, 32]
                 #^-- (partition, processes_per_node) -> (part1, 16), (part2, 32)
-                n_nodes: ['2', '4']
+                n_nodes: [2, 4]
                 wrf_path: execute_experiment in wrfv4.CONUS_2p5km.new_test
               matrices:
                 - - n_nodes
@@ -36,8 +36,8 @@ ramble:
           experiments:
             new_test:
               variables:
-                n_ranks: '1'
-                n_nodes: '1'
+                n_ranks: 1
+                n_nodes: 1
   software:
     packages:
       gcc9:

diff --git a/examples/basic_gromacs_config.yaml b/examples/basic_gromacs_config.yaml
@@ -14,7 +14,7 @@ ramble:
       OMP_NUM_THREADS: '{n_threads}'
   variables:
     processes_per_node: 16
-    mpi_command: 'mpirun -n {n_ranks} -ppn {processes_per_node}'
+    mpi_command: mpirun -n {n_ranks} -ppn {processes_per_node}
     batch_submit: '{execute_experiment}'
   applications:
     gromacs: # Application name
@@ -23,30 +23,30 @@ ramble:
           experiments:
             pme_single_rank: # Arbitrary experiment name
               variables:
-                n_ranks: '1'
-                n_threads: '1'
+                n_ranks: 1
+                n_threads: 1
                 size: '0003'
-                type: 'pme'
+                type: pme
             rf_single_rank:
               variables:
-                n_ranks: '1'
-                n_threads: '1'
+                n_ranks: 1
+                n_threads: 1
                 size: '0003'
-                type: 'rf'
+                type: rf
         water_bare:
           experiments:
             pme_single_rank:
               variables:
-                n_ranks: '1'
-                n_threads: '1'
+                n_ranks: 1
+                n_threads: 1
                 size: '0003'
-                type: 'pme'
+                type: pme
             rf_single_rank:
               variables:
-                n_ranks: '1'
-                n_threads: '1'
+                n_ranks: 1
+                n_threads: 1
                 size: '0003'
-                type: 'rf'
+                type: rf
   software:
     packages:
       gcc9:

diff --git a/examples/basic_hostname_config.yaml b/examples/basic_hostname_config.yaml
@@ -11,7 +11,7 @@ ramble:
     set:
       OMP_NUM_THREADS: '{n_threads}'
   variables:
-    mpi_command: 'mpirun'
+    mpi_command: mpirun
     batch_submit: '{execute_experiment}'
     processes_per_node: -1
   applications:
@@ -21,15 +21,15 @@ ramble:
           experiments:
             test:
               variables:
-                n_ranks: '1'
-                n_nodes: '1'
+                n_ranks: 1
+                n_nodes: 1
         parallel:
           experiments:
             test:
               variables:
-                n_ranks: '2'
-                n_nodes: '1'
-                processes_per_node: '16'
+                n_ranks: 2
+                n_nodes: 1
+                processes_per_node: 16
   software:
     packages: {}
     environments: {}
diff --git a/examples/full_expansion_config.yaml b/examples/full_expansion_config.yaml
@@ -11,11 +11,11 @@ ramble:
     package_manager: spack
   env_vars:
     set:
-      I_MPI_DEBUG: '5'
+      I_MPI_DEBUG: 5
   variables:
-    mpi_command: 'mpirun -n {n_ranks} -ppn {processes_per_node}'
+    mpi_command: mpirun -n {n_ranks} -ppn {processes_per_node}
     batch_submit: '{execute_experiment}'
-    processes_per_node: '16'
+    processes_per_node: 16
     n_ranks: '{processes_per_node}*{n_nodes}'
   applications:
     openfoam:
@@ -27,11 +27,11 @@ ramble:
                 set:
                   OMP_NUM_THREADS: '{n_threads}'
               variables:
-                partition: ['part1', 'part2']
-                processes_per_node: ['16', '32']
-                env_name: ['openfoam-skx', 'openfoam-zen2']
+                partition: [part1, part2]
+                processes_per_node: [16, 32]
+                env_name: [openfoam-skx, openfoam-zen2]
                 #^-- (partition, processes_per_node) -> (part1, 16, openfoam-skx), (part2, 32, openfoam-zen2)
-                n_nodes: ['2', '4']
+                n_nodes: [2, 4]
               matrices:
                 - matrix_a:
                   - n_nodes

diff --git a/examples/gromacs_eessi_config.yaml b/examples/gromacs_eessi_config.yaml
@@ -17,9 +17,9 @@ ramble:
   variables:
     processes_per_node: 16
     # OpenMPI flags
-    mpi_command: 'mpirun -n {n_ranks} --map-by ppr:{processes_per_node}:node'
+    mpi_command: mpirun -n {n_ranks} --map-by ppr:{processes_per_node}:node
     batch_submit: '{execute_experiment}'
-    arch_name: ['generic', 'haswell', 'skylake_avx512']
+    arch_name: [generic, haswell, skylake_avx512]
     eessi_arch_dir: [x86_64/generic, x86_64/intel/haswell, x86_64/intel/skylake_avx512]
   zips:
     arch_conf:
@@ -32,11 +32,11 @@ ramble:
           experiments:
             '{type}_{n_ranks}ranks-{arch_name}': # Arbitrary experiment name
               variables:
-                app_workloads: ['water_gmx50', 'water_bare']
+                app_workloads: [water_gmx50, water_bare]
                 n_ranks: [1, 2]
-                n_threads: '1'
+                n_threads: 1
                 size: '0003'
-                type: ['pme', 'rf']
+                type: [pme, rf]
                 eessi_version: '2023.06'
               matrix:
               - app_workloads

diff --git a/examples/tutorial_11_exec_injection_config.yaml b/examples/tutorial_11_exec_injection_config.yaml
@@ -24,12 +24,12 @@ ramble:
                 custom_executables:
                   start_time:
                     template:
-                    - 'date +%s'
+                    - date +%s
                     redirect: '{experiment_run_dir}/start_time'
                     use_mpi: false
                   end_time:
                     template:
-                    - 'date +%s'
+                    - date +%s
                     redirect: '{experiment_run_dir}/end_time'
                     use_mpi: false
                 executable_injection:

diff --git a/examples/tutorial_11_exec_order_config.yaml b/examples/tutorial_11_exec_order_config.yaml
@@ -27,12 +27,12 @@ ramble:
                 custom_executables:
                   start_time:
                     template:
-                    - 'date +%s'
+                    - date +%s
                     redirect: '{experiment_run_dir}/start_time'
                     use_mpi: false
                   end_time:
                     template:
-                    - 'date +%s'
+                    - date +%s
                     redirect: '{experiment_run_dir}/end_time'
                     use_mpi: false
                 executables:

diff --git a/examples/tutorial_11_new_exec_config.yaml b/examples/tutorial_11_new_exec_config.yaml
@@ -27,12 +27,12 @@ ramble:
                 custom_executables:
                   start_time:
                     template:
-                    - 'date +%s'
+                    - date +%s
                     redirect: '{experiment_run_dir}/start_time'
                     use_mpi: false
                   end_time:
                     template:
-                    - 'date +%s'
+                    - date +%s
                     redirect: '{experiment_run_dir}/end_time'
                     use_mpi: false
               variables:

diff --git a/examples/tutorial_1_config.yaml b/examples/tutorial_1_config.yaml
@@ -18,7 +18,7 @@ ramble:
           experiments:
             test: # Arbitrary experiment name
               variables:
-                n_ranks: '1'
+                n_ranks: 1
   software:
     packages: {}
     environments: {}
diff --git a/examples/tutorial_7_base_config.yaml b/examples/tutorial_7_base_config.yaml
@@ -16,8 +16,8 @@ ramble:
     n_ranks: '{processes_per_node}*{n_nodes}'
     batch_submit: '{execute_experiment}'
     mpi_command: mpirun -n {n_ranks}
-    platform: ['platform1', 'platform2', 'platform3']
-    processes_per_node: ['16', '18', '20']
+    platform: [platform1, platform2, platform3]
+    processes_per_node: [16, 18, 20]
   zips:
     platform_config:
     - platform

diff --git a/examples/tutorial_7_final_config.yaml b/examples/tutorial_7_final_config.yaml
@@ -16,8 +16,8 @@ ramble:
     n_ranks: '{processes_per_node}*{n_nodes}'
     batch_submit: '{execute_experiment}'
     mpi_command: mpirun -n {n_ranks}
-    platform: ['platform1', 'platform2', 'platform3']
-    processes_per_node: ['16', '18', '20']
+    platform: [platform1, platform2, platform3]
+    processes_per_node: [16, 18, 20]
   zips:
     platform_config:
     - platform

diff --git a/examples/tutorial_7_matrix_config.yaml b/examples/tutorial_7_matrix_config.yaml
@@ -16,8 +16,8 @@ ramble:
     n_ranks: '{processes_per_node}*{n_nodes}'
     batch_submit: '{execute_experiment}'
     mpi_command: mpirun -n {n_ranks}
-    platform: ['platform1', 'platform2', 'platform3']
-    processes_per_node: ['16', '18', '20']
+    platform: [platform1, platform2, platform3]
+    processes_per_node: [16, 18, 20]
   zips:
     platform_config:
     - platform

diff --git a/examples/tutorial_8_base_config.yaml b/examples/tutorial_8_base_config.yaml
@@ -16,8 +16,8 @@ ramble:
     n_ranks: '{processes_per_node}*{n_nodes}'
     batch_submit: '{execute_experiment}'
     mpi_command: mpirun -n {n_ranks}
-    platform: ['platform1', 'platform2']
-    processes_per_node: ['16', '18']
+    platform: [platform1, platform2]
+    processes_per_node: [16, 18]
   zips:
     platform_config:
     - platform

diff --git a/examples/tutorial_8_expansion_indirection_config.yaml b/examples/tutorial_8_expansion_indirection_config.yaml
@@ -14,17 +14,17 @@ ramble:
       OMP_NUM_THREADS: '{n_threads}'
   variables:
     n_ranks: '{processes_per_node}*{n_nodes}'
-    platform: ['platform1', 'platform2']
-    processes_per_node: ['16', '18']
+    platform: [platform1, platform2]
+    processes_per_node: [16, 18]
 
     # Execution Template
     batch_submit: '{execute_experiment}'
-    mpi_command: 'mpirun {{mpi_name}_args}'
+    mpi_command: mpirun {{mpi_name}_args}
 
     # Experiment Expansions
-    mpi_name: ['intel-mpi', 'openmpi']
-    intel-mpi_args: '-n {n_ranks} -ppn {processes_per_node}'
-    openmpi_args: '--np {n_ranks} --map-by ppr:{processes_per_node}:node -x OMP_NUM_THREADS'
+    mpi_name: [intel-mpi, openmpi]
+    intel-mpi_args: -n {n_ranks} -ppn {processes_per_node}
+    openmpi_args: --np {n_ranks} --map-by ppr:{processes_per_node}:node -x OMP_NUM_THREADS
   zips:
     platform_config:
     - platform

diff --git a/examples/tutorial_8_mpi_config.yaml b/examples/tutorial_8_mpi_config.yaml
@@ -16,9 +16,9 @@ ramble:
     n_ranks: '{processes_per_node}*{n_nodes}'
     batch_submit: '{execute_experiment}'
     mpi_command: mpirun -n {n_ranks}
-    platform: ['platform1', 'platform2']
-    processes_per_node: ['16', '18']
-    mpi_name: ['intel-mpi', 'openmpi']
+    platform: [platform1, platform2]
+    processes_per_node: [16, 18]
+    mpi_name: [intel-mpi, openmpi]
   zips:
     platform_config:
     - platform

diff --git a/examples/tutorial_8_mpi_matrix_config.yaml b/examples/tutorial_8_mpi_matrix_config.yaml
@@ -16,9 +16,9 @@ ramble:
     n_ranks: '{processes_per_node}*{n_nodes}'
     batch_submit: '{execute_experiment}'
     mpi_command: mpirun -n {n_ranks}
-    platform: ['platform1', 'platform2']
-    processes_per_node: ['16', '18']
-    mpi_name: ['intel-mpi', 'openmpi']
+    platform: [platform1, platform2]
+    processes_per_node: [16, 18]
+    mpi_name: [intel-mpi, openmpi]
   zips:
     platform_config:
     - platform

diff --git a/examples/tutorial_8_software_environments_config.yaml b/examples/tutorial_8_software_environments_config.yaml
@@ -14,17 +14,17 @@ ramble:
       OMP_NUM_THREADS: '{n_threads}'
   variables:
     n_ranks: '{processes_per_node}*{n_nodes}'
-    platform: ['platform1', 'platform2']
-    processes_per_node: ['16', '18']
+    platform: [platform1, platform2]
+    processes_per_node: [16, 18]
 
     # Execution Template
     batch_submit: '{execute_experiment}'
-    mpi_command: 'mpirun {{mpi_name}_args}'
+    mpi_command: mpirun {{mpi_name}_args}
 
     # Experiment Expansions
-    mpi_name: ['intel-mpi', 'openmpi']
-    intel-mpi_args: '-n {n_ranks} -ppn {processes_per_node}'
-    openmpi_args: '--np {n_ranks} --map-by ppr:{processes_per_node}:node -x OMP_NUM_THREADS'
+    mpi_name: [intel-mpi, openmpi]
+    intel-mpi_args: -n {n_ranks} -ppn {processes_per_node}
+    openmpi_args: --np {n_ranks} --map-by ppr:{processes_per_node}:node -x OMP_NUM_THREADS
   zips:
     platform_config:
     - platform
@@ -37,7 +37,7 @@ ramble:
             scaling_{n_nodes}_{platform}_{mpi_name}:
               variables:
                 n_nodes: [1, 2]
-                env_name: 'wrfv4-{mpi_name}'
+                env_name: wrfv4-{mpi_name}
               matrix:
               - platform_config
               - n_nodes

diff --git a/examples/tutorial_9_fom_criteria_config.yaml b/examples/tutorial_9_fom_criteria_config.yaml
@@ -17,16 +17,16 @@ ramble:
   applications:
     wrfv4:
       success_criteria:
-      - name: 'timing-present'
-        mode: 'string'
-        match: 'Timing for main.*'
+      - name: timing-present
+        mode: string
+        match: Timing for main.*
         file: '{experiment_run_dir}/rsl.out.0000'
       workloads:
         CONUS_12km:
           success_criteria:
-          - name: 'correct-timesteps'
-            mode: 'fom_comparison'
-            fom_name: 'Number of timesteps'
+          - name: correct-timesteps
+            mode: fom_comparison
+            fom_name: Number of timesteps
             formula: '{value} >= 50'
           experiments:
             scaling_{n_nodes}:

diff --git a/examples/tutorial_9_regex_criteria_config.yaml b/examples/tutorial_9_regex_criteria_config.yaml
@@ -17,9 +17,9 @@ ramble:
   applications:
     wrfv4:
       success_criteria:
-      - name: 'timing-present'
-        mode: 'string'
-        match: 'Timing for main.*'
+      - name: timing-present
+        mode: string
+        match: Timing for main.*
         file: '{experiment_run_dir}/rsl.out.0000'
       workloads:
         CONUS_12km: