From 759a904ca3e5ff28843185afe9e9f02ae9e0bef0 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Mon, 22 Sep 2025 12:53:42 +0200 Subject: [PATCH 01/10] First attempt at updating to spack v1 --- .gitlab/jobs/corona.yml | 4 ++-- .gitlab/jobs/lassen.yml | 8 -------- .gitlab/jobs/tioga.yml | 2 +- .gitlab/jobs/tuolumne.yml | 2 +- .uberenv_config.json | 21 ++++++++++----------- scripts/radiuss-spack-configs | 2 +- scripts/uberenv | 2 +- 7 files changed, 16 insertions(+), 25 deletions(-) diff --git a/.gitlab/jobs/corona.yml b/.gitlab/jobs/corona.yml index 0d5de5629..66aef7e79 100644 --- a/.gitlab/jobs/corona.yml +++ b/.gitlab/jobs/corona.yml @@ -14,11 +14,11 @@ variables: INCLUDED_FILE_CANNOT_BE_EMPTY: "True" -# The correct way is now to use rocmcc compiler directly as done in shared spec +# The correct way is now to use llvm-amdgpu compiler directly as done in shared spec ### Template for extra jobs defined by the project. #clang14.0.6-rocm5.4.1: # variables: -# SPEC: "%clang@14.0.6 +rocm amdgpu_target=gfx906 ^hip@5.4.1 " +# SPEC: "%llvm@14.0.6 +rocm amdgpu_target=gfx906 ^hip@5.4.1 " # extends: .job_on_corona master: diff --git a/.gitlab/jobs/lassen.yml b/.gitlab/jobs/lassen.yml index fcc3d41bb..255d1a9ff 100644 --- a/.gitlab/jobs/lassen.yml +++ b/.gitlab/jobs/lassen.yml @@ -23,14 +23,6 @@ variables: # No overridden jobs so far. -# Allow failure due to weird error only with XL on Lassen. Passes in debug mode. -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 - allow_failure: true - ############ # Extra jobs ############ diff --git a/.gitlab/jobs/tioga.yml b/.gitlab/jobs/tioga.yml index 194017fb6..8ca680248 100644 --- a/.gitlab/jobs/tioga.yml +++ b/.gitlab/jobs/tioga.yml @@ -36,7 +36,7 @@ cce_18_0_1: # We do not recommend using ${PROJECT__VARIANTS} and # ${PROJECT__DEPS} in the extra jobs. There is no reason not to fully # describe the spec here. -# The correct way is now to use rocmcc compiler directly as done in shared spec +# The correct way is now to use llvm-amdgpu compiler directly as done in shared spec # As long as cce 18 fails, we keep this one. cce_17_0_1: diff --git a/.gitlab/jobs/tuolumne.yml b/.gitlab/jobs/tuolumne.yml index 096e1fba0..a0048363f 100644 --- a/.gitlab/jobs/tuolumne.yml +++ b/.gitlab/jobs/tuolumne.yml @@ -36,7 +36,7 @@ cce_18_0_1: # We do not recommend using ${PROJECT__VARIANTS} and # ${PROJECT__DEPS} in the extra jobs. There is no reason not to fully # describe the spec here. -# The correct way is now to use rocmcc compiler directly as done in shared spec +# The correct way is now to use llvm-amdgpu compiler directly as done in shared spec # As long as cce 18 fails, we keep this one. cce_19_0_0: diff --git a/.uberenv_config.json b/.uberenv_config.json index 8bb8610ad..d87ee8445 100755 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -1,12 +1,11 @@ { - "package_name" : "caliper", - "package_version" : "master", - "package_source_dir" : "../..", - "package_final_phase" : "initconfig", - "spack_url": "https://github.com/spack/spack.git", - "spack_commit": "280017a9ba3f6a969743deca0eebc96e7c0e5cfd", - "spack_configs_path": "scripts/radiuss-spack-configs", - "spack_packages_path": "scripts/radiuss-spack-configs/packages", - "spack_concretizer": "clingo", - "spack_setup_clingo": false - } +"package_name" : "caliper", +"package_version" : "master", +"package_final_phase" : "initconfig", +"package_source_dir" : "../..", +"spack_url": "https://github.com/spack/spack.git", +"spack_branch": "v1.0.2", +"spack_configs_path": "scripts/radiuss-spack-configs", +"spack_packages_path": "scripts/radiuss-spack-configs/spack_repo/llnl_radiuss/packages", +"spack_setup_clingo": false +} diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs index dcf807584..53ae62ac2 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit dcf807584584cb1ca4dca1d5cbf8b320bf73567e +Subproject commit 53ae62ac26f6306c9fa97ae708129c736f5d18e8 diff --git a/scripts/uberenv b/scripts/uberenv index 6ba67dcbd..b03569845 160000 --- a/scripts/uberenv +++ b/scripts/uberenv @@ -1 +1 @@ -Subproject commit 6ba67dcbd7ccbb9c03920b89de19ac959e2c3bdd +Subproject commit b03569845051ce2ec396a1dfba5ecc8142c7d657 From b98e2e6a2c3204bde796452c73f306ec94100a0d Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Mon, 22 Sep 2025 14:11:44 +0200 Subject: [PATCH 02/10] From RSC: stop including compilers.yaml in environments --- scripts/radiuss-spack-configs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs index 53ae62ac2..3a41a0f2c 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 53ae62ac26f6306c9fa97ae708129c736f5d18e8 +Subproject commit 3a41a0f2c01f84cf309d01cac639d0320640bb90 From 7b5c7b1173fda5de81d174ce534eeac18c4a132d Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Mon, 22 Sep 2025 22:12:23 +0200 Subject: [PATCH 03/10] Fix FindLibunwind to prefer already defined libunwind location --- cmake/FindLibunwind.cmake | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/cmake/FindLibunwind.cmake b/cmake/FindLibunwind.cmake index 04f325d92..7868138f5 100644 --- a/cmake/FindLibunwind.cmake +++ b/cmake/FindLibunwind.cmake @@ -3,20 +3,38 @@ # # LIBUNWIND_PREFIX - Set to the libunwind installation directory # -# LIBUNWIND_INCLUDE_DIR - Path to libunwind.h +# LIBUNWIND_INCLUDE_DIRS - Path to libunwind.h # LIBUNWIND_LIBRARIES - List of libraries for using libunwind # LIBUNWIND_FOUND - True if libunwind was found -find_path(LIBUNWIND_PREFIX - include/libunwind.h) +if(LIBUNWIND_PREFIX) + # When prefix is explicitly provided, only look there + find_library(LIBUNWIND_LIBRARIES + NAMES unwind + PATHS ${LIBUNWIND_PREFIX}/lib + NO_DEFAULT_PATH) -find_library(LIBUNWIND_LIBRARIES - NAMES unwind - HINTS ${LIBUNWIND_PREFIX}/lib) + find_path(LIBUNWIND_INCLUDE_DIRS + NAMES libunwind.h + PATHS ${LIBUNWIND_PREFIX}/include + NO_DEFAULT_PATH) -find_path(LIBUNWIND_INCLUDE_DIRS - NAMES libunwind.h - HINTS ${LIBUNWIND_PREFIX}/include) + if(NOT LIBUNWIND_LIBRARIES OR NOT LIBUNWIND_INCLUDE_DIRS) + message(WARNING "LIBUNWIND_PREFIX was set to '${LIBUNWIND_PREFIX}' but libunwind was not found there") + endif() +else() + # Try to find libunwind in standard locations + find_path(LIBUNWIND_PREFIX + include/libunwind.h) + + find_library(LIBUNWIND_LIBRARIES + NAMES unwind + HINTS ${LIBUNWIND_PREFIX}/lib) + + find_path(LIBUNWIND_INCLUDE_DIRS + NAMES libunwind.h + HINTS ${LIBUNWIND_PREFIX}/include) +endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Libunwind DEFAULT_MSG LIBUNWIND_LIBRARIES LIBUNWIND_INCLUDE_DIRS) From bf59c27f781f3cff0469773166121a0d5c9573e1 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Fri, 26 Sep 2025 12:33:39 +0200 Subject: [PATCH 04/10] RSC Update --- scripts/radiuss-spack-configs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs index 3a41a0f2c..3a1c20fb0 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 3a41a0f2c01f84cf309d01cac639d0320640bb90 +Subproject commit 3a1c20fb03708200edbfe525020db8a41f62f200 From 1eb06e7eef4e2f1d655b2c6e80c0391e6c44ff61 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Fri, 26 Sep 2025 14:52:18 +0200 Subject: [PATCH 05/10] CI: Better handling of machine outage --- .gitlab-ci.yml | 4 +-- .gitlab/subscribed-pipelines.yml | 43 +++++++++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 94ea6a20a..c38246566 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,7 +76,7 @@ stages: include: - local: '.gitlab/custom-jobs-and-variables.yml' - project: 'radiuss/radiuss-shared-ci' - ref: 'v2025.06.0' + ref: 'v2025.09.0' file: 'pipelines/${CI_MACHINE}.yml' - artifact: '${CI_MACHINE}-jobs.yml' job: 'generate-job-lists' @@ -90,7 +90,7 @@ include: file: 'id_tokens.yml' # [Optional] checks preliminary to running the actual CI test - project: 'radiuss/radiuss-shared-ci' - ref: 'v2025.06.0' + ref: 'v2025.09.0' file: 'utilities/preliminary-ignore-draft-pr.yml' # pipelines subscribed by the project - local: '.gitlab/subscribed-pipelines.yml' diff --git a/.gitlab/subscribed-pipelines.yml b/.gitlab/subscribed-pipelines.yml index f58680a27..3998590f7 100644 --- a/.gitlab/subscribed-pipelines.yml +++ b/.gitlab/subscribed-pipelines.yml @@ -50,64 +50,105 @@ generate-job-lists: - tioga-jobs.yml - tuolumne-jobs.yml - # DANE dane-up-check: variables: CI_MACHINE: "dane" extends: [.machine-check] + rules: + # Runs except if we explicitly deactivate dane by variable. + - if: '$ON_DANE == "OFF"' + when: never + - when: on_success dane-build-and-test: variables: CI_MACHINE: "dane" needs: [dane-up-check, generate-job-lists] extends: [.build-and-test] + rules: + # Runs except if we explicitly deactivate dane by variable. + - if: '$ON_DANE == "OFF"' + when: never + - when: on_success # CORONA corona-up-check: variables: CI_MACHINE: "corona" extends: [.machine-check] + rules: + - if: '$ON_CORONA == "OFF"' + when: never + - when: on_success corona-build-and-test: variables: CI_MACHINE: "corona" needs: [corona-up-check, generate-job-lists] extends: [.build-and-test] + rules: + - if: '$ON_CORONA == "OFF"' + when: never + - when: on_success # TIOGA tioga-up-check: variables: CI_MACHINE: "tioga" extends: [.machine-check] + rules: + - if: '$ON_TIOGA == "OFF"' + when: never + - when: on_success tioga-build-and-test: variables: CI_MACHINE: "tioga" needs: [tioga-up-check, generate-job-lists] extends: [.build-and-test] + rules: + - if: '$ON_TIOGA == "OFF"' + when: never + - when: on_success # TUOLUMNE tuolumne-up-check: variables: CI_MACHINE: "tuolumne" extends: [.machine-check] + rules: + - if: '$ON_TUOLUMNE == "OFF"' + when: never + - when: on_success tuolumne-build-and-test: variables: CI_MACHINE: "tuolumne" needs: [tuolumne-up-check, generate-job-lists] extends: [.build-and-test] + rules: + - if: '$ON_TUOLUMNE == "OFF"' + when: never + - when: on_success # LASSEN lassen-up-check: variables: CI_MACHINE: "lassen" extends: [.machine-check] + rules: + - if: '$ON_LASSEN == "OFF"' + when: never + - when: on_success lassen-build-and-test: variables: CI_MACHINE: "lassen" needs: [lassen-up-check, generate-job-lists] extends: [.build-and-test] + rules: + - if: '$ON_LASSEN == "OFF"' + when: never + - when: on_success From bc52832afea9d4d41ab2d010f706be7aa59c97d4 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Mon, 29 Sep 2025 09:50:07 +0200 Subject: [PATCH 06/10] From RSC: only depends on fortran when +fortran --- scripts/radiuss-spack-configs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs index 3a1c20fb0..99d096056 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 3a1c20fb03708200edbfe525020db8a41f62f200 +Subproject commit 99d096056b045af3b3264e61ce1cf5c0b23d472d From 573a995dcea57e68cc6b344d82250fa8d91294d0 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Mon, 29 Sep 2025 15:29:53 +0200 Subject: [PATCH 07/10] Point at uberenv@main with merged changes. --- scripts/uberenv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/uberenv b/scripts/uberenv index b03569845..eb1853586 160000 --- a/scripts/uberenv +++ b/scripts/uberenv @@ -1 +1 @@ -Subproject commit b03569845051ce2ec396a1dfba5ecc8142c7d657 +Subproject commit eb1853586821360613f1c6c415ebf65d370a47e7 From 1d0181a0d78415fd97079f3e86dd91561575165c Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Mon, 29 Sep 2025 15:32:14 +0200 Subject: [PATCH 08/10] Update Radiuss Spack Configs --- scripts/radiuss-spack-configs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs index 99d096056..0bdad3500 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 99d096056b045af3b3264e61ce1cf5c0b23d472d +Subproject commit 0bdad3500b5a18fd57b9f83a1eec9c15dd3b4b50 From b377bf2d6162d251ff31e5d7e4219d8f9d6900c5 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Tue, 30 Sep 2025 10:15:35 +0200 Subject: [PATCH 09/10] Point at new RSC release --- scripts/radiuss-spack-configs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs index 0bdad3500..b39030f68 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 0bdad3500b5a18fd57b9f83a1eec9c15dd3b4b50 +Subproject commit b39030f680263f6c15c7dfe510fa6ffdb9482136 From a059a70f516568760bb9b6e07bd2379d952750c0 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Wed, 1 Oct 2025 11:54:35 +0200 Subject: [PATCH 10/10] Update RSC with packages and configs updates --- scripts/radiuss-spack-configs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs index b39030f68..4dac97ec2 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit b39030f680263f6c15c7dfe510fa6ffdb9482136 +Subproject commit 4dac97ec251994e9c4f30e4eb29f5377b8956166