From 8f37a370b2b4b10a44b452772de32398bfe79f62 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Mon, 22 Jan 2024 16:08:12 +0100 Subject: [PATCH] Update RSC with rocm 5.7.1 (add compilers), add CI queue on lassen, update tioga specs --- .gitlab/custom-jobs-and-variables.yml | 2 +- .gitlab/jobs/tioga.yml | 6 +++--- scripts/radiuss-spack-configs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab/custom-jobs-and-variables.yml b/.gitlab/custom-jobs-and-variables.yml index fb35ce2ba..3554ae7f7 100644 --- a/.gitlab/custom-jobs-and-variables.yml +++ b/.gitlab/custom-jobs-and-variables.yml @@ -55,7 +55,7 @@ variables: # Lassen and Butte use a different job scheduler (spectrum lsf) that does not # allow pre-allocation the same way slurm does. # Arguments for job level allocation - LASSEN_JOB_ALLOC: "1 -W 10" + LASSEN_JOB_ALLOC: "1 -W 10 -q pci" # Project specific variants for lassen PROJECT_LASSEN_VARIANTS: " +tests" # Project specific deps for lassen diff --git a/.gitlab/jobs/tioga.yml b/.gitlab/jobs/tioga.yml index fe97289f6..84386c449 100644 --- a/.gitlab/jobs/tioga.yml +++ b/.gitlab/jobs/tioga.yml @@ -24,11 +24,11 @@ variables: master: variables: - SPEC: " +tests %cce@15.0.1" + SPEC: " +tests %cce@16.0.1" extends: .job_on_tioga -rocmcc_5_6_0_hip: +rocmcc_5_7_1_hip: variables: ON_TIOGA: "OFF" - SPEC: "${PROJECT_TIOGA_VARIANTS} +rocm amdgpu_target=gfx90a %rocmcc@5.6.0 ^hip@5.6.0 ${PROJECT_TIOGA_DEPS}" + SPEC: "${PROJECT_TIOGA_VARIANTS} +rocm amdgpu_target=gfx90a %rocmcc@5.7.1 ^hip@5.7.1 ${PROJECT_TIOGA_DEPS}" extends: .job_on_tioga diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs index 7f851afba..1e9962806 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 7f851afba4a70d79f74747489a03a6cf8f2c2c7f +Subproject commit 1e9962806a830aeec0ded3032437090ec26afc44