Merge remote-tracking branch 'origin' into 31-ci-benchmarking

GridTools · Sep 12, 2024 · 25e9a7c · 25e9a7c
2 parents f18450d + b4dbfe3
commit 25e9a7c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/ci/cscs.yml b/ci/cscs.yml
@@ -10,7 +10,7 @@ variables:
   CUDA_DRIVER_VERSION: "470.57.02"
   PROJECT_NAME: gridtools_jl
   PERSIST_IMAGE_NAME: $CSCS_REGISTRY_PATH/pasc_kilos/${CONTAINER_RUNNER}/${PROJECT_NAME}_image:$CI_COMMIT_SHORT_SHA
-  CPU_ARCH: "x86_64"  # use a generic architecture here instead of linux-sles15-haswell, such that it can build on zen2
+  CPU_ARCH: "x86_64_v3"  # use a generic architecture here instead of linux-sles15-haswell, such that it can build on zen2
 
 include:
   - remote: 'https://gitlab.com/cscs-ci/recipes/-/raw/master/templates/v2/.ci-ext.yml'

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
@@ -1,4 +1,4 @@
-# just a counter to trigger rebuilds: 2
+# just a counter to trigger rebuilds: 3
 FROM ubuntu:23.04 as builder
 ARG INSTALL_CUDA_DRIVER=false
 ARG CUDA_DRIVER_VERSION

diff --git a/docker/base_deps/Dockerfile b/docker/base_deps/Dockerfile
@@ -1,4 +1,4 @@
-# rebuild counter 2  # just a counter to increase when we want a new image
+# rebuild counter 3  # just a counter to increase when we want a new image
 ARG BASE_IMAGE=gridtools_jl_spack_deps_image
 FROM $BASE_IMAGE as builder
 ARG PROJECT_NAME

diff --git a/docker/base_spack_deps/Dockerfile b/docker/base_spack_deps/Dockerfile
@@ -1,4 +1,4 @@
-# rebuild counter 2  # just a counter to increase when we want a new image
+# rebuild counter 3  # just a counter to increase when we want a new image
 ARG BASE_IMAGE=gridtools_jl_base_image
 FROM $BASE_IMAGE as builder
 ARG PROJECT_NAME=gridtools_jl