Skip to content

Commit

Permalink
Merge branch 'develop' into feature/lammps
Browse files Browse the repository at this point in the history
  • Loading branch information
@pearce8
pearce8 authored Feb 6, 2024
2 parents b523ad0 + aa45757 commit f0a384e
Show file tree
Hide file tree
Showing 28 changed files with 2 additions and 61 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@87c3283f01cd6fe19a0ab93a23b2f6fcba5a8e42
uses: actions/deploy-pages@decdde0ac072f6dcbe43649d82d9c635fff5b4e4
2 changes: 1 addition & 1 deletion .github/workflows/run.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
- name: Upload Workspace Archive as CI Artifact
if: always()
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
with:
name: workspace-archive
path: './workspace/saxpy/openmp/nosite-x86_64/workspace/archive/**'
Expand Down
2 changes: 0 additions & 2 deletions experiments/amg2023/cuda/execute_experiment.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@

cd {experiment_run_dir}

{spack_setup}

{command}
1 change: 0 additions & 1 deletion experiments/amg2023/cuda/ramble.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ ramble:
nx: '{n}'
ny: '{n}'
nz: '{n}'
experiment_setup: ''
gtl: ['gtl', 'nogtl']
gtlflag: ['-M"-gpu"', '']
experiments:
Expand Down
4 changes: 0 additions & 4 deletions experiments/amg2023/openmp/execute_experiment.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,4 @@

cd {experiment_run_dir}

{spack_setup}

{experiment_setup}

{command}
1 change: 0 additions & 1 deletion experiments/amg2023/openmp/ramble.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions experiments/amg2023/rocm/execute_experiment.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,4 @@

cd {experiment_run_dir}

{spack_setup}

{experiment_setup} #TODO: Add experiment specific code here

{command}
1 change: 0 additions & 1 deletion experiments/amg2023/rocm/ramble.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 0 additions & 4 deletions experiments/hpcc/mpi-only/execute_experiment.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,4 @@

cd {experiment_run_dir}

{spack_setup}

{experiment_setup}

{command}
1 change: 0 additions & 1 deletion experiments/hpcc/mpi-only/ramble.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ ramble:
standard:
variables:
n_ranks: ['1', '2', '4', '8']
experiment_setup: ''
experiments:
hpcc_standard_{n_nodes}_{n_ranks}:
variables:
Expand Down
2 changes: 0 additions & 2 deletions experiments/hpcg/openmp/execute_experiment.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,4 @@

cd {experiment_run_dir}

{spack_setup}

{command}
4 changes: 0 additions & 4 deletions experiments/hpl/openmp/execute_experiment.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,4 @@

cd {experiment_run_dir}

{spack_setup}

{experiment_setup}

{command}
1 change: 0 additions & 1 deletion experiments/hpl/openmp/ramble.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
2 changes: 0 additions & 2 deletions experiments/lammps/openmp/execute_experiment.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,4 @@

cd {experiment_run_dir}

{spack_setup}

{command}
4 changes: 0 additions & 4 deletions experiments/lbann/cuda/execute_experiment.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,4 @@

cd {experiment_run_dir}

{spack_setup}

{experiment_setup}

{command}
1 change: 0 additions & 1 deletion experiments/lbann/cuda/ramble.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions experiments/lbann/rocm/execute_experiment.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,4 @@

cd {experiment_run_dir}

{spack_setup}

{experiment_setup}

{command}
4 changes: 0 additions & 4 deletions experiments/md-test/mpi-only/execute_experiment.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,4 @@

cd {experiment_run_dir}

{spack_setup}

{experiment_setup}

{command}
1 change: 0 additions & 1 deletion experiments/md-test/mpi-only/ramble.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions experiments/osu-micro-benchmarks/mpi-only/execute_experiment.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,4 @@

cd {experiment_run_dir}

{spack_setup}

{command}
2 changes: 0 additions & 2 deletions experiments/raja-perf/cuda/execute_experiment.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,4 @@

cd {experiment_run_dir}

{spack_setup}

{command}
2 changes: 0 additions & 2 deletions experiments/raja-perf/mpi-only/execute_experiment.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,4 @@

cd {experiment_run_dir}

{spack_setup}

{command}
2 changes: 0 additions & 2 deletions experiments/raja-perf/openmp/execute_experiment.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,4 @@

cd {experiment_run_dir}

{spack_setup}

{command}
2 changes: 0 additions & 2 deletions experiments/raja-perf/rocm/execute_experiment.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,4 @@

cd {experiment_run_dir}

{spack_setup}

{command}
2 changes: 0 additions & 2 deletions experiments/saxpy/cuda/execute_experiment.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@

cd {experiment_run_dir}

{spack_setup}

{command}
2 changes: 0 additions & 2 deletions experiments/saxpy/openmp/execute_experiment.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,4 @@

cd {experiment_run_dir}

{spack_setup}

{command}
2 changes: 0 additions & 2 deletions experiments/saxpy/rocm/execute_experiment.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,4 @@

cd {experiment_run_dir}

{spack_setup}

{command}
2 changes: 0 additions & 2 deletions experiments/stream/openmp/execute_experiment.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,4 @@

cd {experiment_run_dir}

{spack_setup}

{command}

0 comments on commit f0a384e

Please sign in to comment.