Update GPU CI configuration

[alexxy/gromacs.git] / admin / gitlab-ci / gromacs.matrix / gromacs.hipsycl-dev.gitlab-ci.yml

diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.hipsycl-dev.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.hipsycl-dev.gitlab-ci.yml
index bd6b25e8f5c3d145332ee56c6405043cdb0c4e18..9a9f1166b32d3e1d52d95b0f5dca58d2fd3bef79 100644 (file)
--- a/admin/gitlab-ci/gromacs.matrix/gromacs.hipsycl-dev.gitlab-ci.yml
+++ b/admin/gitlab-ci/gromacs.matrix/gromacs.hipsycl-dev.gitlab-ci.yml
@@ -7,7 +7,7 @@
 # Test implementation choices (free to change as needed):
 #   OS: Ubuntu 20.04
 #   Build type: RelWithAssert
-#   Compiler: Clang 12 (ROCm)
+#   Compiler: Clang 13 (from ROCm)
 #   MPI: thread_MPI
 #   SIMD: AVX2_256
 
@@ -17,7 +17,7 @@ gromacs:hipsycl-dev:configure:
     - .use-clang:base
     - .use-sycl
     - .rules:merge-and-post-merge-acceptance
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-cuda-11.2.2-hipsycl-0bf6420aab18-rocm-4.2
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-12-cuda-11.4.1-hipsycl-7a309b808-rocm-4.3
   variables:
     CMAKE: /usr/local/cmake-3.18.4/bin/cmake
     CMAKE_SIMD_OPTIONS: "-DGMX_SIMD=AVX2_256"
@@ -30,7 +30,7 @@ gromacs:hipsycl-dev:configure:
     CMAKE_GPU_OPTIONS: "-DGMX_GPU=SYCL -DGMX_SYCL_HIPSYCL=ON -DHIPSYCL_TARGETS='hip:gfx900'"
     # Unset COMPILER_LAUNCHER (previously set to ccache) because it conflicts with hipSYCL's syclcc-launcher
     CMAKE_EXTRA_OPTIONS: "-DCMAKE_C_COMPILER_LAUNCHER= -DCMAKE_CXX_COMPILER_LAUNCHER="
-    COMPILER_MAJOR_VERSION: 11
+    COMPILER_MAJOR_VERSION: 13
 
 gromacs:hipsycl-dev:build:
   extends:
@@ -39,7 +39,7 @@ gromacs:hipsycl-dev:build:
     - .before_script:default
     # Not using ccache because it plays poorly with syclcc-launcher
     - .rules:merge-and-post-merge-acceptance
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-cuda-11.2.2-hipsycl-0bf6420aab18-rocm-4.2
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-12-cuda-11.4.1-hipsycl-7a309b808-rocm-4.3
   variables:
     CMAKE: /usr/local/cmake-3.18.4/bin/cmake
   tags: