Use ubuntu 2024.04 in CI (#1140)

eth-cscs · Sep 17, 2024 · a64c822 · a64c822
1 parent 36c4cfa
commit a64c822
Show file tree

Hide file tree

Showing 24 changed files with 142 additions and 127 deletions.
diff --git a/ci/.gitlab-ci.yml b/ci/.gitlab-ci.yml
@@ -1,16 +1,16 @@
 include:
   - local: 'ci/cpu/asan_ubsan_lsan.yml'
-  - local: 'ci/cpu/clang12_release.yml'
-  - local: 'ci/cpu/clang13_release_cxx20.yml'
-  - local: 'ci/cpu/clang14_release_stdexec.yml'
+  - local: 'ci/cpu/clang15_release_cxx20.yml'
+  - local: 'ci/cpu/clang15_release_stdexec.yml'
   - local: 'ci/cpu/clang15_release.yml'
   - local: 'ci/cpu/clang16_release.yml'
-  - local: 'ci/cpu/gcc11_codecov.yml'
-  - local: 'ci/cpu/gcc11_release.yml'
+  - local: 'ci/cpu/clang18_release.yml'
   # https://github.com/eth-cscs/DLA-Future/issues/1184
   # - local: 'ci/cpu/gcc11_release_stdexec.yml'
   # - local: 'ci/cpu/gcc11_debug_stdexec.yml'
   - local: 'ci/cpu/gcc12_release_cxx20.yml'
+  - local: 'ci/cpu/gcc13_codecov.yml'
+  - local: 'ci/cpu/gcc13_release.yml'
   - local: 'ci/cuda/gcc11_release.yml'
   - local: 'ci/cuda/gcc11_release_scalapack.yml'
   - local: 'ci/cuda/gcc11_codecov.yml'

diff --git a/ci/common-ci.yml b/ci/common-ci.yml
@@ -53,7 +53,7 @@ stages:
     # default configuration variables
     # can be overwritten in the configuration as needed
     DOCKERFILE: ci/docker/build.Dockerfile
-    BASE_IMAGE: docker.io/ubuntu:22.04
+    BASE_IMAGE: docker.io/ubuntu:24.04
     EXTRA_APTGET: ""
     CXXSTD: 17
     USE_MKL: "OFF"
@@ -76,15 +76,17 @@ stages:
         "BUILD_IMAGE",
         "DEPLOY_BASE_IMAGE",
         "EXTRA_APTGET_DEPLOY",
+        "PIP_OPTS",
         "USE_MKL",
         "USE_ROCBLAS",
         "NUM_PROCS=$NUM_CORES_BUILD_DLAF"
       ]'
     # default configuration variables
     # can be overwritten in the configuration as needed
     DOCKERFILE: ci/docker/deploy.Dockerfile
-    DEPLOY_BASE_IMAGE: docker.io/ubuntu:22.04
+    DEPLOY_BASE_IMAGE: docker.io/ubuntu:24.04
     EXTRA_APTGET_DEPLOY: ""
+    PIP_OPTS: ""
   artifacts:
     paths:
       - pipeline.yml

diff --git a/ci/cpu/asan_ubsan_lsan.yml b/ci/cpu/asan_ubsan_lsan.yml
@@ -4,8 +4,8 @@ include:
 cpu asan ubsan lsan deps:
   extends: .build_deps_common
   variables:
-    EXTRA_APTGET: "clang-15 libomp-15-dev"
-    COMPILER: clang@15
+    EXTRA_APTGET: "clang-18 libclang-rt-18-dev libomp-18-dev"
+    COMPILER: clang@18
     USE_MKL: "ON"
     SPACK_ENVIRONMENT: ci/docker/asan-ubsan-lsan.yaml
     BUILD_IMAGE: $CSCS_REGISTRY_PATH/cpu-asan-ubsan-lsan/build
@@ -19,7 +19,7 @@ cpu asan ubsan lsan build:
   variables:
     DEPLOY_IMAGE: $CSCS_REGISTRY_PATH/cpu-asan-ubsan-lsan/deploy:$CI_COMMIT_SHA
     # For symbolizing stacktraces with llvm-symbolizer
