From 8f7554c00a4fe206ed36d9964f4b5088c20a3ae5 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Thu, 5 Sep 2024 15:32:09 +0200 Subject: [PATCH 1/6] Update RSC with changes to sync with Spack update --- .gitlab/jobs/poodle.yml | 20 ++++++++++---------- .gitlab/jobs/ruby.yml | 4 ++-- .uberenv_config.json | 2 +- scripts/radiuss-spack-configs | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.gitlab/jobs/poodle.yml b/.gitlab/jobs/poodle.yml index c1fb433dbc..7197fe79ac 100644 --- a/.gitlab/jobs/poodle.yml +++ b/.gitlab/jobs/poodle.yml @@ -17,26 +17,26 @@ # project. We keep ${PROJECT__VARIANTS} and ${PROJECT__DEPS} # when possible so that the comparison with the original job is easier. -# Known issue currently under investigation -# https://github.com/LLNL/RAJA/pull/1712#issuecomment-2292006843 -intel_2023_2_1: - variables: - SPEC: "${PROJECT_POODLE_VARIANTS} %intel@=2023.2.1 ${PROJECT_POODLE_DEPS}" - extends: .job_on_poodle - allow_failure: true - # Identical to shared job, but use OpenMP tasks and no vectorization clang_14_0_6: variables: - SPEC: " ~shared +openmp +omptask +tests %clang@=14.0.6 ${PROJECT_POODLE_DEPS}" + SPEC: " ~shared +openmp +omptask ~vectorization +tests %clang@=14.0.6 ${PROJECT_POODLE_DEPS}" extends: .job_on_poodle # Identical to shared job, but use OpenMP tasks and no vectorization gcc_10_3_1: variables: - SPEC: " ~shared +openmp +omptask +tests %gcc@=10.3.1 ${PROJECT_POODLE_DEPS}" + SPEC: " ~shared +openmp +omptask ~vectorization +tests %gcc@=10.3.1 ${PROJECT_POODLE_DEPS}" extends: .job_on_poodle +# Known issue currently under investigation +# https://github.com/LLNL/RAJA/pull/1712#issuecomment-2292006843 +intel_2023_2_1: + variables: + SPEC: "${PROJECT_POODLE_VARIANTS} %intel@=2023.2.1 ${PROJECT_POODLE_DEPS}" + extends: .job_on_poodle + allow_failure: true + ############ # Extra jobs ############ diff --git a/.gitlab/jobs/ruby.yml b/.gitlab/jobs/ruby.yml index 012a822b0d..914fa69d57 100644 --- a/.gitlab/jobs/ruby.yml +++ b/.gitlab/jobs/ruby.yml @@ -20,13 +20,13 @@ # Identical to shared job, but use OpenMP tasks and no vectorization clang_14_0_6: variables: - SPEC: " ~shared +openmp +omptask +tests %clang@=14.0.6 ${PROJECT_RUBY_DEPS}" + SPEC: " ~shared +openmp +omptask ~vectorization +tests %clang@=14.0.6 ${PROJECT_RUBY_DEPS}" extends: .job_on_ruby # Identical to shared job, but use OpenMP tasks and no vectorization gcc_10_3_1: variables: - SPEC: " ~shared +openmp +omptask +tests %gcc@=10.3.1 ${PROJECT_RUBY_DEPS}" + SPEC: " ~shared +openmp +omptask ~vectorization +tests %gcc@=10.3.1 ${PROJECT_RUBY_DEPS}" extends: .job_on_ruby # Known issue currently under investigation diff --git a/.uberenv_config.json b/.uberenv_config.json index d89b97cb29..555d5b9d8d 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-07-07", +"spack_branch": "woptim/radiuss-packages-update", "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 f6724f418d..990fa88208 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit f6724f418d29edd1448217c817384ff54fcc7c47 +Subproject commit 990fa88208bf14cb1f90471892406564da542d57 From a3d912c89c77faae14166ffd510f27d75cf64767 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Thu, 5 Sep 2024 17:17:23 +0200 Subject: [PATCH 2/6] From RSC: Fix style --- 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 990fa88208..26c3a71637 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 990fa88208bf14cb1f90471892406564da542d57 +Subproject commit 26c3a71637153a1a1c97c9db6ada57047fe20b8e From 33009f99cfde66a350d87c4fbb32216754bb096e Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Thu, 5 Sep 2024 20:37:22 +0200 Subject: [PATCH 3/6] From RSC: Fix --- 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 26c3a71637..846b5453c9 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 26c3a71637153a1a1c97c9db6ada57047fe20b8e +Subproject commit 846b5453c940b398ff5a0fa36a6571c2c3265381 From b53175c1be05fc370391f01d2483fabd153ac41e Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Fri, 6 Sep 2024 16:48:59 +0200 Subject: [PATCH 4/6] Leverage new registry --- scripts/gitlab/build_and_test.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/gitlab/build_and_test.sh b/scripts/gitlab/build_and_test.sh index 15d27e64a0..295badcf23 100755 --- a/scripts/gitlab/build_and_test.sh +++ b/scripts/gitlab/build_and_test.sh @@ -31,10 +31,14 @@ debug_mode=${DEBUG_MODE:-false} # REGISTRY_TOKEN allows you to provide your own personal access token to the CI # registry. Be sure to set the token with at least read access to the registry. -registry_token=${REGISTRY_TOKEN:-""} +# Priority is given to REGISTRY_, otherwise defaulting to GitLab CI +# registry and in last resort (typically personal use) to sensible defaults. +ci_registry_token=${CI_REGISTRY_TOKEN:-""} ci_registry_user=${CI_REGISTRY_USER:-"${USER}"} ci_registry_image=${CI_REGISTRY_IMAGE:-"czregistry.llnl.gov:5050/radiuss/raja"} -ci_registry_token=${CI_JOB_TOKEN:-"${registry_token}"} +registry_user=${REGISTRY_USER:-"${ci_registry_user}"} +registry_image=${REGISTRY_IMAGE:-"${ci_registry_image}"} +registry_token=${JOB_TOKEN:-"${ci_registry_token}"} timed_message () { From a547e0421ebecfb91b0eee81f6b9729fbba86c71 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Fri, 6 Sep 2024 17:26:27 +0200 Subject: [PATCH 5/6] Fix: missing changes for new registry --- scripts/gitlab/build_and_test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/gitlab/build_and_test.sh b/scripts/gitlab/build_and_test.sh index 295badcf23..0e6971e26b 100755 --- a/scripts/gitlab/build_and_test.sh +++ b/scripts/gitlab/build_and_test.sh @@ -125,16 +125,16 @@ then timed_message "Spack setup and environment" ${uberenv_cmd} --setup-and-env-only --spec="${spec}" ${prefix_opt} - if [[ -n ${ci_registry_token} ]] + if [[ -n ${registry_token} ]] then timed_message "GitLab registry as Spack Buildcache" - ${spack_cmd} -D ${spack_env_path} mirror add --unsigned --oci-username ${ci_registry_user} --oci-password ${ci_registry_token} gitlab_ci oci://${ci_registry_image} + ${spack_cmd} -D ${spack_env_path} mirror add --unsigned --oci-username ${registry_user} --oci-password ${registry_token} gitlab_ci oci://${registry_image} fi timed_message "Spack build of dependencies" ${uberenv_cmd} --skip-setup-and-env --spec="${spec}" ${prefix_opt} - if [[ -n ${ci_registry_token} && ${debug_mode} == false ]] + if [[ -n ${registry_token} && ${debug_mode} == false ]] then timed_message "Push dependencies to buildcache" ${spack_cmd} -D ${spack_env_path} buildcache push --only dependencies gitlab_ci From 07dcce9abd9b92efab79f542a94f81a389d0a32d Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Fri, 6 Sep 2024 17:41:49 +0200 Subject: [PATCH 6/6] Fix: error in variables --- scripts/gitlab/build_and_test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/gitlab/build_and_test.sh b/scripts/gitlab/build_and_test.sh index 0e6971e26b..e9ce67b00a 100755 --- a/scripts/gitlab/build_and_test.sh +++ b/scripts/gitlab/build_and_test.sh @@ -33,12 +33,12 @@ debug_mode=${DEBUG_MODE:-false} # registry. Be sure to set the token with at least read access to the registry. # Priority is given to REGISTRY_, otherwise defaulting to GitLab CI # registry and in last resort (typically personal use) to sensible defaults. -ci_registry_token=${CI_REGISTRY_TOKEN:-""} +ci_registry_token=${CI_JOB_TOKEN:-""} ci_registry_user=${CI_REGISTRY_USER:-"${USER}"} ci_registry_image=${CI_REGISTRY_IMAGE:-"czregistry.llnl.gov:5050/radiuss/raja"} registry_user=${REGISTRY_USER:-"${ci_registry_user}"} registry_image=${REGISTRY_IMAGE:-"${ci_registry_image}"} -registry_token=${JOB_TOKEN:-"${ci_registry_token}"} +registry_token=${REGISTRY_TOKEN:-"${ci_registry_token}"} timed_message () {