From 564df51c93e25ba0a92fc082bbdae43bfc8035ee Mon Sep 17 00:00:00 2001 From: Riyaz Haque <5333387+rfhaque@users.noreply.github.com> Date: Mon, 13 May 2024 12:09:02 -0700 Subject: [PATCH] Change default compiler on lassen from xl to clang-ibm (#243) Co-authored-by: Riyaz Haque --- .../auxiliary_software_files/compilers.yaml | 16 ++++++++++++++++ .../auxiliary_software_files/packages.yaml | 4 ++++ .../spack.yaml | 12 ++++++++++-- experiments/amg2023/cuda/ramble.yaml | 8 ++++++-- experiments/gromacs/cuda/ramble.yaml | 10 +++++----- experiments/kripke/cuda/ramble.yaml | 4 ++++ experiments/raja-perf/cuda/ramble.yaml | 6 +++++- experiments/saxpy/cuda/ramble.yaml | 6 +++++- 8 files changed, 55 insertions(+), 11 deletions(-) diff --git a/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/auxiliary_software_files/compilers.yaml b/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/auxiliary_software_files/compilers.yaml index 4e4c457a1..bcfcd8000 100644 --- a/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/auxiliary_software_files/compilers.yaml +++ b/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/auxiliary_software_files/compilers.yaml @@ -4,6 +4,22 @@ # SPDX-License-Identifier: Apache-2.0 compilers: +- compiler: + spec: clang@16.0.6-ibm-cuda-11.8.0-gcc-11.2.1 + paths: + cc: /usr/tce/packages/clang/clang-ibm-16.0.6-cuda-11.8.0-gcc-11.2.1/bin/clang + cxx: /usr/tce/packages/clang/clang-ibm-16.0.6-cuda-11.8.0-gcc-11.2.1/bin/clang++ + f77: /usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/bin/xlf_r + fc: /usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/bin/xlf_r + flags: + cflags: -g -O2 + cxxflags: -g -O2 -std=c++17 + fflags: -g -O2 + operating_system: rhel7 + target: ppc64le + modules: [cuda/11.8.0, clang/ibm-16.0.6-cuda-11.8.0-gcc-11.2.1] + environment: {} + extra_rpaths: [] - compiler: spec: xl@16.1.1-2023.06.28-cuda-11.8.0-gcc-11.2.1 paths: diff --git a/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/auxiliary_software_files/packages.yaml b/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/auxiliary_software_files/packages.yaml index 5d26658c1..e3877a10a 100644 --- a/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/auxiliary_software_files/packages.yaml +++ b/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/auxiliary_software_files/packages.yaml @@ -77,6 +77,10 @@ packages: buildable: false mpi: externals: + - spec: spectrum-mpi@2023.06.28-clang-ibm-16.0.6-cuda-11.8.0-gcc-11.2.1 + prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-16.0.6-cuda-11.8.0-gcc-11.2.1 + extra_attributes: + ldflags: "-lmpiprofilesupport -lmpi_ibm_usempi -lmpi_ibm_mpifh -lmpi_ibm" - spec: spectrum-mpi@2023.06.28-cuda-11.8.0-gcc-11.2.1 prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2023.06.28-cuda-11.8.0-gcc-11.2.1 extra_attributes: diff --git a/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/spack.yaml b/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/spack.yaml index 7b2f4257b..3e1cce76f 100644 --- a/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/spack.yaml +++ b/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/spack.yaml @@ -6,8 +6,12 @@ spack: packages: default-compiler: - spack_spec: xl@16.1.1-2023.06.28-cuda-{default_cuda_version}-gcc-11.2.1 + spack_spec: clang@16.0.6-ibm-cuda-{default_cuda_version}-gcc-11.2.1 default-mpi: + spack_spec: spectrum-mpi@2023.06.28-clang-ibm-16.0.6-cuda-{default_cuda_version}-gcc-11.2.1 + compiler-xl: + spack_spec: xl@16.1.1-2023.06.28-cuda-{default_cuda_version}-gcc-11.2.1 + mpi-xl: spack_spec: spectrum-mpi@2023.06.28-cuda-{default_cuda_version}-gcc-11.2.1 compiler-gcc: spack_spec: gcc@8.3.1 @@ -15,8 +19,12 @@ spack: spack_spec: clang@16.0.6-cuda{default_cuda_version} mpi-clang: spack_spec: spectrum-mpi@2022.08.19-clang16.0.6-cuda-{default_cuda_version} + compiler-clang-ibm: + spack_spec: clang@16.0.6-ibm-cuda-{default_cuda_version}-gcc-11.2.1 + mpi-clang-ibm: + spack_spec: spectrum-mpi@2023.06.28-clang-ibm-16.0.6-cuda-{default_cuda_version}-gcc-11.2.1 blas: - spack_spec: cublas@11.8.0 + spack_spec: cublas@{default_cuda_version} cublas-cuda: spack_spec: cublas@{default_cuda_version} lapack: diff --git a/experiments/amg2023/cuda/ramble.yaml b/experiments/amg2023/cuda/ramble.yaml index 0b9587f5b..0a5d7f76d 100644 --- a/experiments/amg2023/cuda/ramble.yaml +++ b/experiments/amg2023/cuda/ramble.yaml @@ -48,15 +48,19 @@ ramble: spack: concretized: true packages: + cuda: + spack_spec: cuda@{default_cuda_version}+allow-unsupported-compilers + compiler: default-compiler hypre: - spack_spec: hypre@2.28.0 +mpi+cuda+mixedint{modifier_spack_variant} cuda_arch=={cuda_arch} ^cuda@{default_cuda_version} + spack_spec: hypre@2.28.0 +mpi+cuda+mixedint{modifier_spack_variant} cuda_arch=={cuda_arch} compiler: default-compiler amg2023: - spack_spec: amg2023@develop +mpi+cuda{modifier_spack_variant} cuda_arch=={cuda_arch} ^cuda@{default_cuda_version} + spack_spec: amg2023@develop +mpi+cuda{modifier_spack_variant} cuda_arch=={cuda_arch} compiler: default-compiler environments: amg2023: packages: + - cuda - cublas-cuda - lapack - default-mpi diff --git a/experiments/gromacs/cuda/ramble.yaml b/experiments/gromacs/cuda/ramble.yaml index 6591db87b..0dc188d0f 100644 --- a/experiments/gromacs/cuda/ramble.yaml +++ b/experiments/gromacs/cuda/ramble.yaml @@ -44,18 +44,18 @@ ramble: spack: concretized: true packages: - gromacs: - spack_spec: gromacs@2023.3 +mpi+openmp+cuda~hwloc~double cuda_arch=={cuda_arch} - compiler: compiler-clang cuda: spack_spec: cuda@{default_cuda_version}+allow-unsupported-compilers - compiler: compiler-clang + compiler: default-compiler + gromacs: + spack_spec: gromacs@2023.3 +mpi+openmp+cuda~hwloc~double cuda_arch=={cuda_arch} + compiler: default-compiler environments: gromacs: packages: - cuda - blas - lapack - - mpi-clang + - default-mpi - fftw - gromacs diff --git a/experiments/kripke/cuda/ramble.yaml b/experiments/kripke/cuda/ramble.yaml index b4771bdba..e33617839 100644 --- a/experiments/kripke/cuda/ramble.yaml +++ b/experiments/kripke/cuda/ramble.yaml @@ -43,12 +43,16 @@ ramble: spack: concretized: true packages: + cuda: + spack_spec: cuda@{default_cuda_version}+allow-unsupported-compilers + compiler: default-compiler kripke: spack_spec: kripke@1.2.7.0 +mpi+cuda{modifier_spack_variant} ^chai@2024.02 compiler: default-compiler environments: kripke: packages: + - cuda - default-mpi - kripke - '{modifier_package_name}' diff --git a/experiments/raja-perf/cuda/ramble.yaml b/experiments/raja-perf/cuda/ramble.yaml index 070d4f1c1..607b10fea 100644 --- a/experiments/raja-perf/cuda/ramble.yaml +++ b/experiments/raja-perf/cuda/ramble.yaml @@ -26,11 +26,15 @@ ramble: spack: concretized: true packages: + cuda: + spack_spec: cuda@{default_cuda_version}+allow-unsupported-compilers + compiler: default-compiler raja-perf: - spack_spec: raja-perf@develop +cuda~openmp+mpi cuda_arch=={cuda_arch} ^cuda@{default_cuda_version} + spack_spec: raja-perf@develop +cuda~openmp+mpi cuda_arch=={cuda_arch} compiler: default-compiler environments: raja-perf: packages: + - cuda - default-mpi - raja-perf diff --git a/experiments/saxpy/cuda/ramble.yaml b/experiments/saxpy/cuda/ramble.yaml index f1260d196..a819742b0 100644 --- a/experiments/saxpy/cuda/ramble.yaml +++ b/experiments/saxpy/cuda/ramble.yaml @@ -32,12 +32,16 @@ ramble: spack: concretized: true packages: + cuda: + spack_spec: cuda@{default_cuda_version}+allow-unsupported-compilers + compiler: default-compiler saxpy: - spack_spec: saxpy@1.0.0 +cuda{modifier_spack_variant} cuda_arch=={cuda_arch} ~openmp ^cuda@{default_cuda_version} + spack_spec: saxpy@1.0.0 +cuda{modifier_spack_variant} cuda_arch=={cuda_arch} ~openmp compiler: default-compiler environments: saxpy: packages: + - cuda - default-mpi - saxpy - '{modifier_package_name}'