-    EXTRA_APTGET_DEPLOY: "llvm-15"
+    EXTRA_APTGET_DEPLOY: "llvm-18"
 
 cpu asan ubsan lsan test:
   extends: .run_common

diff --git a/ci/cpu/clang12_release.yml b/ci/cpu/clang12_release.yml
diff --git a/ci/cpu/clang13_release_cxx20.yml b/ci/cpu/clang13_release_cxx20.yml
diff --git a/ci/cpu/clang14_release_stdexec.yml b/ci/cpu/clang14_release_stdexec.yml
diff --git a/ci/cpu/clang15_release_cxx20.yml b/ci/cpu/clang15_release_cxx20.yml
@@ -0,0 +1,30 @@
+include:
+  - local: 'ci/common-ci.yml'
+
+cpu clang15 cxx20 release deps:
+  extends: .build_deps_common
+  variables:
+    EXTRA_APTGET: "clang-15 libomp-15-dev"
+    COMPILER: clang@15
+    CXXSTD: 20
+    SPACK_ENVIRONMENT: ci/docker/release-cpu.yaml
+    USE_MKL: "ON"
+    BUILD_IMAGE: $CSCS_REGISTRY_PATH/cpu-clang15-20-release/build
+
+cpu clang15 cxx20 release build:
+  extends:
+    - .build_common
+    - .build_for_daint-mc
+  needs:
+    - cpu clang15 cxx20 release deps
+  variables:
+    DEPLOY_IMAGE: $CSCS_REGISTRY_PATH/cpu-clang15-cxx20-release/deploy:$CI_COMMIT_SHA
+
+cpu clang15 cxx20 release test:
+  extends: .run_common
+  needs:
+    - cpu clang15 cxx20 release build
+  trigger:
+    include:
+      - artifact: pipeline.yml
+        job: cpu clang15 cxx20 release build
diff --git a/ci/cpu/clang15_release_stdexec.yml b/ci/cpu/clang15_release_stdexec.yml
@@ -0,0 +1,30 @@
+include:
+  - local: 'ci/common-ci.yml'
+
+cpu clang15 stdexec release deps:
+  extends: .build_deps_common
+  variables:
+    EXTRA_APTGET: "clang-15 libomp-15-dev"
+    COMPILER: clang@15
+    CXXSTD: 20
+    USE_MKL: "ON"
+    SPACK_ENVIRONMENT: ci/docker/release-cpu-stdexec.yaml
+    BUILD_IMAGE: $CSCS_REGISTRY_PATH/cpu-clang15-stdexec-release/build
+
+cpu clang15 stdexec release build:
+  extends:
+    - .build_common
+    - .build_for_daint-mc
+  needs:
+    - cpu clang15 stdexec release deps
+  variables:
+    DEPLOY_IMAGE: $CSCS_REGISTRY_PATH/cpu-clang15-stdexec-release/deploy:$CI_COMMIT_SHA
+
+cpu clang15 stdexec release test:
+  extends: .run_common
+  needs:
+    - cpu clang15 stdexec release build
+  trigger:
+    include:
+      - artifact: pipeline.yml
+        job: cpu clang15 stdexec release build
diff --git a/ci/cpu/clang16_release.yml b/ci/cpu/clang16_release.yml
@@ -8,7 +8,6 @@ cpu clang16 release deps:
     COMPILER: clang@16
     USE_MKL: "ON"
     SPACK_ENVIRONMENT: ci/docker/release-cpu.yaml
-    BASE_IMAGE: docker.io/ubuntu:23.10
     BUILD_IMAGE: $CSCS_REGISTRY_PATH/cpu-clang16-release/build
 
 cpu clang16 release build:
@@ -19,7 +18,6 @@ cpu clang16 release build:
     - cpu clang16 release deps
   variables:
     DEPLOY_IMAGE: $CSCS_REGISTRY_PATH/cpu-clang16-release/deploy:$CI_COMMIT_SHA
