LLNL · pearce8 · Feb 6, 2024 · Feb 6, 2024 · Feb 6, 2024
diff --git a/experiments/amg2023/cuda/execute_experiment.tpl b/experiments/amg2023/cuda/execute_experiment.tpl
@@ -9,6 +9,4 @@
 
 cd {experiment_run_dir}
 
-{spack_setup}
-
 {command}
diff --git a/experiments/amg2023/cuda/ramble.yaml b/experiments/amg2023/cuda/ramble.yaml
@@ -23,7 +23,6 @@ ramble:
             nx: '{n}'
             ny: '{n}'
             nz: '{n}'
-            experiment_setup: ''
             gtl: ['gtl', 'nogtl']
             gtlflag: ['-M"-gpu"', '']
           experiments:

diff --git a/experiments/amg2023/openmp/execute_experiment.tpl b/experiments/amg2023/openmp/execute_experiment.tpl
@@ -10,8 +10,4 @@
 
 cd {experiment_run_dir}
 
-{spack_setup}
-
-{experiment_setup}
-
 {command}
diff --git a/experiments/amg2023/openmp/ramble.yaml b/experiments/amg2023/openmp/ramble.yaml
@@ -31,7 +31,6 @@ ramble:
             nx: '{n}'
             ny: '{n}'
             nz: '{n}'
-            experiment_setup: ''
             processes_per_node: ['8', '4']
             n_nodes: ['1', '2']
             threads_per_node_core: ['8', '10', '13'] #TODO: Specify n_threads according to available n_nodes and n_ranks

diff --git a/experiments/amg2023/rocm/execute_experiment.tpl b/experiments/amg2023/rocm/execute_experiment.tpl
@@ -10,8 +10,4 @@
 
 cd {experiment_run_dir}
 
-{spack_setup}
-
-{experiment_setup} #TODO: Add experiment specific code here
-
 {command}
diff --git a/experiments/amg2023/rocm/ramble.yaml b/experiments/amg2023/rocm/ramble.yaml
@@ -23,7 +23,6 @@ ramble:
             nx: '{n}'
             ny: '{n}'
             nz: '{n}'
-            experiment_setup: ''
           experiments:
             '{env_name}_problem1_{n_nodes}_{px}_{py}_{pz}_{nx}_{ny}_{nz}':
               variables:

diff --git a/experiments/hpcc/mpi-only/execute_experiment.tpl b/experiments/hpcc/mpi-only/execute_experiment.tpl
@@ -10,8 +10,4 @@
 
 cd {experiment_run_dir}
 
-{spack_setup}
-
-{experiment_setup}
-
 {command}
diff --git a/experiments/hpcc/mpi-only/ramble.yaml b/experiments/hpcc/mpi-only/ramble.yaml
@@ -20,7 +20,6 @@ ramble:
         standard:
           variables:
             n_ranks: ['1', '2', '4', '8']
-            experiment_setup: ''
           experiments:
             hpcc_standard_{n_nodes}_{n_ranks}:
               variables:

diff --git a/experiments/hpcg/openmp/execute_experiment.tpl b/experiments/hpcg/openmp/execute_experiment.tpl
@@ -10,6 +10,4 @@
 
 cd {experiment_run_dir}
 
-{spack_setup}
-
 {command}
diff --git a/experiments/hpl/openmp/execute_experiment.tpl b/experiments/hpl/openmp/execute_experiment.tpl
@@ -10,8 +10,4 @@
 
 cd {experiment_run_dir}
 
-{spack_setup}
-
-{experiment_setup}
-
 {command}
diff --git a/experiments/hpl/openmp/ramble.yaml b/experiments/hpl/openmp/ramble.yaml
@@ -30,7 +30,6 @@ ramble:
             Ns: 10000
             N-NBs: 1
             NBs: 128
-            experiment_setup: ''
             processes_per_node: '8'
             n_nodes: '1'
             omp_num_threads: ['2', '4', '8']

diff --git a/experiments/lammps/openmp/execute_experiment.tpl b/experiments/lammps/openmp/execute_experiment.tpl
@@ -10,6 +10,4 @@
 
 cd {experiment_run_dir}
 
-{spack_setup}
-
 {command}
diff --git a/experiments/lbann/cuda/execute_experiment.tpl b/experiments/lbann/cuda/execute_experiment.tpl
@@ -10,8 +10,4 @@
 
 cd {experiment_run_dir}
 
