diff --git a/.gitlab/jobs/corona.yml b/.gitlab/jobs/corona.yml index 9af5ba72b..c1fdc1c53 100644 --- a/.gitlab/jobs/corona.yml +++ b/.gitlab/jobs/corona.yml @@ -27,6 +27,9 @@ # ${PROJECT__DEPS} in the extra jobs. There is no reason not to fully # describe the spec here. -# With GitLab CI, included files cannot be empty. -variables: - INCLUDED_FILE_CANNOT_BE_EMPTY: "True" +clang_19_0_0_sycl_gcc_10_3_1_rocmcc_5_7_1_hip: + variables: + SPEC: " ~shared +sycl ~openmp %clang@=19.0.0 cxxflags==\"-w -fsycl -fsycl-unnamed-lambda -fsycl-targets=amdgcn-amd-amdhsa -Xsycl-target-backend --offload-arch=gfx906\" ^blt@develop" + MODULE_LIST: "rocm/5.7.1" + extends: .job_on_corona + allow_failure: true diff --git a/.gitlab/jobs/lassen.yml b/.gitlab/jobs/lassen.yml index 1b9bc0eda..ef997eb6d 100644 --- a/.gitlab/jobs/lassen.yml +++ b/.gitlab/jobs/lassen.yml @@ -18,14 +18,7 @@ # We keep ${PROJECT__VARIANTS} and ${PROJECT__DEPS} So that # the comparison with the original job is easier. -# Overriding shared spec: Longer allocation + extra flags -xl_2022_08_19_gcc_8_3_1_cuda_11_2_0: - variables: - SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda cxxflags==\"-qthreaded -std=c++14 -O3 -qstrict -qxlcompatmacros -qlanglvl=extended0x -qalias=noansi -qhot -qpic -qsmp=omp -qsuppress=1500-029 -qsuppress=1500-036\" %xl@=16.1.1.12.gcc.8.3.1 ^cuda@11.2.0+allow-unsupported-compilers ${PROJECT_LASSEN_DEPS}" - MODULE_LIST: "cuda/11.2.0" - LASSEN_JOB_ALLOC: "1 -W 60 -q pci" - extends: .job_on_lassen - +# No jobs overridden ############ # Extra jobs @@ -36,7 +29,7 @@ xl_2022_08_19_gcc_8_3_1_cuda_11_2_0: gcc_8_3_1: variables: - SPEC: " ~shared +openmp %gcc@=8.3.1 ${PROJECT_LASSEN_DEPS}" + SPEC: " ~shared +openmp %gcc@=8.3.1 ^blt@develop" extends: .job_on_lassen gcc_8_3_1_cuda_11_5_0_ats_disabled: @@ -69,8 +62,23 @@ clang_13_0_1_libcpp: # LSAN_OPTIONS: "suppressions=${CI_PROJECT_DIR}/tpl/RAJA/suppressions.asan" # extends: .job_on_lassen -# Activated in RAJA, but we don't use desul atomics here -#gcc_8_3_1_cuda_10_1_168_desul_atomics: -# variables: -# SPEC: "+openmp +cuda +desul %gcc@=8.3.1 cuda_arch=70 cuda_arch=70 ^cuda@10.1.243+allow-unsupported-compilers ${PROJECT_LASSEN_DEPS}" -# extends: .job_on_lassen +clang_16_0_6_ibm_omptarget: + variables: + SPEC: " ~shared +openmp +omptarget %clang@=16.0.6.ibm.gcc.8.3.1 ^blt@develop" + ON_LASSEN: "OFF" + extends: .job_on_lassen + +xl_2022_08_19_gcc_8_3_1_cuda_11_2_0: + variables: + SPEC: " ~shared +openmp cuda_arch=70 +cuda cxxflags==\"-qthreaded -std=c++14 -O3 -qstrict -qxlcompatmacros -qlanglvl=extended0x -qalias=noansi -qhot -qpic -qsmp=omp -qsuppress=1500-029 -qsuppress=1500-036\" %xl@=16.1.1.12.gcc.8.3.1 ^cuda@11.2.0+allow-unsupported-compilers ^blt@develop" + MODULE_LIST: "cuda/11.2.0" + LASSEN_JOB_ALLOC: "1 -W 60 -q pci" + extends: .job_on_lassen + +xl_2023_06_28_gcc_11_2_1_cuda_11_8_0: + variables: + SPEC: " ~shared +openmp cuda_arch=70 +cuda cxxflags==\"-qthreaded -std=c++14 -O3 -qstrict -qxlcompatmacros -qlanglvl=extended0x -qalias=noansi -qhot -qpic -qsmp=omp -qsuppress=1500-029 -qsuppress=1500-036\" %xl@=16.1.1.14.cuda.11.8.0.gcc.11.2.1 ^cuda@11.8.0+allow-unsupported-compilers ^blt@develop" + MODULE_LIST: "cuda/11.8.0" + LASSEN_JOB_ALLOC: "1 -W 60 -q pci" + extends: .job_on_lassen + diff --git a/.gitlab/jobs/poodle.yml b/.gitlab/jobs/poodle.yml index 8e86158f0..7e23bba18 100644 --- a/.gitlab/jobs/poodle.yml +++ b/.gitlab/jobs/poodle.yml @@ -28,11 +28,6 @@ gcc_10_3_1: SPEC: "${PROJECT_POODLE_VARIANTS} +omptask %gcc@=10.3.1 ${PROJECT_POODLE_DEPS}" extends: .job_on_poodle -intel_19_1_2_gcc_10_3_1: - variables: - SPEC: "${PROJECT_POODLE_VARIANTS} %intel@=19.1.2.gcc.10.3.1 ${PROJECT_POODLE_DEPS}" - extends: .job_on_poodle - intel_2022_1_0: variables: SPEC: "${PROJECT_POODLE_VARIANTS} %intel@=2022.1.0 ${PROJECT_POODLE_DEPS}" diff --git a/.gitlab/jobs/ruby.yml b/.gitlab/jobs/ruby.yml index c19e36d12..376604c15 100644 --- a/.gitlab/jobs/ruby.yml +++ b/.gitlab/jobs/ruby.yml @@ -29,12 +29,6 @@ gcc_10_3_1: RUBY_BUILD_AND_TEST_JOB_ALLOC: "--time=60 --nodes=1" extends: .job_on_ruby -intel_19_1_2_gcc_10_3_1: - variables: - SPEC: "${PROJECT_RUBY_VARIANTS} %intel@=19.1.2.gcc.10.3.1 ${PROJECT_RUBY_DEPS}" - RUBY_BUILD_AND_TEST_JOB_ALLOC: "--time=40 --nodes=1" - extends: .job_on_ruby - intel_2022_1_0: variables: SPEC: "${PROJECT_RUBY_VARIANTS} %intel@=2022.1.0 ${PROJECT_RUBY_DEPS}" diff --git a/.gitlab/jobs/tioga.yml b/.gitlab/jobs/tioga.yml index 00ed3c276..36db68790 100644 --- a/.gitlab/jobs/tioga.yml +++ b/.gitlab/jobs/tioga.yml @@ -27,13 +27,13 @@ # ${PROJECT__DEPS} in the extra jobs. There is no reason not to fully # describe the spec here. -rocmcc_6_1_1_hip_openmp: +rocmcc_6_2_0_hip_openmp: variables: - SPEC: "~shared +rocm +openmp amdgpu_target=gfx90a %rocmcc@=6.1.1 ^hip@6.1.1 ^blt@develop" + SPEC: "~shared +rocm +openmp amdgpu_target=gfx90a %rocmcc@=6.2.0 ^hip@6.2.0 ^blt@develop" extends: .job_on_tioga -rocmcc_6_1_1_hip_openmp_mpi: +rocmcc_6_2_0_hip_openmp_mpi: variables: - SPEC: "~shared +rocm +openmp +mpi amdgpu_target=gfx90a %rocmcc@=6.1.1 ^hip@6.1.1 ^blt@develop" + SPEC: "~shared +rocm +openmp +mpi amdgpu_target=gfx90a %rocmcc@=6.2.0 ^hip@6.2.0 ^blt@develop" extends: .job_on_tioga allow_failure: true diff --git a/.uberenv_config.json b/.uberenv_config.json index fda595d3a..a88765962 100644 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -1,10 +1,10 @@ { -"package_name" : "raja_perf", +"package_name" : "raja-perf", "package_version" : "develop", "package_final_phase" : "initconfig", "package_source_dir" : "../..", "spack_url": "https://github.com/spack/spack.git", -"spack_branch": "develop-2024-05-26", +"spack_commit": "d7f5dbaf8911387d6c38035f0d508702ee71b03a", "spack_activate" : {}, "spack_configs_path": "tpl/RAJA/scripts/radiuss-spack-configs", "spack_packages_path": "tpl/RAJA/scripts/radiuss-spack-configs/packages", diff --git a/scripts/gitlab/build_and_test.sh b/scripts/gitlab/build_and_test.sh index f2d020918..44a89a1f3 100755 --- a/scripts/gitlab/build_and_test.sh +++ b/scripts/gitlab/build_and_test.sh @@ -28,6 +28,7 @@ job_unique_id=${CI_JOB_ID:-""} use_dev_shm=${USE_DEV_SHM:-true} spack_debug=${SPACK_DEBUG:-false} debug_mode=${DEBUG_MODE:-false} +push_to_registry=${PUSH_TO_REGISTRY:-true} raja_version=${UPDATE_RAJA:-""} sys_type=${SYS_TYPE:-""} @@ -59,6 +60,7 @@ then echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" use_dev_shm=false spack_debug=true + push_to_registry=false fi if [[ -n ${module_list} ]] @@ -149,7 +151,7 @@ then timed_message "Spack build of dependencies" ${uberenv_cmd} --skip-setup-and-env --spec="${spec}" ${prefix_opt} ${upstream_opt} - if [[ -n ${ci_registry_token} && ${debug_mode} == false ]] + if [[ -n ${ci_registry_token} && ${push_to_registry} == true ]] then timed_message "Push dependencies to buildcache" ${spack_cmd} -D ${spack_env_path} buildcache push --only dependencies gitlab_ci diff --git a/tpl/RAJA b/tpl/RAJA index 378199aac..ab60a8d66 160000 --- a/tpl/RAJA +++ b/tpl/RAJA @@ -1 +1 @@ -Subproject commit 378199aac342ee21c2ddfbcbb48413bd1dfac612 +Subproject commit ab60a8d6654e5c0e5fc450aa43e93262e9802387