-    DEPLOY_BASE_IMAGE: docker.io/ubuntu:23.10
 
 cpu clang16 release test:
   extends: .run_common

diff --git a/ci/cpu/clang18_release.yml b/ci/cpu/clang18_release.yml
@@ -0,0 +1,29 @@
+include:
+  - local: 'ci/common-ci.yml'
+
+cpu clang18 release deps:
+  extends: .build_deps_common
+  variables:
+    EXTRA_APTGET: "clang-18 libomp-18-dev"
+    COMPILER: clang@18
+    USE_MKL: "ON"
+    SPACK_ENVIRONMENT: ci/docker/release-cpu.yaml
+    BUILD_IMAGE: $CSCS_REGISTRY_PATH/cpu-clang18-release/build
+
+cpu clang18 release build:
+  extends:
+    - .build_common
+    - .build_for_daint-mc
+  needs:
+    - cpu clang18 release deps
+  variables:
+    DEPLOY_IMAGE: $CSCS_REGISTRY_PATH/cpu-clang18-release/deploy:$CI_COMMIT_SHA
+
+cpu clang18 release test:
+  extends: .run_common
+  needs:
+    - cpu clang18 release build
+  trigger:
+    include:
+      - artifact: pipeline.yml
+        job: cpu clang18 release build
diff --git a/ci/cpu/gcc11_debug_stdexec.yml b/ci/cpu/gcc11_debug_stdexec.yml
@@ -4,6 +4,7 @@ include:
 cpu gcc11 stdexec debug deps:
   extends: .build_deps_common
   variables:
+    EXTRA_APTGET: "gcc-11 g++-11 gfortran-11"
     COMPILER: gcc@11
     CXXSTD: 20
     SPACK_ENVIRONMENT: ci/docker/debug-cpu-stdexec.yaml

diff --git a/ci/cpu/gcc11_release_stdexec.yml b/ci/cpu/gcc11_release_stdexec.yml
@@ -4,6 +4,7 @@ include:
 cpu gcc11 stdexec release deps:
   extends: .build_deps_common
   variables:
+    EXTRA_APTGET: "gcc-11 g++-11 gfortran-11"
     COMPILER: gcc@11
     CXXSTD: 20
     USE_MKL: "ON"

diff --git a/ci/cpu/gcc12_release_cxx20.yml b/ci/cpu/gcc12_release_cxx20.yml
@@ -4,7 +4,7 @@ include:
 cpu gcc12 cxx20 release deps:
   extends: .build_deps_common
   variables:
-    EXTRA_APTGET: "g++-12 gfortran-12"
+    EXTRA_APTGET: "gcc-12 g++-12 gfortran-12"
     COMPILER: gcc@12
     CXXSTD: 20
     SPACK_ENVIRONMENT: ci/docker/release-cpu.yaml

diff --git a/ci/cpu/gcc11_codecov.yml → ci/cpu/gcc13_codecov.yml b/ci/cpu/gcc11_codecov.yml → ci/cpu/gcc13_codecov.yml
@@ -1,29 +1,30 @@
 include:
   - local: 'ci/common-ci.yml'
 
-cpu gcc11 codecov deps:
+cpu gcc13 codecov deps:
   extends: .build_deps_common
   variables:
-    COMPILER: gcc@11
+    COMPILER: gcc@13
     SPACK_ENVIRONMENT: ci/docker/debug-cpu.yaml
-    BUILD_IMAGE: $CSCS_REGISTRY_PATH/cpu-gcc11-codecov/build
+    BUILD_IMAGE: $CSCS_REGISTRY_PATH/cpu-gcc13-codecov/build
     USE_CODECOV: "true"
 
-cpu gcc11 codecov build:
+cpu gcc13 codecov build:
   extends:
     - .build_common
     - .build_for_daint-mc
   needs:
-    - cpu gcc11 codecov deps
+    - cpu gcc13 codecov deps
   variables:
     DOCKERFILE: ci/docker/codecov.Dockerfile
