Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Config updates #108

Merged
merged 19 commits into from
Sep 5, 2024
Merged

Config updates #108

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9b2b62f
Remove intel 19, update to intel 2023
adrienbernede Aug 5, 2024
df57100
Update rocm and cce versions
adrienbernede Aug 5, 2024
2785d39
Lassen: Cleaning old compilers, adding potentially interesting newer …
adrienbernede Aug 5, 2024
8978ee0
Lassen: Activate new specs
adrienbernede Aug 6, 2024
61779e2
Fix: add missing clang 16 compilers
adrienbernede Aug 6, 2024
b0bdf60
Add missing compilers and corresponding external packages
adrienbernede Aug 6, 2024
b9739eb
Revert updating to rocm 6.0.2 on corona
adrienbernede Aug 6, 2024
7e6f52c
Fix: need to point at compiler wrapper with cuda 11.8 defined, module…
adrienbernede Aug 6, 2024
f0f0c1a
Fix: use wrapper with cuda 11.8 consistently + change in naming conve…
adrienbernede Aug 7, 2024
9639236
Add cuda to xl spec relying on LC wrapper with cuda
adrienbernede Aug 7, 2024
e4d5ecf
Fix previous commit
adrienbernede Aug 7, 2024
6e5c30d
Clean drop of rocm 5.7.0 in favor on 5.7.1 on corona
adrienbernede Aug 7, 2024
df21a7f
Update cray-mpich and add rocm 6.2.0
adrienbernede Aug 9, 2024
f504356
Update rocm in tioga CI
adrienbernede Aug 9, 2024
af9fadf
Enforce coherency between rocm software stack and compiler
adrienbernede Aug 9, 2024
56c55b0
Fix oversight
adrienbernede Aug 9, 2024
4e80464
Fix typo: rocm compiler is rocmcc
adrienbernede Aug 15, 2024
35c1ae0
Remove XL jobs from shared CI jobs
adrienbernede Sep 4, 2024
687bb32
Remove redundant spec per review comments
adrienbernede Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 61 additions & 31 deletions blueos_3_ppc64le_ib/spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,32 +28,6 @@ spack:
view: false

