diff --git a/.gitlab/jobs/tioga.yml b/.gitlab/jobs/tioga.yml index 5249664785..e41f50e111 100644 --- a/.gitlab/jobs/tioga.yml +++ b/.gitlab/jobs/tioga.yml @@ -37,12 +37,12 @@ cce_17_0_1: SPEC: "${PROJECT_TIOGA_VARIANTS} %cce@=17.0.1 ${PROJECT_TIOGA_DEPS}" extends: .job_on_tioga -rocmcc_6_2_4_hip_desul_atomics: +rocmcc_6_3_0_hip_desul_atomics: variables: - SPEC: "~shared +rocm ~openmp +desul +tests amdgpu_target=gfx90a %rocmcc@=6.2.4 ^hip@6.2.4" + SPEC: "~shared +rocm ~openmp +desul +tests amdgpu_target=gfx90a %rocmcc@=6.3.0 ^hip@6.3.0" extends: .job_on_tioga -rocmcc_6_2_4_hip_openmp: +rocmcc_6_3_0_hip_openmp: variables: - SPEC: "~shared +rocm +openmp +omptask +tests amdgpu_target=gfx90a %rocmcc@=6.2.4 ^hip@6.2.4" + SPEC: "~shared +rocm +openmp +omptask +tests 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 24d40058b7..e695309414 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", diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs index 359f379f08..69d3ef1c88 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 359f379f086c39954301de889d8b40053979c517 +Subproject commit 69d3ef1c8836da14be85aa294cf460f1d9cc8360