-    DEPLOY_IMAGE: $CSCS_REGISTRY_PATH/cpu-gcc11-codecov/deploy:$CI_COMMIT_SHA
+    DEPLOY_IMAGE: $CSCS_REGISTRY_PATH/cpu-gcc13-codecov/deploy:$CI_COMMIT_SHA
+    PIP_OPTS: "--break-system-packages"
 
-cpu gcc11 codecov test:
+cpu gcc13 codecov test:
   extends: .run_common
   needs:
-    - cpu gcc11 codecov build
+    - cpu gcc13 codecov build
   trigger:
     include:
       - artifact: pipeline.yml
-        job: cpu gcc11 codecov build
+        job: cpu gcc13 codecov build
diff --git a/ci/cpu/gcc11_release.yml → ci/cpu/gcc13_release.yml b/ci/cpu/gcc11_release.yml → ci/cpu/gcc13_release.yml
@@ -1,28 +1,28 @@
 include:
   - local: 'ci/common-ci.yml'
 
-cpu gcc11 release deps:
+cpu gcc13 release deps:
   extends: .build_deps_common
   variables:
-    COMPILER: gcc@11
+    COMPILER: gcc@13
     USE_MKL: "ON"
     SPACK_ENVIRONMENT: ci/docker/release-cpu.yaml
-    BUILD_IMAGE: $CSCS_REGISTRY_PATH/cpu-gcc11-release/build
+    BUILD_IMAGE: $CSCS_REGISTRY_PATH/cpu-gcc13-release/build
 
-cpu gcc11 release build:
+cpu gcc13 release build:
   extends:
     - .build_common
     - .build_for_daint-mc
   needs:
-    - cpu gcc11 release deps
+    - cpu gcc13 release deps
   variables:
-    DEPLOY_IMAGE: $CSCS_REGISTRY_PATH/cpu-gcc11-release/deploy:$CI_COMMIT_SHA
+    DEPLOY_IMAGE: $CSCS_REGISTRY_PATH/cpu-gcc13-release/deploy:$CI_COMMIT_SHA
 
-cpu gcc11 release test:
+cpu gcc13 release test:
   extends: .run_common
   needs:
-    - cpu gcc11 release build
+    - cpu gcc13 release build
   trigger:
     include:
       - artifact: pipeline.yml
-        job: cpu gcc11 release build
+        job: cpu gcc13 release build
diff --git a/ci/ctest_to_gitlab.sh b/ci/ctest_to_gitlab.sh
@@ -53,7 +53,7 @@ JOB_TEMPLATE="
   variables:
     SLURM_CPUS_PER_TASK: {{CPUS_PER_TASK}}
     SLURM_NTASKS: {{NTASKS}}
-    SLURM_TIMELIMIT: '20:00'
+    SLURM_TIMELIMIT: '25:00'
     SLURM_UNBUFFEREDIO: 1
     SLURM_WAIT: 0
     PULL_IMAGE: 'YES'

diff --git a/ci/cuda/gcc11_codecov.yml b/ci/cuda/gcc11_codecov.yml
@@ -18,6 +18,7 @@ cuda gcc11 codecov build:
     - cuda gcc11 codecov deps
   variables:
     DOCKERFILE: ci/docker/codecov.Dockerfile
+    DEPLOY_BASE_IMAGE: docker.io/ubuntu:22.04
     DEPLOY_IMAGE: $CSCS_REGISTRY_PATH/cuda-gcc11-codecov/deploy:$CI_COMMIT_SHA
 
 cuda gcc11 codecov test:

diff --git a/ci/cuda/gcc11_debug_scalapack.yml b/ci/cuda/gcc11_debug_scalapack.yml
@@ -16,6 +16,7 @@ cuda gcc11 debug scalapack build:
   needs:
     - cuda gcc11 debug scalapack deps
   variables:
+    DEPLOY_BASE_IMAGE: docker.io/ubuntu:22.04
     DEPLOY_IMAGE: $CSCS_REGISTRY_PATH/cuda-gcc11-scalapack-debug/deploy:$CI_COMMIT_SHA
 
 cuda gcc11 debug scalapack test: