From a989bd27e9bfcea6257bcc6a9cead3a412d0ab6b Mon Sep 17 00:00:00 2001 From: Adrien Bernede <51493078+adrienbernede@users.noreply.github.com> Date: Thu, 13 Feb 2025 20:45:34 +0100 Subject: [PATCH] Various updates in RADIUSS Spack Configs (#290) * Spack environments split in separate files so that users can access packages.yaml and compilers.yaml directly * Update externals, add new externals to support building other projects (axom) * Make sure we do not reuse specs already installed (concretization is not influenced by what's already built) * Update rocm tioga toolchain * Update with improved job command handling * Export host config as artifacts * More uniform CI specs (build raja without examples) --------- Co-authored-by: Alan Dayton <6393677+adayton1@users.noreply.github.com> --- .gitlab-ci.yml | 4 ++-- .gitlab/custom-jobs-and-variables.yml | 3 +++ .gitlab/jobs/lassen.yml | 12 ++++++------ .gitlab/jobs/poodle.yml | 8 +------- .gitlab/jobs/ruby.yml | 8 +------- .uberenv_config.json | 3 +-- scripts/gitlab/build_and_test.sh | 4 ---- scripts/radiuss-spack-configs | 2 +- scripts/uberenv | 2 +- 9 files changed, 16 insertions(+), 30 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 37810036..47261d03 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.04.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.04.0' + # ref: 'v2024.12.0' # file: 'preliminary-ignore-draft-pr.yml' # pipelines subscribed by the project - local: '.gitlab/subscribed-pipelines.yml' diff --git a/.gitlab/custom-jobs-and-variables.yml b/.gitlab/custom-jobs-and-variables.yml index 8abe1a25..24949caf 100644 --- a/.gitlab/custom-jobs-and-variables.yml +++ b/.gitlab/custom-jobs-and-variables.yml @@ -71,6 +71,9 @@ variables: artifacts: reports: junit: junit.xml + name: "${CI_PROJECT_NAME}-${CI_MACHINE}-${CI_JOB_NAME}-${CI_PIPELINE_ID}" + paths: + - ./*.cmake .reproducer_vars: script: diff --git a/.gitlab/jobs/lassen.yml b/.gitlab/jobs/lassen.yml index 11604cb5..79901054 100644 --- a/.gitlab/jobs/lassen.yml +++ b/.gitlab/jobs/lassen.yml @@ -36,32 +36,32 @@ gcc_11_2_1_cuda_11_8_0: clang_12_0_1_libcpp: extends: .job_on_lassen variables: - SPEC: "~shared +raja tests=basic %clang@12.0.1 cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\"" + SPEC: "~shared +raja tests=basic %clang@12.0.1 cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\" ^raja~examples~exercises" clang_16_0_6_libcpp: extends: .job_on_lassen variables: - SPEC: "~shared +raja tests=basic %clang@16.0.6 cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\"" + SPEC: "~shared +raja tests=basic %clang@16.0.6 cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\" ^raja~examples~exercises" clang_12_0_1_gcc_8_3_1_memleak: extends: .job_on_lassen variables: - SPEC: "~shared +raja tests=basic %clang@12.0.1.gcc.8.3.1 cxxflags==\"-fsanitize=address\"" + SPEC: "~shared +raja tests=basic %clang@12.0.1.gcc.8.3.1 cxxflags==\"-fsanitize=address\" ^raja~examples~exercises" ASAN_OPTIONS: "detect_leaks=1" clang_16_0_6_gcc_8_3_1_memleak: extends: .job_on_lassen variables: - SPEC: "~shared +raja tests=basic %clang@16.0.6.gcc.8.3.1 cxxflags==\"-fsanitize=address\"" + SPEC: "~shared +raja tests=basic %clang@16.0.6.gcc.8.3.1 cxxflags==\"-fsanitize=address\" ^raja~examples~exercises" ASAN_OPTIONS: "detect_leaks=1" clang_12_0_1_datarace: extends: .job_on_lassen variables: - SPEC: "~shared +raja tests=basic %clang@12.0.1 cxxflags==\"-fsanitize=thread\"" + SPEC: "~shared +raja tests=basic %clang@12.0.1 cxxflags==\"-fsanitize=thread\" ^raja~examples~exercises" clang_16_0_6_datarace: extends: .job_on_lassen variables: - SPEC: "~shared +raja tests=basic %clang@16.0.6 cxxflags==\"-fsanitize=thread\"" + SPEC: "~shared +raja tests=basic %clang@16.0.6 cxxflags==\"-fsanitize=thread\" ^raja~examples~exercises" diff --git a/.gitlab/jobs/poodle.yml b/.gitlab/jobs/poodle.yml index 04cef7a9..387d835c 100644 --- a/.gitlab/jobs/poodle.yml +++ b/.gitlab/jobs/poodle.yml @@ -28,12 +28,6 @@ clang_14_0_6_develop_tpls: variables: - SPEC: " %clang@14.0.6 ^umpire@develop ^raja@develop ^camp@main" - extends: .job_on_poodle - allow_failure: true - -clang_16_0_6_develop_tpls: - variables: - SPEC: " %clang@16.0.6 ^umpire@develop ^raja@develop ^camp@main" + SPEC: " ~shared +raja tests=basic %clang@=14.0.6 ^umpire@develop ^raja@develop~examples~exercises ^camp@main" extends: .job_on_poodle allow_failure: true diff --git a/.gitlab/jobs/ruby.yml b/.gitlab/jobs/ruby.yml index 44fad39b..df28ccf1 100644 --- a/.gitlab/jobs/ruby.yml +++ b/.gitlab/jobs/ruby.yml @@ -28,12 +28,6 @@ clang_14_0_6_develop_tpls: variables: - SPEC: " %clang@14.0.6 ^umpire@develop ^raja@develop ^camp@main" - extends: .job_on_ruby - allow_failure: true - -clang_16_0_6_develop_tpls: - variables: - SPEC: " %clang@16.0.6 ^umpire@develop ^raja@develop ^camp@main" + SPEC: " ~shared +raja tests=basic %clang@14.0.6 ^umpire@develop ^raja@develop~examples~exercises ^camp@main" extends: .job_on_ruby allow_failure: true diff --git a/.uberenv_config.json b/.uberenv_config.json index 1c348e5d..61e1737b 100644 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -4,8 +4,7 @@ "package_final_phase" : "initconfig", "package_source_dir" : "../..", "spack_url": "https://github.com/spack/spack.git", -"spack_branch": "develop-2024-10-06", -"spack_activate" : {}, +"spack_branch": "develop-2025-02-09", "spack_configs_path": "scripts/radiuss-spack-configs", "spack_packages_path": "scripts/radiuss-spack-configs/packages", "spack_concretizer": "clingo", diff --git a/scripts/gitlab/build_and_test.sh b/scripts/gitlab/build_and_test.sh index 6436c925..bc8dc7f2 100755 --- a/scripts/gitlab/build_and_test.sh +++ b/scripts/gitlab/build_and_test.sh @@ -222,10 +222,6 @@ then mkdir -p ${build_dir} && cd ${build_dir} timed_message "Building CHAI" - if [[ "${truehostname}" == "corona" || "${truehostname}" == "tioga" ]] - then - module unload rocm - fi $cmake_exe \ -C ${hostconfig_path} \ -DCMAKE_INSTALL_PREFIX=${install_dir} \ diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs index 00c06c2d..5d16f366 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 00c06c2d0258802fbf4a57ff987314d4acd9f629 +Subproject commit 5d16f366c1ee1e0db4491f856e82c3c600fef0a1 diff --git a/scripts/uberenv b/scripts/uberenv index 205672b8..6ba67dcb 160000 --- a/scripts/uberenv +++ b/scripts/uberenv @@ -1 +1 @@ -Subproject commit 205672b8b2520d7dc69acefe8738960cd5db0937 +Subproject commit 6ba67dcbd7ccbb9c03920b89de19ac959e2c3bdd