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