-{spack_setup}
-
-{experiment_setup}
-
 {command}
diff --git a/experiments/lbann/cuda/ramble.yaml b/experiments/lbann/cuda/ramble.yaml
@@ -31,7 +31,6 @@ ramble:
             nx: '{n}'
             ny: '{n}'
             nz: '{n}'
-            experiment_setup: ''
             processes_per_node: ['8', '4']
             n_nodes: ['1', '2']
             threads_per_node_core: ['8', '10', '13'] #TODO: Specify n_threads according to available n_nodes and n_ranks

diff --git a/experiments/lbann/rocm/execute_experiment.tpl b/experiments/lbann/rocm/execute_experiment.tpl
@@ -10,8 +10,4 @@
 
 cd {experiment_run_dir}
 
-{spack_setup}
-
-{experiment_setup}
-
 {command}
diff --git a/experiments/md-test/mpi-only/execute_experiment.tpl b/experiments/md-test/mpi-only/execute_experiment.tpl
@@ -10,8 +10,4 @@
 
 cd {experiment_run_dir}
 
-{spack_setup}
-
-{experiment_setup}
-
 {command}
diff --git a/experiments/md-test/mpi-only/ramble.yaml b/experiments/md-test/mpi-only/ramble.yaml
@@ -21,7 +21,6 @@ ramble:
           variables:
             n_ranks: ['1', '2', '4', '8']
             n_nodes: '1'
-            experiment_setup: ''
           experiments:
             mdtest_multifile_{num-objects}_{iterations}_{additional-args}_{n_nodes}_{n_ranks}:
               variables:

diff --git a/experiments/osu-micro-benchmarks/mpi-only/execute_experiment.tpl b/experiments/osu-micro-benchmarks/mpi-only/execute_experiment.tpl
@@ -10,6 +10,4 @@
 
 cd {experiment_run_dir}
 
-{spack_setup}
-
 {command}
diff --git a/experiments/raja-perf/cuda/execute_experiment.tpl b/experiments/raja-perf/cuda/execute_experiment.tpl
@@ -10,6 +10,4 @@
 
 cd {experiment_run_dir}
 
-{spack_setup}
-
 {command}
diff --git a/experiments/raja-perf/mpi-only/execute_experiment.tpl b/experiments/raja-perf/mpi-only/execute_experiment.tpl
@@ -10,6 +10,4 @@
 
 cd {experiment_run_dir}
 
-{spack_setup}
-
 {command}
diff --git a/experiments/raja-perf/openmp/execute_experiment.tpl b/experiments/raja-perf/openmp/execute_experiment.tpl
@@ -10,6 +10,4 @@
 
 cd {experiment_run_dir}
 
-{spack_setup}
-
 {command}
diff --git a/experiments/raja-perf/rocm/execute_experiment.tpl b/experiments/raja-perf/rocm/execute_experiment.tpl
@@ -10,6 +10,4 @@
 
 cd {experiment_run_dir}
 
-{spack_setup}
-
 {command}
diff --git a/experiments/saxpy/cuda/execute_experiment.tpl b/experiments/saxpy/cuda/execute_experiment.tpl
@@ -9,6 +9,4 @@
 
 cd {experiment_run_dir}
 
-{spack_setup}
-
 {command}
diff --git a/experiments/saxpy/openmp/execute_experiment.tpl b/experiments/saxpy/openmp/execute_experiment.tpl
@@ -10,6 +10,4 @@
 
 cd {experiment_run_dir}
 
-{spack_setup}
-
 {command}
diff --git a/experiments/saxpy/rocm/execute_experiment.tpl b/experiments/saxpy/rocm/execute_experiment.tpl
@@ -10,6 +10,4 @@
 
 cd {experiment_run_dir}
 
-{spack_setup}
-
 {command}
diff --git a/experiments/stream/openmp/execute_experiment.tpl b/experiments/stream/openmp/execute_experiment.tpl
@@ -10,6 +10,4 @@
 
 cd {experiment_run_dir}
 
-{spack_setup}
-
 {command}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,6 +9,4 @@

		cd {experiment_run_dir}

		{spack_setup}

		{command}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,6 +10,4 @@

		cd {experiment_run_dir}

		{spack_setup}

		{command}