From 85b54e6e20ce689aa3284795e301364352e54611 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Tue, 26 Nov 2024 15:08:11 +0100 Subject: [PATCH 01/19] From RSC: split config files + update toolchain on tioga --- .gitlab/jobs/tioga.yml | 4 ++-- scripts/radiuss-spack-configs | 2 +- scripts/uberenv | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab/jobs/tioga.yml b/.gitlab/jobs/tioga.yml index abf87e93..194017fb 100644 --- a/.gitlab/jobs/tioga.yml +++ b/.gitlab/jobs/tioga.yml @@ -24,9 +24,9 @@ variables: # This compiler is not considered reliable per issue in RAJA # https://github.com/LLNL/RAJA/pull/1712#issuecomment-2316335119 # We allow failure and keep the cce 17.0.1 job below. -cce_18_0_0: +cce_18_0_1: variables: - SPEC: "${PROJECT_TIOGA_VARIANTS} %cce@=18.0.0 ${PROJECT_TIOGA_DEPS}" + SPEC: "${PROJECT_TIOGA_VARIANTS} %cce@=18.0.1 ${PROJECT_TIOGA_DEPS}" extends: .job_on_tioga allow_failure: true diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs index 00c06c2d..2425d814 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 00c06c2d0258802fbf4a57ff987314d4acd9f629 +Subproject commit 2425d8148a4a6a2aa2d51c7eb1f71a8392343fde diff --git a/scripts/uberenv b/scripts/uberenv index 205672b8..06933746 160000 --- a/scripts/uberenv +++ b/scripts/uberenv @@ -1 +1 @@ -Subproject commit 205672b8b2520d7dc69acefe8738960cd5db0937 +Subproject commit 06933746d88ee3ea6b6b9a37cff68b71510daad2 From 41cc2a78453463949d8b681301ed536927f7c67d Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Tue, 26 Nov 2024 15:18:11 +0100 Subject: [PATCH 02/19] From RSC: update calipre and care packages --- 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 2425d814..1038c61d 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 2425d8148a4a6a2aa2d51c7eb1f71a8392343fde +Subproject commit 1038c61d4377c14ef18f94df5b1eb347a673b4ce From 853ed611cca62d652e69ba6629ffe963ef412702 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Thu, 28 Nov 2024 12:55:27 +0100 Subject: [PATCH 03/19] Export hostconfig file as artifact --- .gitlab/custom-jobs-and-variables.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab/custom-jobs-and-variables.yml b/.gitlab/custom-jobs-and-variables.yml index 98e38c7c..6dd0155e 100644 --- a/.gitlab/custom-jobs-and-variables.yml +++ b/.gitlab/custom-jobs-and-variables.yml @@ -70,6 +70,9 @@ variables: artifacts: reports: junit: junit.xml + name: "${CI_PROJECT_NAME}-${CI_MACHINE}-${CI_JOB_NAME}-${CI_PIPELINE_ID}" + paths: + - ./*.cmake .reproducer_vars: script: From 1f3a798a216f083f3f82a66a2317222497b23405 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Mon, 2 Dec 2024 15:48:38 +0100 Subject: [PATCH 04/19] From RSC: Sync with Spack@develop-2024-12-01 --- .uberenv_config.json | 2 +- scripts/radiuss-spack-configs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.uberenv_config.json b/.uberenv_config.json index 5386897f..dee3cf12 100755 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -4,7 +4,7 @@ "package_source_dir" : "../..", "package_final_phase" : "initconfig", "spack_url": "https://github.com/spack/spack.git", - "spack_branch": "develop-2024-10-06", + "spack_branch": "develop-2024-12-01", "spack_activate" : {}, "spack_configs_path": "scripts/radiuss-spack-configs", "spack_packages_path": "scripts/radiuss-spack-configs/packages", diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs index 1038c61d..359f379f 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 1038c61d4377c14ef18f94df5b1eb347a673b4ce +Subproject commit 359f379f086c39954301de889d8b40053979c517 From 06c3bfb286e5c722da1e423e4acc48e291aa9818 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Mon, 2 Dec 2024 17:15:45 +0100 Subject: [PATCH 05/19] From RSC: Fix Caliper package --- 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 359f379f..ff95b2a8 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 359f379f086c39954301de889d8b40053979c517 +Subproject commit ff95b2a8e8a1273431f939e7db7d69814e9a68dc From 37a9a4b7ceafafa79f5d2ee245a8e1e72a73c15b Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Tue, 3 Dec 2024 09:52:00 +0100 Subject: [PATCH 06/19] Do not unload rocm module --- scripts/gitlab/build-and-test.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/gitlab/build-and-test.sh b/scripts/gitlab/build-and-test.sh index 01f5d67d..a60e9dd9 100755 --- a/scripts/gitlab/build-and-test.sh +++ b/scripts/gitlab/build-and-test.sh @@ -206,10 +206,6 @@ then mkdir -p ${build_dir} && cd ${build_dir} timed_message "Building Caliper" - if [[ "${truehostname}" == "corona" || "${truehostname}" == "tioga" ]] - then - module unload rocm - fi if [[ "${truehostname}" == "lassen" || "${truehostname}" == "tioga" ]] then $cmake_exe \ From 22ff7029fad18c68a5412650a427f1719040b868 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Tue, 10 Dec 2024 15:06:42 +0100 Subject: [PATCH 07/19] Revert updating Spack because of problem with develop-2024-12-01 --- .uberenv_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.uberenv_config.json b/.uberenv_config.json index dee3cf12..5386897f 100755 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -4,7 +4,7 @@ "package_source_dir" : "../..", "package_final_phase" : "initconfig", "spack_url": "https://github.com/spack/spack.git", - "spack_branch": "develop-2024-12-01", + "spack_branch": "develop-2024-10-06", "spack_activate" : {}, "spack_configs_path": "scripts/radiuss-spack-configs", "spack_packages_path": "scripts/radiuss-spack-configs/packages", From 6465b18c1a30120101f7cb232e8593f4f7b02760 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Thu, 19 Dec 2024 17:05:06 +0100 Subject: [PATCH 08/19] Update Shared CI --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aeaeb4a9..a81224af 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -73,7 +73,7 @@ stages: include: - local: '.gitlab/custom-jobs-and-variables.yml' - project: 'radiuss/radiuss-shared-ci' - ref: 'v2024.07.0' + ref: 'v2024.12.0' file: 'pipelines/${CI_MACHINE}.yml' - artifact: '${CI_MACHINE}-jobs.yml' job: 'generate-job-lists' @@ -86,7 +86,7 @@ include: file: 'id_tokens.yml' # [Optional] checks preliminary to running the actual CI test - project: 'radiuss/radiuss-shared-ci' - ref: 'v2024.07.0' + ref: 'v2024.12.0' file: 'utilities/preliminary-ignore-draft-pr.yml' # pipelines subscribed by the project - local: '.gitlab/subscribed-pipelines.yml' From 4c20b4f02cb517e6b7cbe0bb94ded4e3a9f4fab2 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Wed, 8 Jan 2025 18:43:46 +0100 Subject: [PATCH 09/19] From RSC: update to rocm 6.3.0 on tioga + sync with spack@develop + compiler rpaths --- .uberenv_config.json | 2 +- scripts/radiuss-spack-configs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.uberenv_config.json b/.uberenv_config.json index 5386897f..c9188e9d 100755 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -4,7 +4,7 @@ "package_source_dir" : "../..", "package_final_phase" : "initconfig", "spack_url": "https://github.com/spack/spack.git", - "spack_branch": "develop-2024-10-06", + "spack_branch": "develop", "spack_activate" : {}, "spack_configs_path": "scripts/radiuss-spack-configs", "spack_packages_path": "scripts/radiuss-spack-configs/packages", diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs index ff95b2a8..69d3ef1c 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit ff95b2a8e8a1273431f939e7db7d69814e9a68dc +Subproject commit 69d3ef1c8836da14be85aa294cf460f1d9cc8360 From 6b99e3c174250f3667b6d5efc34765961eba4fc7 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Fri, 10 Jan 2025 12:10:56 +0100 Subject: [PATCH 10/19] From RSC: workarounds (rpath for missing lib) (requirement to enforce single compiler) + fix intel->oneapi missing migration --- 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 69d3ef1c..abb459f7 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 69d3ef1c8836da14be85aa294cf460f1d9cc8360 +Subproject commit abb459f707063cffaf357a9edf98090b11d1f0ed From 3cd12989aefca0b331a23a64d6d2be38e497052d Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Mon, 13 Jan 2025 11:01:27 +0100 Subject: [PATCH 11/19] From RSC: SYCL compiler update + Update w.r.t. spack@develop-2024-01-12 --- .uberenv_config.json | 2 +- scripts/radiuss-spack-configs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.uberenv_config.json b/.uberenv_config.json index c9188e9d..10f70b9a 100755 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -4,7 +4,7 @@ "package_source_dir" : "../..", "package_final_phase" : "initconfig", "spack_url": "https://github.com/spack/spack.git", - "spack_branch": "develop", + "spack_branch": "develop-2025-01-12", "spack_activate" : {}, "spack_configs_path": "scripts/radiuss-spack-configs", "spack_packages_path": "scripts/radiuss-spack-configs/packages", diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs index abb459f7..b8d76a3d 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit abb459f707063cffaf357a9edf98090b11d1f0ed +Subproject commit b8d76a3d88b36d771f605b8af3c056b9803c5765 From 38a6a2e466d683f16c3b4b41b4cdc797efb53a76 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Wed, 22 Jan 2025 11:16:10 +0100 Subject: [PATCH 12/19] 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 b8d76a3d..991e007e 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit b8d76a3d88b36d771f605b8af3c056b9803c5765 +Subproject commit 991e007e6030b12272ca189747e898291bc677f2 From bd2ddd6502ae270417d3ab00d9ede0e9556da2b8 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Wed, 22 Jan 2025 15:33:48 +0100 Subject: [PATCH 13/19] From RSC: change tioga gcc to be coherent with available cray-mpich --- 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 991e007e..aec5d3e5 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 991e007e6030b12272ca189747e898291bc677f2 +Subproject commit aec5d3e5c052baa9fb33db2dba5c34dacb3c6c26 From 0d5d93413c15f21cbfb69a2cfd12748b61f5425d Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Wed, 22 Jan 2025 20:57:19 +0100 Subject: [PATCH 14/19] Update RADIUSS Spack Configs to new 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 aec5d3e5..e74d9ed6 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit aec5d3e5c052baa9fb33db2dba5c34dacb3c6c26 +Subproject commit e74d9ed6bc6dbb2092b895602cfd5f559ff52760 From 68e836e254fa12847d66738cf8e02de315526588 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Tue, 4 Feb 2025 11:35:03 +0100 Subject: [PATCH 15/19] Update Spack and Uberenv to support split environments --- .uberenv_config.json | 6 ++---- scripts/uberenv | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.uberenv_config.json b/.uberenv_config.json index 10f70b9a..5c7e39fb 100755 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -4,11 +4,9 @@ "package_source_dir" : "../..", "package_final_phase" : "initconfig", "spack_url": "https://github.com/spack/spack.git", - "spack_branch": "develop-2025-01-12", - "spack_activate" : {}, + "spack_branch": "develop-2025-02-02", "spack_configs_path": "scripts/radiuss-spack-configs", "spack_packages_path": "scripts/radiuss-spack-configs/packages", "spack_concretizer": "clingo", - "spack_setup_clingo": false, - "debug": true + "spack_setup_clingo": "false" } diff --git a/scripts/uberenv b/scripts/uberenv index 06933746..44ab4ca4 160000 --- a/scripts/uberenv +++ b/scripts/uberenv @@ -1 +1 @@ -Subproject commit 06933746d88ee3ea6b6b9a37cff68b71510daad2 +Subproject commit 44ab4ca4751d570535a7941e7d0c2f613ec2502e From 4dab6afc8baf55f16770fb30b40a4a3c84d989f0 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Thu, 6 Feb 2025 11:43:51 +0100 Subject: [PATCH 16/19] Update Uberenv + Update Spack to fix bug --- .uberenv_config.json | 4 ++-- scripts/uberenv | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.uberenv_config.json b/.uberenv_config.json index 5c7e39fb..3dfcf6c9 100755 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -4,9 +4,9 @@ "package_source_dir" : "../..", "package_final_phase" : "initconfig", "spack_url": "https://github.com/spack/spack.git", - "spack_branch": "develop-2025-02-02", + "spack_commit": "4487598d60fd54f765dd813dccc97dadea80d6b1", "spack_configs_path": "scripts/radiuss-spack-configs", "spack_packages_path": "scripts/radiuss-spack-configs/packages", "spack_concretizer": "clingo", - "spack_setup_clingo": "false" + "spack_setup_clingo": false } diff --git a/scripts/uberenv b/scripts/uberenv index 44ab4ca4..6ba67dcb 160000 --- a/scripts/uberenv +++ b/scripts/uberenv @@ -1 +1 @@ -Subproject commit 44ab4ca4751d570535a7941e7d0c2f613ec2502e +Subproject commit 6ba67dcbd7ccbb9c03920b89de19ac959e2c3bdd From 2ba3a99cb8a2c2174674c9ef5f45fbc85305a496 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Fri, 7 Feb 2025 15:34:46 +0100 Subject: [PATCH 17/19] From RSC: Set upper limit for FMT version in Umpire due to bug --- 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 e74d9ed6..5d16f366 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit e74d9ed6bc6dbb2092b895602cfd5f559ff52760 +Subproject commit 5d16f366c1ee1e0db4491f856e82c3c600fef0a1 From 118903955ef8e15c2f8eb572190f0f32b1c81936 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Mon, 10 Feb 2025 20:25:29 +0100 Subject: [PATCH 18/19] Update Spack to snapshot release + RSC merge --- .uberenv_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.uberenv_config.json b/.uberenv_config.json index 3dfcf6c9..ea1bfb30 100755 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -4,7 +4,7 @@ "package_source_dir" : "../..", "package_final_phase" : "initconfig", "spack_url": "https://github.com/spack/spack.git", - "spack_commit": "4487598d60fd54f765dd813dccc97dadea80d6b1", + "spack_commit": "develop-2025-02-09", "spack_configs_path": "scripts/radiuss-spack-configs", "spack_packages_path": "scripts/radiuss-spack-configs/packages", "spack_concretizer": "clingo", From 574526429a5c694a402624ecbf3db2cfc6894a0d Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Mon, 10 Feb 2025 20:55:50 +0100 Subject: [PATCH 19/19] Fix --- .uberenv_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.uberenv_config.json b/.uberenv_config.json index ea1bfb30..0d9d4aba 100755 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -4,7 +4,7 @@ "package_source_dir" : "../..", "package_final_phase" : "initconfig", "spack_url": "https://github.com/spack/spack.git", - "spack_commit": "develop-2025-02-09", + "spack_branch": "develop-2025-02-09", "spack_configs_path": "scripts/radiuss-spack-configs", "spack_packages_path": "scripts/radiuss-spack-configs/packages", "spack_concretizer": "clingo",