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' diff --git a/.gitlab/custom-jobs-and-variables.yml b/.gitlab/custom-jobs-and-variables.yml index 3899cbc6a..862c10c24 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: diff --git a/.gitlab/jobs/tioga.yml b/.gitlab/jobs/tioga.yml index 38dc44644..96df23f6a 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_3_0_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.3.0 ^hip@6.3.0" extends: .job_on_tioga diff --git a/.uberenv_config.json b/.uberenv_config.json index 4a8939f91..b1b4671a3 100644 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -4,11 +4,9 @@ "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", -"spack_setup_clingo": false, -"debug": true +"spack_setup_clingo": false } 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} \ diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs index 00c06c2d0..5d16f366c 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 205672b8b..6ba67dcbd 160000 --- a/scripts/uberenv +++ b/scripts/uberenv @@ -1 +1 @@ -Subproject commit 205672b8b2520d7dc69acefe8738960cd5db0937 +Subproject commit 6ba67dcbd7ccbb9c03920b89de19ac959e2c3bdd