Change default compiler on lassen from xl to clang-ibm (#243)

Co-authored-by: Riyaz Haque <[email protected]>
LLNL · May 13, 2024 · 564df51 · 564df51
1 parent eec41da
commit 564df51
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 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
@@ -4,6 +4,22 @@
 # SPDX-License-Identifier: Apache-2.0
 
 compilers:
+- compiler:
+    spec: [email protected]
+    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: [email protected]
     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
@@ -77,6 +77,10 @@ packages:
       buildable: false
   mpi:
     externals:
+    - spec: [email protected]
+      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: [email protected]
       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
@@ -6,17 +6,25 @@
 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: [email protected]{default_cuda_version}-gcc-11.2.1
+    compiler-xl:
+      spack_spec: [email protected]{default_cuda_version}-gcc-11.2.1
+    mpi-xl:
       spack_spec: [email protected]{default_cuda_version}-gcc-11.2.1
     compiler-gcc:
       spack_spec: [email protected]
     compiler-clang:
       spack_spec: [email protected]{default_cuda_version}
     mpi-clang:
       spack_spec: [email protected]{default_cuda_version}
+    compiler-clang-ibm:
+      spack_spec: [email protected]{default_cuda_version}-gcc-11.2.1
+    mpi-clang-ibm:
+      spack_spec: [email protected]{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
@@ -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: [email protected] +mpi+cuda+mixedint{modifier_spack_variant} cuda_arch=={cuda_arch} ^cuda@{default_cuda_version}
+        spack_spec: [email protected] +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
@@ -44,18 +44,18 @@ ramble:
   spack:
     concretized: true
     packages:
-      gromacs:
-        spack_spec: [email protected] +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: [email protected] +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
@@ -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: [email protected] +mpi+cuda{modifier_spack_variant} ^[email protected]
         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
@@ -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
@@ -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: [email protected] +cuda{modifier_spack_variant} cuda_arch=={cuda_arch} ~openmp ^cuda@{default_cuda_version}
+        spack_spec: [email protected] +cuda{modifier_spack_variant} cuda_arch=={cuda_arch} ~openmp
         compiler: default-compiler
     environments:
       saxpy:
         packages:
+        - cuda
         - default-mpi
         - saxpy
         - '{modifier_package_name}'