From 81a775ba87a2f1333b5ae2004f8c971879027190 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Thu, 14 Nov 2024 16:59:50 +0100 Subject: [PATCH 01/36] From RSC: Use llvm-amdgpu instead of hip to determine ROCM_PATH --- 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 00c06c2d0..67d6b1f74 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 00c06c2d0258802fbf4a57ff987314d4acd9f629 +Subproject commit 67d6b1f74952763aa79e20ab9e857a983b7097ab From d7437214f20aa0e07c297a328babf83adcbdf2e6 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Tue, 19 Nov 2024 21:20:38 +0100 Subject: [PATCH 02/36] Update RSC with split env files --- 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 67d6b1f74..3b03b70f8 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 67d6b1f74952763aa79e20ab9e857a983b7097ab +Subproject commit 3b03b70f8fdea22860738ecea357d49fe3549329 From 78b2b5d2028f7eb30dc9b81cfe6a0b1002079e78 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Fri, 22 Nov 2024 11:48:09 +0100 Subject: [PATCH 03/36] Point at new PR in Uberenv --- scripts/uberenv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/uberenv b/scripts/uberenv index 205672b8b..76b4391ad 160000 --- a/scripts/uberenv +++ b/scripts/uberenv @@ -1 +1 @@ -Subproject commit 205672b8b2520d7dc69acefe8738960cd5db0937 +Subproject commit 76b4391ada8c74848c1cf4d9d60241fac6fe27d8 From e43050755b3c439eca76c2f10fb4969419b3b0f0 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Fri, 22 Nov 2024 14:48:35 +0100 Subject: [PATCH 04/36] From Uberenv: Fix: support symbolic links --- scripts/uberenv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/uberenv b/scripts/uberenv index 76b4391ad..06933746d 160000 --- a/scripts/uberenv +++ b/scripts/uberenv @@ -1 +1 @@ -Subproject commit 76b4391ada8c74848c1cf4d9d60241fac6fe27d8 +Subproject commit 06933746d88ee3ea6b6b9a37cff68b71510daad2 From 6f4f63556f92f8277c2a3f02e0086bd06638c8c2 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Fri, 22 Nov 2024 15:14:09 +0100 Subject: [PATCH 05/36] From RSC: Fix toss4_ib + set view at top level only --- 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 3b03b70f8..8ad7a8632 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 3b03b70f8fdea22860738ecea357d49fe3549329 +Subproject commit 8ad7a8632c391ae7a21fbbb5b082ba0010b56136 From a1f126063bf5e35b04fa306c0e420406d42384d3 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Fri, 22 Nov 2024 16:33:57 +0100 Subject: [PATCH 06/36] From RSC: Update tioga toolchain: rocm 6.2.4, cray-mpich 8.1.31, cce 18.0.1 --- 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 8ad7a8632..0ca55ca8c 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 8ad7a8632c391ae7a21fbbb5b082ba0010b56136 +Subproject commit 0ca55ca8cb675eaa401f1659430d7faf40367cfe From e077aedccf1d3304398408c99dab44e992de886d Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Fri, 22 Nov 2024 17:16:28 +0100 Subject: [PATCH 07/36] Fix from RST and update local CI specs --- .gitlab/jobs/tioga.yml | 8 ++++---- scripts/radiuss-spack-configs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab/jobs/tioga.yml b/.gitlab/jobs/tioga.yml index 38dc44644..9818dbfea 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_18_0_0: +cce_18_0_1: variables: - SPEC: "~shared +fortran tests=basic %cce@=18.0.0" + SPEC: "~shared +fortran tests=basic %cce@=18.0.1" extends: .job_on_tioga ############ @@ -33,8 +33,8 @@ cce_18_0_0: # 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_2_0_hip_openmp_device_alloc: +rocmcc_6_2_4_hip_openmp_device_alloc: variables: - SPEC: "~shared +fortran +openmp +rocm +device_alloc tests=basic amdgpu_target=gfx90a %rocmcc@=6.2.0 ^hip@6.2.0" + SPEC: "~shared +fortran +openmp +rocm +device_alloc tests=basic amdgpu_target=gfx90a %rocmcc@=6.2.4 ^hip@6.2.4" extends: .job_on_tioga diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs index 0ca55ca8c..2425d8148 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 0ca55ca8cb675eaa401f1659430d7faf40367cfe +Subproject commit 2425d8148a4a6a2aa2d51c7eb1f71a8392343fde From 8fe91b5b83867eb7b5b372039d373865e6dfa94b Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Wed, 27 Nov 2024 17:23:33 +0100 Subject: [PATCH 08/36] Export CMakeCache file as artifact --- .gitlab/custom-jobs-and-variables.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab/custom-jobs-and-variables.yml b/.gitlab/custom-jobs-and-variables.yml index 3899cbc6a..eb381bbee 100644 --- a/.gitlab/custom-jobs-and-variables.yml +++ b/.gitlab/custom-jobs-and-variables.yml @@ -68,6 +68,8 @@ variables: # See Umpire for an example (export junit test reports). .custom_job: artifacts: + paths: + - *.cmake reports: junit: junit.xml From 0c60f8b220df100842533ea7b33b50d5aa0e0f36 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Wed, 27 Nov 2024 17:38:00 +0100 Subject: [PATCH 09/36] Fix attempt --- .gitlab/custom-jobs-and-variables.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/custom-jobs-and-variables.yml b/.gitlab/custom-jobs-and-variables.yml index eb381bbee..787ae92a5 100644 --- a/.gitlab/custom-jobs-and-variables.yml +++ b/.gitlab/custom-jobs-and-variables.yml @@ -69,7 +69,7 @@ variables: .custom_job: artifacts: paths: - - *.cmake + - ./*.cmake reports: junit: junit.xml From ce1b2e8bc333613b1238ce1f2286b8897f4c961b Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:09:51 +0100 Subject: [PATCH 10/36] Test: change hostconfig extension to make it readable in UI --- .gitlab/custom-jobs-and-variables.yml | 2 +- scripts/gitlab/build_and_test.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitlab/custom-jobs-and-variables.yml b/.gitlab/custom-jobs-and-variables.yml index 787ae92a5..bb40057dc 100644 --- a/.gitlab/custom-jobs-and-variables.yml +++ b/.gitlab/custom-jobs-and-variables.yml @@ -69,7 +69,7 @@ variables: .custom_job: artifacts: paths: - - ./*.cmake + - ./*.cmake.txt reports: junit: junit.xml diff --git a/scripts/gitlab/build_and_test.sh b/scripts/gitlab/build_and_test.sh index a7ca07228..ffc0fa294 100755 --- a/scripts/gitlab/build_and_test.sh +++ b/scripts/gitlab/build_and_test.sh @@ -167,6 +167,12 @@ fi hostconfig=$(basename ${hostconfig_path}) echo "[Information]: Found hostconfig ${hostconfig_path}" +# Create a copy of the hostconfig file with extension readable in GitLab UI (only in CI). +if [[ -n ${job_unique_id} ]] +then + cp ${hostconfig_path} ${project_dir}/${hostconfig}.txt +fi + # Build Directory # When using /dev/shm, we use prefix for both spack builds and source build, unless BUILD_ROOT was defined build_root=${BUILD_ROOT:-"${prefix}"} From 7f93ffda970ac860484dc8b881073dfcc126d9a1 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Thu, 28 Nov 2024 12:02:24 +0100 Subject: [PATCH 11/36] Revert "Test: change hostconfig extension to make it readable in UI" This reverts commit ce1b2e8bc333613b1238ce1f2286b8897f4c961b. --- .gitlab/custom-jobs-and-variables.yml | 2 +- scripts/gitlab/build_and_test.sh | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.gitlab/custom-jobs-and-variables.yml b/.gitlab/custom-jobs-and-variables.yml index bb40057dc..787ae92a5 100644 --- a/.gitlab/custom-jobs-and-variables.yml +++ b/.gitlab/custom-jobs-and-variables.yml @@ -69,7 +69,7 @@ variables: .custom_job: artifacts: paths: - - ./*.cmake.txt + - ./*.cmake reports: junit: junit.xml diff --git a/scripts/gitlab/build_and_test.sh b/scripts/gitlab/build_and_test.sh index ffc0fa294..a7ca07228 100755 --- a/scripts/gitlab/build_and_test.sh +++ b/scripts/gitlab/build_and_test.sh @@ -167,12 +167,6 @@ fi hostconfig=$(basename ${hostconfig_path}) echo "[Information]: Found hostconfig ${hostconfig_path}" -# Create a copy of the hostconfig file with extension readable in GitLab UI (only in CI). -if [[ -n ${job_unique_id} ]] -then - cp ${hostconfig_path} ${project_dir}/${hostconfig}.txt -fi - # Build Directory # When using /dev/shm, we use prefix for both spack builds and source build, unless BUILD_ROOT was defined build_root=${BUILD_ROOT:-"${prefix}"} From cc662728b73c12aa75046a5b7b946b4f74e2039f Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Thu, 28 Nov 2024 12:15:40 +0100 Subject: [PATCH 12/36] Give artifact a unique name --- .gitlab/custom-jobs-and-variables.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab/custom-jobs-and-variables.yml b/.gitlab/custom-jobs-and-variables.yml index 787ae92a5..2deea01da 100644 --- a/.gitlab/custom-jobs-and-variables.yml +++ b/.gitlab/custom-jobs-and-variables.yml @@ -68,10 +68,12 @@ variables: # See Umpire for an example (export junit test reports). .custom_job: artifacts: - paths: - - ./*.cmake reports: junit: junit.xml + name: + - ${CI_PROJECT_NAME}-${CI_MACHINE}-${CI_JOB_NAME}-${CI_PIPELINE_ID} + paths: + - ./*.cmake .reproducer_vars: script: From 2b0abe57ffc2f5953ac054fde8e5ea183ecb37a6 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Thu, 28 Nov 2024 12:22:13 +0100 Subject: [PATCH 13/36] Fix: artifact name should be a string --- .gitlab/custom-jobs-and-variables.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab/custom-jobs-and-variables.yml b/.gitlab/custom-jobs-and-variables.yml index 2deea01da..862c10c24 100644 --- a/.gitlab/custom-jobs-and-variables.yml +++ b/.gitlab/custom-jobs-and-variables.yml @@ -70,8 +70,7 @@ variables: artifacts: reports: junit: junit.xml - name: - - ${CI_PROJECT_NAME}-${CI_MACHINE}-${CI_JOB_NAME}-${CI_PIPELINE_ID} + name: "${CI_PROJECT_NAME}-${CI_MACHINE}-${CI_JOB_NAME}-${CI_PIPELINE_ID}" paths: - ./*.cmake From 29dd31ad905d56819f0e329d71ee5cb98792644e Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Thu, 28 Nov 2024 13:07:25 +0100 Subject: [PATCH 14/36] Update radiuss shared ci --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 553410c9f..e45d058a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,7 +71,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' @@ -85,7 +85,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: 'preliminary-ignore-draft-pr.yml' # pipelines subscribed by the project - local: '.gitlab/subscribed-pipelines.yml' From 69349a70c9cb5152740967e58668b7d3f9bfcc5c Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Mon, 2 Dec 2024 15:24:31 +0100 Subject: [PATCH 15/36] 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 4a8939f91..9c09b11a6 100644 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -4,7 +4,7 @@ "package_final_phase" : "initconfig", "package_source_dir" : "../..", "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 2425d8148..359f379f0 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 2425d8148a4a6a2aa2d51c7eb1f71a8392343fde +Subproject commit 359f379f086c39954301de889d8b40053979c517 From a777286644966d7c23c9f5bdad737cdeda400383 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Tue, 3 Dec 2024 09:55:14 +0100 Subject: [PATCH 16/36] 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 a7ca07228..a635e3a5c 100755 --- a/scripts/gitlab/build_and_test.sh +++ b/scripts/gitlab/build_and_test.sh @@ -203,10 +203,6 @@ then cmake_options="-DBLT_MPI_COMMAND_APPEND:STRING=--overlap" fi - if [[ "${truehostname}" == "corona" || "${truehostname}" == "tioga" ]] - then - module unload rocm - fi $cmake_exe \ -C ${hostconfig_path} \ ${cmake_options} \ From 51e56eb5c950d0fe730a945f40657a46b2b8ee5e Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Tue, 10 Dec 2024 15:08:30 +0100 Subject: [PATCH 17/36] 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 9c09b11a6..4a8939f91 100644 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -4,7 +4,7 @@ "package_final_phase" : "initconfig", "package_source_dir" : "../..", "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 77e2c264585e71394b4fc2c7d1ebc8e17c044b42 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Tue, 7 Jan 2025 16:10:20 +0100 Subject: [PATCH 18/36] Update RSC with improved compilers definition --- 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 359f379f0..09052234c 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 359f379f086c39954301de889d8b40053979c517 +Subproject commit 09052234c70ce9bb2f85e5d9ffa99c9e1b0aefc4 From b648b4eb0519e70dccc945d79c035d59b26d6acd Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Wed, 8 Jan 2025 10:48:05 +0100 Subject: [PATCH 19/36] From RSC: Fix: apply intel->oneapi to shared CI jobs --- 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 09052234c..83ceeb047 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 09052234c70ce9bb2f85e5d9ffa99c9e1b0aefc4 +Subproject commit 83ceeb0476644b2fe7385c80d542481d658fdd5a From 7b87968269f632460d85c59ca5fc9b8f92fb4cf0 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Wed, 8 Jan 2025 15:49:19 +0100 Subject: [PATCH 20/36] Test Spack@develop with https://github.com/spack/spack/pull/48067 merged --- .uberenv_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.uberenv_config.json b/.uberenv_config.json index 4a8939f91..f1bb62ec7 100644 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -4,7 +4,7 @@ "package_final_phase" : "initconfig", "package_source_dir" : "../..", "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", From 210364857e57dfab0b878f96b01c9e3d72c3f86e Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Wed, 8 Jan 2025 16:16:38 +0100 Subject: [PATCH 21/36] From RSC: update to rocm 6.3.0 on tioga --- .gitlab/jobs/tioga.yml | 4 ++-- scripts/radiuss-spack-configs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab/jobs/tioga.yml b/.gitlab/jobs/tioga.yml index 9818dbfea..96df23f6a 100644 --- a/.gitlab/jobs/tioga.yml +++ b/.gitlab/jobs/tioga.yml @@ -33,8 +33,8 @@ cce_18_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_2_4_hip_openmp_device_alloc: +rocmcc_6_3_0_hip_openmp_device_alloc: variables: - SPEC: "~shared +fortran +openmp +rocm +device_alloc tests=basic amdgpu_target=gfx90a %rocmcc@=6.2.4 ^hip@6.2.4" + SPEC: "~shared +fortran +openmp +rocm +device_alloc tests=basic amdgpu_target=gfx90a %rocmcc@=6.3.0 ^hip@6.3.0" extends: .job_on_tioga diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs index 83ceeb047..5883adf5a 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 83ceeb0476644b2fe7385c80d542481d658fdd5a +Subproject commit 5883adf5aefe09386dbdbc8061a47d738b75ebe6 From 78a763743d0fae14c0017c24b7c456546298449f Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Wed, 8 Jan 2025 17:28:12 +0100 Subject: [PATCH 22/36] Update RSC --- 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 5883adf5a..69d3ef1c8 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 5883adf5aefe09386dbdbc8061a47d738b75ebe6 +Subproject commit 69d3ef1c8836da14be85aa294cf460f1d9cc8360 From 7fa36cabc79cf03176ef0c02bd3ce68a273e0e80 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Fri, 10 Jan 2025 12:10:39 +0100 Subject: [PATCH 23/36] 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 69d3ef1c8..abb459f70 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 69d3ef1c8836da14be85aa294cf460f1d9cc8360 +Subproject commit abb459f707063cffaf357a9edf98090b11d1f0ed From d496f71e8e301c2b0b7f89f5a541bd08eacc0e44 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Mon, 13 Jan 2025 10:51:46 +0100 Subject: [PATCH 24/36] 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 f1bb62ec7..c791a8f2d 100644 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -4,7 +4,7 @@ "package_final_phase" : "initconfig", "package_source_dir" : "../..", "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 abb459f70..b8d76a3d8 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit abb459f707063cffaf357a9edf98090b11d1f0ed +Subproject commit b8d76a3d88b36d771f605b8af3c056b9803c5765 From 62ed5d2444d0e46a308182ec2f8b830c2e8a99bd Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Wed, 22 Jan 2025 11:13:42 +0100 Subject: [PATCH 25/36] 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 b8d76a3d8..991e007e6 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit b8d76a3d88b36d771f605b8af3c056b9803c5765 +Subproject commit 991e007e6030b12272ca189747e898291bc677f2 From 2b7a4bd139f62e8a4f4972069d15daa5803d9719 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Wed, 22 Jan 2025 11:32:12 +0100 Subject: [PATCH 26/36] 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 991e007e6..aec5d3e5c 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 991e007e6030b12272ca189747e898291bc677f2 +Subproject commit aec5d3e5c052baa9fb33db2dba5c34dacb3c6c26 From b121c5e5be93a5fceb62714336e9cda8c855c75e Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Wed, 22 Jan 2025 20:50:14 +0100 Subject: [PATCH 27/36] 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 aec5d3e5c..e74d9ed6b 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit aec5d3e5c052baa9fb33db2dba5c34dacb3c6c26 +Subproject commit e74d9ed6bc6dbb2092b895602cfd5f559ff52760 From 2558bad812f073f9e6d3943cea0decdeda7f1b5b Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Tue, 4 Feb 2025 10:27:03 +0100 Subject: [PATCH 28/36] Update uberenv and spack, better support of split environments --- .uberenv_config.json | 2 +- scripts/uberenv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.uberenv_config.json b/.uberenv_config.json index c791a8f2d..741333fc7 100644 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -4,7 +4,7 @@ "package_final_phase" : "initconfig", "package_source_dir" : "../..", "spack_url": "https://github.com/spack/spack.git", -"spack_branch": "develop-2025-01-12", +"spack_branch": "develop-2025-02-02", "spack_activate" : {}, "spack_configs_path": "scripts/radiuss-spack-configs", "spack_packages_path": "scripts/radiuss-spack-configs/packages", diff --git a/scripts/uberenv b/scripts/uberenv index 06933746d..44ab4ca47 160000 --- a/scripts/uberenv +++ b/scripts/uberenv @@ -1 +1 @@ -Subproject commit 06933746d88ee3ea6b6b9a37cff68b71510daad2 +Subproject commit 44ab4ca4751d570535a7941e7d0c2f613ec2502e From 8317347cc20f56941a18f9788718a9a71971a22a Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Tue, 4 Feb 2025 10:59:41 +0100 Subject: [PATCH 29/36] Update uberenv config file --- .uberenv_config.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.uberenv_config.json b/.uberenv_config.json index 741333fc7..069123b93 100644 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -5,10 +5,7 @@ "package_source_dir" : "../..", "spack_url": "https://github.com/spack/spack.git", "spack_branch": "develop-2025-02-02", -"spack_activate" : {}, "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_concretizer": "clingo" } From 3a92e3f32d185fd67d6ab1548b93b1b801b6ad53 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Tue, 4 Feb 2025 11:18:55 +0100 Subject: [PATCH 30/36] Do not try to setup clingo with spack --- .uberenv_config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.uberenv_config.json b/.uberenv_config.json index 069123b93..b79c42167 100644 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -7,5 +7,6 @@ "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_concretizer": "clingo", +"spack_setup_clingo": "false" } From d0bcdf571d3c9a35775ab93f22fe2a4a0221b9e6 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Tue, 4 Feb 2025 23:20:29 +0100 Subject: [PATCH 31/36] Test new PR in Uberenv --- .uberenv_config.json | 2 +- scripts/uberenv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.uberenv_config.json b/.uberenv_config.json index b79c42167..1e15bcacc 100644 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -8,5 +8,5 @@ "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 44ab4ca47..08c80a12d 160000 --- a/scripts/uberenv +++ b/scripts/uberenv @@ -1 +1 @@ -Subproject commit 44ab4ca4751d570535a7941e7d0c2f613ec2502e +Subproject commit 08c80a12d264cf2e8ad6b4c46033cbcedaee83d7 From 3b52b47df9cd0bc7bce2dfb2cace034f354f82bb Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Wed, 5 Feb 2025 15:28:55 +0100 Subject: [PATCH 32/36] Update Uberenv --- scripts/uberenv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/uberenv b/scripts/uberenv index 08c80a12d..6ba67dcbd 160000 --- a/scripts/uberenv +++ b/scripts/uberenv @@ -1 +1 @@ -Subproject commit 08c80a12d264cf2e8ad6b4c46033cbcedaee83d7 +Subproject commit 6ba67dcbd7ccbb9c03920b89de19ac959e2c3bdd From 83e0b6f4db056f402acc88f68f67122a6625e30d Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Thu, 6 Feb 2025 11:39:06 +0100 Subject: [PATCH 33/36] Update Spack to fix bug --- .uberenv_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.uberenv_config.json b/.uberenv_config.json index 1e15bcacc..c62218ae7 100644 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -4,7 +4,7 @@ "package_final_phase" : "initconfig", "package_source_dir" : "../..", "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", From 4f81be23a1b044323827fb1c534f571a6280aa2d Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Fri, 7 Feb 2025 15:31:45 +0100 Subject: [PATCH 34/36] 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 e74d9ed6b..5d16f366c 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit e74d9ed6bc6dbb2092b895602cfd5f559ff52760 +Subproject commit 5d16f366c1ee1e0db4491f856e82c3c600fef0a1 From 5faccc8929b9579fa59a6cd1e68147ee94b2176c Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Mon, 10 Feb 2025 20:23:14 +0100 Subject: [PATCH 35/36] 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 c62218ae7..c5678b363 100644 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -4,7 +4,7 @@ "package_final_phase" : "initconfig", "package_source_dir" : "../..", "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 21d26e5fc13931c793b51735e282c559f55a5eb6 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Mon, 10 Feb 2025 20:53:17 +0100 Subject: [PATCH 36/36] Fix --- .uberenv_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.uberenv_config.json b/.uberenv_config.json index c5678b363..b1b4671a3 100644 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -4,7 +4,7 @@ "package_final_phase" : "initconfig", "package_source_dir" : "../..", "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",