From 733a2672267342ccdd298563bb56bd57bfa4dde7 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Wed, 7 Aug 2024 16:38:15 +0200 Subject: [PATCH] Update RSC with rocm 6.1.2 and more --- .gitlab/jobs/lassen.yml | 25 +++++++++++++++++++++++++ .gitlab/jobs/poodle.yml | 7 ------- .gitlab/jobs/ruby.yml | 7 ------- .gitlab/jobs/tioga.yml | 8 ++++---- scripts/radiuss-spack-configs | 2 +- 5 files changed, 30 insertions(+), 19 deletions(-) diff --git a/.gitlab/jobs/lassen.yml b/.gitlab/jobs/lassen.yml index d7044d90c..e6e231b51 100644 --- a/.gitlab/jobs/lassen.yml +++ b/.gitlab/jobs/lassen.yml @@ -25,6 +25,13 @@ xl_2022_08_19_gcc_8_3_1_cuda_11_2_0: LASSEN_JOB_ALLOC: "1 -W 20 -q pci" 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.8.3.1 ^cuda@11.8.0+allow-unsupported-compilers ${PROJECT_LASSEN_DEPS}" + MODULE_LIST: "cuda/11.8.0" + LASSEN_JOB_ALLOC: "1 -W 20 -q pci" + extends: .job_on_lassen + allow_failure: true ############ # Extra jobs @@ -96,15 +103,33 @@ gcc_8_3_1_tpls: SPEC: "~shared +fortran +tools tests=basic %gcc@=8.3.1" extends: .job_on_lassen +gcc_11_2_1_tpls: + variables: + SPEC: "~shared +fortran +tools tests=basic %gcc@=11.2.1" + extends: .job_on_lassen + ibm_clang_14_0_5_gcc_8_3_1_cuda_11_7_0_tpls: variables: SPEC: "~shared +fortran +cuda +tools tests=basic %clang@=14.0.5.ibm.gcc.8.3.1 ^cuda@11.7.0+allow-unsupported-compilers" MODULE_LIST: "cuda/11.7.0" extends: .job_on_lassen +ibm_clang_16_0_6_gcc_11_2_1_cuda_11_8_tpls: + variables: + SPEC: "~shared +fortran +cuda +tools tests=basic %clang@=16.0.6.cuda.11.8.0.ibm.gcc.11.2.1 ^cuda@11.8.0+allow-unsupported-compilers" + MODULE_LIST: "cuda/11.8.0" + extends: .job_on_lassen + xl_2022_08_19_gcc_8_3_1_cuda_11_2_tpls: variables: SPEC: "~shared +fortran +cuda +tools tests=basic %xl@=16.1.1.12.gcc.8.3.1 ^cuda@11.7.0+allow-unsupported-compilers" MODULE_LIST: "cuda/11.7.0" LASSEN_JOB_ALLOC: "1 -W 20 -q pci" extends: .job_on_lassen + +xl_2023_06_28_gcc_11_2_1_cuda_11_8_tpls: + variables: + SPEC: "~shared +fortran +cuda +tools tests=basic %xl@=16.1.1.14.cuda.11.8.0.gcc.11.2.1 ^cuda@11.8.0+allow-unsupported-compilers" + MODULE_LIST: "cuda/11.8.0" + LASSEN_JOB_ALLOC: "1 -W 20 -q pci" + extends: .job_on_lassen diff --git a/.gitlab/jobs/poodle.yml b/.gitlab/jobs/poodle.yml index fc98e5a57..f31d7a83e 100644 --- a/.gitlab/jobs/poodle.yml +++ b/.gitlab/jobs/poodle.yml @@ -17,13 +17,6 @@ # We keep ${PROJECT__VARIANTS} and ${PROJECT__DEPS} So that # the comparison with the original job is easier. -# Allow failure due to compiler internal error building wrapfumpire.f -intel_2022_1_0: - variables: - SPEC: "${PROJECT_RUBY_VARIANTS} %intel@=2022.1.0 ${PROJECT_RUBY_DEPS}" - extends: .job_on_poodle - allow_failure: true - ############ # Extra jobs ############ diff --git a/.gitlab/jobs/ruby.yml b/.gitlab/jobs/ruby.yml index c282fbd6a..9b166d9b9 100644 --- a/.gitlab/jobs/ruby.yml +++ b/.gitlab/jobs/ruby.yml @@ -17,13 +17,6 @@ # We keep ${PROJECT__VARIANTS} and ${PROJECT__DEPS} So that # the comparison with the original job is easier. -# Allow failure due to compiler internal error building wrapfumpire.f -intel_2022_1_0: - variables: - SPEC: "${PROJECT_RUBY_VARIANTS} %intel@=2022.1.0 ${PROJECT_RUBY_DEPS}" - extends: .job_on_ruby - allow_failure: true - ############ # Extra jobs ############ diff --git a/.gitlab/jobs/tioga.yml b/.gitlab/jobs/tioga.yml index 951cfad3b..51682f6c5 100644 --- a/.gitlab/jobs/tioga.yml +++ b/.gitlab/jobs/tioga.yml @@ -17,9 +17,9 @@ # the comparison with the original job is easier. # We override the cce job because we can’t use +device-alloc with it -cce_16_0_1: +cce_18_0_0: variables: - SPEC: "~shared +fortran tests=basic %cce@=16.0.1" + SPEC: "~shared +fortran tests=basic %cce@=18.0.0" extends: .job_on_tioga ############ @@ -33,8 +33,8 @@ cce_16_0_1: # This job intentionally tests our umpire package.py because although this job does not # explicitly have the ~tools, the package.py should still prevent tools from being built. ### -rocmcc_6_1_1_hip_openmp_device_alloc: +rocmcc_6_1_2_hip_openmp_device_alloc: variables: - SPEC: "~shared +fortran +openmp +rocm +device_alloc tests=basic amdgpu_target=gfx90a %rocmcc@=6.1.1 ^hip@6.1.1" + SPEC: "~shared +fortran +openmp +rocm +device_alloc tests=basic amdgpu_target=gfx90a %rocmcc@=6.1.2 ^hip@6.1.2" extends: .job_on_tioga diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs index 54c09b5dc..9639236da 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 54c09b5dcf45decaac2b1e6d1048671cde17f7e5 +Subproject commit 9639236da58277efbcea54208ad52cf69556be8c