compilers::
- compiler:
spec: clang@=3.9.1
paths:
cc: /usr/tcetmp/packages/clang/clang-3.9.1/bin/clang
cxx: /usr/tcetmp/packages/clang/clang-3.9.1/bin/clang++
fc: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r
f77: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf_r
flags: {}
operating_system: rhel7
target: ppc64le
modules: []
environment: {}
extra_rpaths: []
- compiler:
spec: clang@=4.0.0
paths:
cc: /usr/tcetmp/packages/clang/clang-4.0.0/bin/clang
cxx: /usr/tcetmp/packages/clang/clang-4.0.0/bin/clang++
fc: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r
f77: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf_r
flags: {}
operating_system: rhel7
target: ppc64le
modules: []
environment: {}
extra_rpaths: []
- compiler:
spec: clang@=9.0.0
paths:
Expand Down Expand Up @@ -197,6 +171,19 @@ spack:
modules: []
environment: {}
extra_rpaths: []
- compiler:
spec: clang@=16.0.6.cuda.11.8.0.gcc.11.2.1
paths:
cc: /usr/tce/packages/clang/clang-16.0.6-cuda-11.8.0-gcc-11.2.1/bin/clang
cxx: /usr/tce/packages/clang/clang-16.0.6-cuda-11.8.0-gcc-11.2.1/bin/clang++
fc: /usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/bin/xlf2003_r
f77: /usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/bin/xlf_r
flags: {}
operating_system: rhel7
target: ppc64le
modules: []
environment: {}
extra_rpaths: []
- compiler:
spec: clang@=9.0.0.ibm
paths:
Expand Down Expand Up @@ -340,6 +327,19 @@ spack:
modules: []
environment: {}
extra_rpaths: []
- 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++
fc: /usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1//bin/xlf2003_r
f77: /usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1//bin/xlf_r
flags: {}
operating_system: rhel7
target: ppc64le
modules: []
environment: {}
extra_rpaths: []
- compiler:
spec: clang@=coral2018.08.08
paths:
Expand Down Expand Up @@ -405,6 +405,19 @@ spack:
modules: []
environment: {}
extra_rpaths: []
- compiler:
spec: gcc@=11.2.1
paths:
cc: /usr/tce/packages/gcc/gcc-11.2.1/bin/gcc
cxx: /usr/tce/packages/gcc/gcc-11.2.1/bin/g++
f77: /usr/tce/packages/gcc/gcc-11.2.1/bin/gfortran
fc: /usr/tce/packages/gcc/gcc-11.2.1/bin/gfortran
flags: {}
operating_system: rhel7
target: ppc64le
modules: []
environment: {}
extra_rpaths: []
- compiler:
spec: xl@=default
paths:
Expand Down Expand Up @@ -509,6 +522,19 @@ spack:
modules: []
environment: {}
extra_rpaths: []
- compiler:
spec: xl@=16.1.1.14.cuda.11.8.0.gcc.11.2.1
paths:
cc: /usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/bin/xlc_r
cxx: /usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/bin/xlC_r
fc: /usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/bin/xlf2003_r
f77: /usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/bin/xlf_r
flags: {}
operating_system: rhel7
target: ppc64le
modules: []
environment: {}
extra_rpaths: []
- compiler:
spec: pgi@=default
paths:
Expand Down Expand Up @@ -628,11 +654,13 @@ spack:
- spec: cmake@3.23.1
prefix: /usr/tce/packages/cmake/cmake-3.23.1
cuda:
version: [12.0.0, 11.7.0, 11.5.0, 11.2.0, 11.1.0, 11.0.2, 10.2.89, 10.1.243, 10.1.168, 9.2.148, 8.0]
version: [12.0.0, 11.8.0, 11.7.0, 11.5.0, 11.2.0, 11.1.0, 11.0.2, 10.2.89, 10.1.243, 10.1.168, 9.2.148, 8.0]
buildable: false
externals:
- spec: cuda@12.0.0+allow-unsupported-compilers
prefix: /usr/tce/packages/cuda/cuda-12.0.0
- spec: cuda@11.8.0+allow-unsupported-compilers
prefix: /usr/tce/packages/cuda/cuda-11.8.0
- spec: cuda@11.7.0+allow-unsupported-compilers
prefix: /usr/tce/packages/cuda/cuda-11.7.0
- spec: cuda@11.5.0+allow-unsupported-compilers
Expand Down Expand Up @@ -672,10 +700,8 @@ spack:
prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-4.9.3
- spec: spectrum-mpi@10.3.1.03rtm0%gcc@=8.3.1
prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1
- spec: spectrum-mpi@10.3.1.03rtm0%clang@=3.9.1
prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-3.9.1
- spec: spectrum-mpi@10.3.1.03rtm0%clang@=4.0.0
prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-4.0.0
- spec: spectrum-mpi@10.3.1.03rtm0%gcc@=11.2.1
prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-11.2.1
- spec: spectrum-mpi@10.3.1.03rtm0%clang@=9.0.0
prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-9.0.0
- spec: spectrum-mpi@10.3.1.03rtm0%clang@=10.0.1
Expand All @@ -698,6 +724,8 @@ spack:
prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-16.0.6
- spec: spectrum-mpi@10.3.1.03rtm0%clang@=16.0.6.gcc.8.3.1
prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-16.0.6-gcc-8.3.1
- spec: spectrum-mpi@10.3.1.03rtm0%clang@=16.0.6.cuda.11.8.0.gcc.11.2.1.cuda.11.8.0
adrienbernede marked this conversation as resolved.
Show resolved Hide resolved
prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-16.0.6-cuda-11.8.0-gcc-11.2.1
- spec: spectrum-mpi@10.3.1.03rtm0%clang@=9.0.0.ibm
prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-2019.10.03
- spec: spectrum-mpi@10.3.1.03rtm0%clang@=10.0.1.ibm
Expand All @@ -720,6 +748,8 @@ spack:
prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-16.0.6
- spec: spectrum-mpi@10.3.1.03rtm0%clang@=16.0.6.ibm.gcc.8.3.1
prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-16.0.6-gcc-8.3.1
- spec: spectrum-mpi@10.3.1.03rtm0%clang@=16.0.6.ibm.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
- spec: spectrum-mpi@10.3.1.03rtm0%xl@=16.1.1.10
prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2021.09.22
- spec: spectrum-mpi@10.3.1.03rtm0%xl@=16.1.1.10.gcc.8.3.1
Expand Down
4 changes: 2 additions & 2 deletions gitlab/radiuss-jobs/corona.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# SPDX-License-Identifier: (MIT)
##############################################################################

rocmcc_5_7_0_hip:
rocmcc_5_7_1_hip:
variables:
SPEC: "${PROJECT_CORONA_VARIANTS} +rocm amdgpu_target=gfx906 %rocmcc@=5.7.0 ^hip@5.7.0 ${PROJECT_CORONA_DEPS}"
SPEC: "${PROJECT_CORONA_VARIANTS} +rocm amdgpu_target=gfx906 %rocmcc@=5.7.1 ^hip@5.7.1 ${PROJECT_CORONA_DEPS}"
extends: .job_on_corona
27 changes: 25 additions & 2 deletions gitlab/radiuss-jobs/lassen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
# SPDX-License-Identifier: (MIT)
##############################################################################

clang_12_0_1_ibm_gcc_8_3_1_cuda_10_1_243:
clang_12_0_1_ibm_gcc_8_3_1_cuda_11_2_0:
variables:
SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %clang@=12.0.1.ibm.gcc.8.3.1 ^cuda@10.1.243+allow-unsupported-compilers ${PROJECT_LASSEN_DEPS}"
SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %clang@=12.0.1.ibm.gcc.8.3.1 ^cuda@11.2.0+allow-unsupported-compilers ${PROJECT_LASSEN_DEPS}"
MODULE_LIST: "cuda/10.1.243"
extends: .job_on_lassen

