diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e56b7283281889c7d93dfa1db5a935af75bacb22..12664433619e3bd93b36076c82ac520cb2609f57 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -248,9 +248,9 @@ base: # - BASE_IMAGE: intel/oneapi-hpckit:2022.3.0-devel-ubuntu20.04 # BUILD_IMAGE: oneapi_base # PLATFORM: linux/amd64 -# - BASE_IMAGE: nvidia/cuda:11.8.0-devel-ubuntu20.04 -# BUILD_IMAGE: cuda_base -# PLATFORM: linux/amd64 + - BASE_IMAGE: nvidia/cuda:12.4.1-devel-ubuntu22.04 + BUILD_IMAGE: cuda_base + PLATFORM: linux/amd64 extends: .build stage: base needs: @@ -303,15 +303,15 @@ eic: # PLATFORM: linux/amd64 # ENV: # - prod -# - BUILD_TYPE: -# - default -# - nightly -# BUILDER_IMAGE: cuda_base_new -# RUNTIME_IMAGE: cuda_base_new -# BUILD_IMAGE: cuda_ -# PLATFORM: linux/amd64 -# ENV: -# - prod + - BUILD_TYPE: + - default + BUILDER_IMAGE: cuda_base + RUNTIME_IMAGE: cuda_base + BASE_IMAGE: cuda_base + BUILD_IMAGE: cuda_ + PLATFORM: linux/amd64 + ENV: + - xl extends: .build stage: eic needs: diff --git a/spack.sh b/spack.sh index 11a69ab856924131be079dffdc66510590f57538..db79671c94197f31f9017597ac8a64b09a9538bb 100644 --- a/spack.sh +++ b/spack.sh @@ -11,6 +11,7 @@ read -r -d '' SPACK_CHERRYPICKS <<- \ 09f75ee426a2e05e0543570821582480ff823ba5 f6d50f790ee8b123f7775429f6ca6394170e6de9 63f6e6079aacc99078386e5c8ff06173841b9595 +9bcc43c4c158639fa6cb575c6106595a34682081 --- ## Optional hash table with comma-separated file list read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ @@ -21,3 +22,4 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ ## 09f75ee426a2e05e0543570821582480ff823ba5: setup-env.sh: if exe contains qemu, use /proc/$$/comm instead ## f6d50f790ee8b123f7775429f6ca6394170e6de9: gaudi: Add version 38.1 ## 63f6e6079aacc99078386e5c8ff06173841b9595: gaudi: upstream patch when @38.1 for missing #include <list> +## 9bcc43c4c158639fa6cb575c6106595a34682081: protobuf: update hash for patch needed when="@3.4:3.21"