From d0d00fb3ad3ff7c375611943d7024a5ab2010696 Mon Sep 17 00:00:00 2001 From: Adrien Bernede <51493078+adrienbernede@users.noreply.github.com> Date: Fri, 23 Jun 2023 18:55:46 +0200 Subject: [PATCH] Update CI to rocmcc 5.5.x (#829) --- .gitlab-ci.yml | 4 ++-- .gitlab/corona-build-and-test-extra.yml | 4 ++-- .gitlab/tioga-build-and-test-extra.yml | 4 ++-- scripts/radiuss-spack-configs | 2 +- scripts/uberenv | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad2e00585..6f5127e40 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,7 +59,7 @@ stages: include: - local: '.gitlab/custom-jobs-and-variables.yml' - project: 'radiuss/radiuss-shared-ci' - ref: v2023.03.1 + ref: v2023.06.0 file: '${CI_MACHINE}-build-and-test.yml' - local: '.gitlab/${CI_MACHINE}-build-and-test-extra.yml' strategy: depend @@ -69,7 +69,7 @@ stages: include: # [Optional] checks preliminary to running the actual CI test #- project: 'radiuss/radiuss-shared-ci' - # ref: v2023.03.1 + # ref: v2023.06.0 # file: 'preliminary-ignore-draft-pr.yml' # pipelines subscribed by the project - local: .gitlab/subscribed-pipelines.yml diff --git a/.gitlab/corona-build-and-test-extra.yml b/.gitlab/corona-build-and-test-extra.yml index 540191479..f58f804d7 100644 --- a/.gitlab/corona-build-and-test-extra.yml +++ b/.gitlab/corona-build-and-test-extra.yml @@ -25,8 +25,8 @@ # This job intentionally tests our umpire package.py because although this job does not # explicitly have the ~tools, the package.py should still disable tools from being built. ### -rocmcc_5_4_1_hip_openmp_device_alloc: +rocmcc_5_5_0_hip_openmp_device_alloc: variables: - SPEC: "~shared +fortran +openmp +rocm +device_alloc tests=basic amdgpu_target=gfx906 %rocmcc@5.4.1 ^hip@5.4.1" + SPEC: "~shared +fortran +openmp +rocm +device_alloc tests=basic amdgpu_target=gfx906 %rocmcc@5.5.0 ^hip@5.5.0" extends: .build_and_test_on_corona diff --git a/.gitlab/tioga-build-and-test-extra.yml b/.gitlab/tioga-build-and-test-extra.yml index fa743156c..8b7c11fac 100644 --- a/.gitlab/tioga-build-and-test-extra.yml +++ b/.gitlab/tioga-build-and-test-extra.yml @@ -29,8 +29,8 @@ cce_15_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 disable tools from being built. ### -rocmcc_5_4_3_hip_openmp_device_alloc: +rocmcc_5_5_1_hip_openmp_device_alloc: variables: - SPEC: "~shared +fortran +openmp +rocm +device_alloc tests=basic amdgpu_target=gfx90a %rocmcc@5.4.3 ^hip@5.4.3" + SPEC: "~shared +fortran +openmp +rocm +device_alloc tests=basic amdgpu_target=gfx90a %rocmcc@5.5.1 ^hip@5.5.1" extends: .build_and_test_on_tioga diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs index f6626f790..c9d893827 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit f6626f790b07fbd399f238aa9792a11ca78dfa97 +Subproject commit c9d8938279824ba1d10465dd2d9b8faf59edbfa9 diff --git a/scripts/uberenv b/scripts/uberenv index 20170190d..0d00dc8e1 160000 --- a/scripts/uberenv +++ b/scripts/uberenv @@ -1 +1 @@ -Subproject commit 20170190dd6b3607fe81b84ce195afb7def067a7 +Subproject commit 0d00dc8e19a889ba07ae433590b87533c4b5b3da