From c6fbada51ddf57212ed45d169e0bcf560a8c744e Mon Sep 17 00:00:00 2001 From: Riyaz Haque <5333387+rfhaque@users.noreply.github.com> Date: Mon, 5 Feb 2024 11:35:04 -0800 Subject: [PATCH] Remove MPS and cuda10 (#128) Co-authored-by: Riyaz Haque --- .../spack.yaml | 6 +-- .../variables.yaml | 2 - .../amg2023/cuda/execute_experiment.tpl | 2 - experiments/amg2023/cuda/ramble.yaml | 42 +++++++------------ experiments/saxpy/cuda/execute_experiment.tpl | 1 - 5 files changed, 15 insertions(+), 38 deletions(-) diff --git a/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/spack.yaml b/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/spack.yaml index bdebba667..91d89957a 100644 --- a/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/spack.yaml +++ b/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/spack.yaml @@ -11,11 +11,7 @@ spack: spack_spec: spectrum-mpi@2022.08.19 compiler-gcc: spack_spec: gcc@8.3.1 - compiler-cuda10: - spack_spec: xl@16.1.1-2022.08.19-cuda{cuda10_version} - cublas-cuda-10: - spack_spec: cublas@{cuda10_version} - cublas-cuda-default: + cublas-cuda: spack_spec: cublas@{default_cuda_version} lapack: spack_spec: lapack-xl@3.9.0 diff --git a/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/variables.yaml b/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/variables.yaml index 717ed9d76..e7a6b343d 100644 --- a/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/variables.yaml +++ b/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/variables.yaml @@ -11,7 +11,5 @@ variables: batch_nodes: '#BSUB -nnodes {n_nodes}' batch_ranks: '#BSUB -nnodes {n_nodes}' batch_timeout: '#BSUB -W {batch_time}' - cuda10_version: '10.1.243' default_cuda_version: '11.8.0' cuda_arch: '70' - enable_mps: '/usr/tcetmp/bin/enable_mps' diff --git a/experiments/amg2023/cuda/execute_experiment.tpl b/experiments/amg2023/cuda/execute_experiment.tpl index 1343ccb0c..ef9137989 100755 --- a/experiments/amg2023/cuda/execute_experiment.tpl +++ b/experiments/amg2023/cuda/execute_experiment.tpl @@ -11,6 +11,4 @@ cd {experiment_run_dir} {spack_setup} -{experiment_setup} #TODO: Add experiment specific code here - {command} diff --git a/experiments/amg2023/cuda/ramble.yaml b/experiments/amg2023/cuda/ramble.yaml index 741754c2d..3d518905b 100644 --- a/experiments/amg2023/cuda/ramble.yaml +++ b/experiments/amg2023/cuda/ramble.yaml @@ -27,21 +27,11 @@ ramble: gtl: ['gtl', 'nogtl'] gtlflag: ['-M"-gpu"', ''] experiments: - # because MPS only works for cuda<=v10 - amg2023_cuda_10_problem1_{gtl}_{n_nodes}_{px}_{py}_{pz}_{nx}_{ny}_{nz}: + amg2023_cuda_problem1_{gtl}_{n_nodes}_{px}_{py}_{pz}_{nx}_{ny}_{nz}: variables: - experiment_setup: '{enable_mps}' - env_name: amg2023-cuda-10 - processes_per_node: '8' - n_nodes: '1' - matrices: - - size: - - n - amg2023_cuda_default_problem1_{gtl}_{n_nodes}_{px}_{py}_{pz}_{nx}_{ny}_{nz}: - variables: - env_name: amg2023-cuda-default - processes_per_node: ['4', '2'] - n_nodes: ['2', '4'] + env_name: amg2023 + processes_per_node: '4' + n_nodes: '2' zips: gtl_info: - gtl @@ -52,22 +42,18 @@ ramble: - gtl_info spack: concretized: true - variables: - cuda_version: ['{cuda10_version}', '{default_cuda_version}'] - cuda_compiler: ['compiler-cuda10', 'default-compiler'] - versions: ['10', 'default'] packages: - hypre-cuda-{versions}: - spack_spec: 'hypre@2.28.0 +mpi+cuda+mixedint cuda_arch=={cuda_arch} ^cuda@{cuda_version}' - compiler: '{cuda_compiler}' - amg2023-cuda-{versions}: - spack_spec: 'amg2023@develop +mpi+cuda ^cuda@{cuda_version}' - compiler: '{cuda_compiler}' + hypre: + spack_spec: hypre@2.28.0 +mpi+cuda+mixedint cuda_arch=={cuda_arch} ^cuda@{default_cuda_version} + compiler: default-compiler + amg2023: + spack_spec: amg2023@develop +mpi+cuda ^cuda@{default_cuda_version} + compiler: default-compiler environments: - amg2023-cuda-{versions}: + amg2023: packages: - - cublas-cuda-{versions} + - cublas-cuda - lapack - default-mpi - - hypre-cuda-{versions} - - amg2023-cuda-{versions} + - hypre + - amg2023 diff --git a/experiments/saxpy/cuda/execute_experiment.tpl b/experiments/saxpy/cuda/execute_experiment.tpl index d24437712..ef9137989 100755 --- a/experiments/saxpy/cuda/execute_experiment.tpl +++ b/experiments/saxpy/cuda/execute_experiment.tpl @@ -5,7 +5,6 @@ # SPDX-License-Identifier: Apache-2.0 {batch_nodes} -{batch_ranks} {batch_timeout} cd {experiment_run_dir}