Expand All @@ -23,15 +23,38 @@ clang_14_0_5_gcc_8_3_1_cuda_11_7_0:
MODULE_LIST: "cuda/11.7.0"
extends: .job_on_lassen

clang_16_0_6_ibm_gcc_11_2_1_cuda_11_8_0:
variables:
SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %clang@=16.0.6.ibm.cuda.11.8.0.gcc.11.2.1 ^cuda@11.8.0+allow-unsupported-compilers ${PROJECT_LASSEN_DEPS}"
MODULE_LIST: "cuda/11.8.0"
extends: .job_on_lassen

clang_16_0_6_gcc_11_2_1_cuda_11_8_0:
variables:
SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %clang@=16.0.6.cuda.11.8.0.gcc.11.2.1 ^cuda@11.8.0+allow-unsupported-compilers ${PROJECT_LASSEN_DEPS}"
MODULE_LIST: "cuda/11.8.0"
extends: .job_on_lassen

xl_2022_08_19_gcc_8_3_1_cuda_11_2_0:
variables:
SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %xl@=16.1.1.12.gcc.8.3.1 ^cuda@11.2.0+allow-unsupported-compilers ${PROJECT_LASSEN_DEPS}"
MODULE_LIST: "cuda/11.2.0"
extends: .job_on_lassen

xl_2023_06_28_gcc_11_2_1_cuda_11_8_0:
variables:
SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %xl@=16.1.1.14.cuda.11.8.0.gcc.11.2.1 ^cuda@11.8.0+allow-unsupported-compilers ${PROJECT_LASSEN_DEPS}"
MODULE_LIST: "cuda/11.8.0"
extends: .job_on_lassen

gcc_8_3_1_cuda_11_7_0:
adrienbernede marked this conversation as resolved.
Show resolved Hide resolved
variables:
SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %gcc@=8.3.1 ^cuda@11.7.0+allow-unsupported-compilers ${PROJECT_LASSEN_DEPS}"
MODULE_LIST: "cuda/11.7.0"
extends: .job_on_lassen

gcc_11_2_1_cuda_11_8_0:
variables:
SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %gcc@=11.2.1 ^cuda@11.8.0+allow-unsupported-compilers ${PROJECT_LASSEN_DEPS}"
MODULE_LIST: "cuda/11.8.0"
extends: .job_on_lassen
9 changes: 2 additions & 7 deletions gitlab/radiuss-jobs/poodle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,9 @@
# SPDX-License-Identifier: (MIT)
##############################################################################

intel_19_1_2_gcc_10_3_1:
intel_2023_2_1:
variables:
SPEC: "${PROJECT_POODLE_VARIANTS} %intel@=19.1.2.gcc.10.3.1 ${PROJECT_POODLE_DEPS}"
extends: .job_on_poodle

intel_2022_1_0:
variables:
SPEC: "${PROJECT_POODLE_VARIANTS} %intel@=2022.1.0 ${PROJECT_POODLE_DEPS}"
SPEC: "${PROJECT_POODLE_VARIANTS} %intel@=2023.2.1 ${PROJECT_POODLE_DEPS}"
extends: .job_on_poodle

clang_14_0_6:
Expand Down
9 changes: 2 additions & 7 deletions gitlab/radiuss-jobs/ruby.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,9 @@
# SPDX-License-Identifier: (MIT)
##############################################################################

intel_19_1_2_gcc_10_3_1:
intel_2023_2_1:
variables:
SPEC: "${PROJECT_RUBY_VARIANTS} %intel@=19.1.2.gcc.10.3.1 ${PROJECT_RUBY_DEPS}"
extends: .job_on_ruby

intel_2022_1_0:
variables:
SPEC: "${PROJECT_RUBY_VARIANTS} %intel@=2022.1.0 ${PROJECT_RUBY_DEPS}"
SPEC: "${PROJECT_RUBY_VARIANTS} %intel@=2023.2.1 ${PROJECT_RUBY_DEPS}"
extends: .job_on_ruby

clang_14_0_6:
Expand Down
8 changes: 4 additions & 4 deletions gitlab/radiuss-jobs/tioga.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
# SPDX-License-Identifier: (MIT)
##############################################################################

rocmcc_6_1_1_hip:
rocmcc_6_2_0_hip:
variables:
SPEC: "${PROJECT_TIOGA_VARIANTS} +rocm amdgpu_target=gfx90a %rocmcc@=6.1.1 ^hip@6.1.1 ${PROJECT_TIOGA_DEPS}"
SPEC: "${PROJECT_TIOGA_VARIANTS} +rocm amdgpu_target=gfx90a %rocmcc@=6.2.0 ^hip@6.2.0 ${PROJECT_TIOGA_DEPS}"
extends: .job_on_tioga

cce_16_0_1:
cce_18_0_0:
variables:
SPEC: "${PROJECT_TIOGA_VARIANTS} %cce@=16.0.1 ${PROJECT_TIOGA_DEPS}"
SPEC: "${PROJECT_TIOGA_VARIANTS} %cce@=18.0.0 ${PROJECT_TIOGA_DEPS}"
extends: .job_on_tioga
Loading