From a64c82287863fb1d6bc04c9b6e991c165640f0a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raffaele=20Solc=C3=A0?= Date: Tue, 17 Sep 2024 15:53:38 +0200 Subject: [PATCH] Use ubuntu 2024.04 in CI (#1140) --- ci/.gitlab-ci.yml | 10 +++---- ci/common-ci.yml | 6 ++-- ci/cpu/asan_ubsan_lsan.yml | 6 ++-- ci/cpu/clang12_release.yml | 29 ------------------ ci/cpu/clang13_release_cxx20.yml | 30 ------------------- ci/cpu/clang14_release_stdexec.yml | 30 ------------------- ci/cpu/clang15_release_cxx20.yml | 30 +++++++++++++++++++ ci/cpu/clang15_release_stdexec.yml | 30 +++++++++++++++++++ ci/cpu/clang16_release.yml | 2 -- ci/cpu/clang18_release.yml | 29 ++++++++++++++++++ ci/cpu/gcc11_debug_stdexec.yml | 1 + ci/cpu/gcc11_release_stdexec.yml | 1 + ci/cpu/gcc12_release_cxx20.yml | 2 +- .../{gcc11_codecov.yml => gcc13_codecov.yml} | 19 ++++++------ .../{gcc11_release.yml => gcc13_release.yml} | 18 +++++------ ci/ctest_to_gitlab.sh | 2 +- ci/cuda/gcc11_codecov.yml | 1 + ci/cuda/gcc11_debug_scalapack.yml | 1 + ci/cuda/gcc11_release.yml | 1 + ci/cuda/gcc11_release_scalapack.yml | 1 + ci/docker/build.Dockerfile | 4 +-- ci/docker/codecov.Dockerfile | 3 +- ci/mpi-ctest | 11 +++++-- test/unit/c_api/grid/test_grid_c_api.cpp | 2 +- 24 files changed, 142 insertions(+), 127 deletions(-) delete mode 100644 ci/cpu/clang12_release.yml delete mode 100644 ci/cpu/clang13_release_cxx20.yml delete mode 100644 ci/cpu/clang14_release_stdexec.yml create mode 100644 ci/cpu/clang15_release_cxx20.yml create mode 100644 ci/cpu/clang15_release_stdexec.yml create mode 100644 ci/cpu/clang18_release.yml rename ci/cpu/{gcc11_codecov.yml => gcc13_codecov.yml} (51%) rename ci/cpu/{gcc11_release.yml => gcc13_release.yml} (51%) diff --git a/ci/.gitlab-ci.yml b/ci/.gitlab-ci.yml index 402bc3afbf..5fcbba6f0b 100644 --- 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 index a45101eff3..97ae84ae0c 100644 --- 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,6 +76,7 @@ stages: "BUILD_IMAGE", "DEPLOY_BASE_IMAGE", "EXTRA_APTGET_DEPLOY", + "PIP_OPTS", "USE_MKL", "USE_ROCBLAS", "NUM_PROCS=$NUM_CORES_BUILD_DLAF" @@ -83,8 +84,9 @@ stages: # 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 index f32d8c8d9f..f5cb1224fd 100644 --- 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 deleted file mode 100644 index 8019392a38..0000000000 --- a/ci/cpu/clang12_release.yml +++ /dev/null @@ -1,29 +0,0 @@ -include: - - local: 'ci/common-ci.yml' - -cpu clang12 release deps: - extends: .build_deps_common - variables: - EXTRA_APTGET: "clang-12 libomp-12-dev" - COMPILER: clang@12 - USE_MKL: "ON" - SPACK_ENVIRONMENT: ci/docker/release-cpu.yaml - BUILD_IMAGE: $CSCS_REGISTRY_PATH/cpu-clang12-release/build - -cpu clang12 release build: - extends: - - .build_common - - .build_for_daint-mc - needs: - - cpu clang12 release deps - variables: - DEPLOY_IMAGE: $CSCS_REGISTRY_PATH/cpu-clang12-release/deploy:$CI_COMMIT_SHA - -cpu clang12 release test: - extends: .run_common - needs: - - cpu clang12 release build - trigger: - include: - - artifact: pipeline.yml - job: cpu clang12 release build diff --git a/ci/cpu/clang13_release_cxx20.yml b/ci/cpu/clang13_release_cxx20.yml deleted file mode 100644 index 0970bc0ea2..0000000000 --- a/ci/cpu/clang13_release_cxx20.yml +++ /dev/null @@ -1,30 +0,0 @@ -include: - - local: 'ci/common-ci.yml' - -cpu clang13 cxx20 release deps: - extends: .build_deps_common - variables: - EXTRA_APTGET: "clang-13 libomp-13-dev" - COMPILER: clang@13 - CXXSTD: 20 - SPACK_ENVIRONMENT: ci/docker/release-cpu.yaml - USE_MKL: "ON" - BUILD_IMAGE: $CSCS_REGISTRY_PATH/cpu-clang13-20-release/build - -cpu clang13 cxx20 release build: - extends: - - .build_common - - .build_for_daint-mc - needs: - - cpu clang13 cxx20 release deps - variables: - DEPLOY_IMAGE: $CSCS_REGISTRY_PATH/cpu-clang13-cxx20-release/deploy:$CI_COMMIT_SHA - -cpu clang13 cxx20 release test: - extends: .run_common - needs: - - cpu clang13 cxx20 release build - trigger: - include: - - artifact: pipeline.yml - job: cpu clang13 cxx20 release build diff --git a/ci/cpu/clang14_release_stdexec.yml b/ci/cpu/clang14_release_stdexec.yml deleted file mode 100644 index 200c0d0cbd..0000000000 --- a/ci/cpu/clang14_release_stdexec.yml +++ /dev/null @@ -1,30 +0,0 @@ -include: - - local: 'ci/common-ci.yml' - -cpu clang14 stdexec release deps: - extends: .build_deps_common - variables: - EXTRA_APTGET: "clang-14 libomp-14-dev" - COMPILER: clang@14 - CXXSTD: 20 - USE_MKL: "ON" - SPACK_ENVIRONMENT: ci/docker/release-cpu-stdexec.yaml - BUILD_IMAGE: $CSCS_REGISTRY_PATH/cpu-clang14-stdexec-release/build - -cpu clang14 stdexec release build: - extends: - - .build_common - - .build_for_daint-mc - needs: - - cpu clang14 stdexec release deps - variables: - DEPLOY_IMAGE: $CSCS_REGISTRY_PATH/cpu-clang14-stdexec-release/deploy:$CI_COMMIT_SHA - -cpu clang14 stdexec release test: - extends: .run_common - needs: - - cpu clang14 stdexec release build - trigger: - include: - - artifact: pipeline.yml - job: cpu clang14 stdexec release build diff --git a/ci/cpu/clang15_release_cxx20.yml b/ci/cpu/clang15_release_cxx20.yml new file mode 100644 index 0000000000..2875e7a0c7 --- /dev/null +++ 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 new file mode 100644 index 0000000000..da096bf204 --- /dev/null +++ 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 index 2d9d389290..ac650f90b5 100644 --- 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 new file mode 100644 index 0000000000..6a01bc5a01 --- /dev/null +++ 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 index c5b2a6ee13..5aedcc04c1 100644 --- 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 index 29d79a7c57..0ba3660d10 100644 --- 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 index f6edd42c4c..ced430f279 100644 --- 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 b/ci/cpu/gcc13_codecov.yml similarity index 51% rename from ci/cpu/gcc11_codecov.yml rename to ci/cpu/gcc13_codecov.yml index 0960f0608e..326973e326 100644 --- a/ci/cpu/gcc11_codecov.yml +++ b/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 b/ci/cpu/gcc13_release.yml similarity index 51% rename from ci/cpu/gcc11_release.yml rename to ci/cpu/gcc13_release.yml index eef1391905..daa0d77951 100644 --- a/ci/cpu/gcc11_release.yml +++ b/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 index c35b684ad9..abe4c7f97e 100755 --- 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 index 0282c78065..cd81d00fb1 100644 --- 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 index 8b55cd0195..707ec2b51d 100644 --- 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: diff --git a/ci/cuda/gcc11_release.yml b/ci/cuda/gcc11_release.yml index 9dfa1c88dd..7d47f16d09 100644 --- a/ci/cuda/gcc11_release.yml +++ b/ci/cuda/gcc11_release.yml @@ -18,6 +18,7 @@ cuda gcc11 release build: needs: - cuda gcc11 release deps variables: + DEPLOY_BASE_IMAGE: docker.io/ubuntu:22.04 DEPLOY_IMAGE: $CSCS_REGISTRY_PATH/cuda-gcc11-release/deploy:$CI_COMMIT_SHA cuda gcc11 release test: diff --git a/ci/cuda/gcc11_release_scalapack.yml b/ci/cuda/gcc11_release_scalapack.yml index 443ac73e56..ca4cc45d3f 100644 --- a/ci/cuda/gcc11_release_scalapack.yml +++ b/ci/cuda/gcc11_release_scalapack.yml @@ -17,6 +17,7 @@ cuda gcc11 release scalapack build: needs: - cuda gcc11 release scalapack deps variables: + DEPLOY_BASE_IMAGE: docker.io/ubuntu:22.04 DEPLOY_IMAGE: $CSCS_REGISTRY_PATH/cuda-gcc11-scalapack-release/deploy:$CI_COMMIT_SHA cuda gcc11 release scalapack test: diff --git a/ci/docker/build.Dockerfile b/ci/docker/build.Dockerfile index f50d178d8a..fadb655dd0 100644 --- a/ci/docker/build.Dockerfile +++ b/ci/docker/build.Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=ubuntu:20.04 +ARG BASE_IMAGE=ubuntu:24.04 FROM $BASE_IMAGE @@ -18,7 +18,7 @@ RUN apt-get -yqq update && \ autoconf automake libssl-dev ninja-build pkg-config \ ${EXTRA_APTGET} \ gawk \ - python3 python3-distutils \ + python3 python3-setuptools \ git tar wget curl ca-certificates gpg-agent jq tzdata \ patchelf unzip file gnupg2 libncurses-dev && \ rm -rf /var/lib/apt/lists/* diff --git a/ci/docker/codecov.Dockerfile b/ci/docker/codecov.Dockerfile index d2e7a6baaf..3673b680ac 100644 --- a/ci/docker/codecov.Dockerfile +++ b/ci/docker/codecov.Dockerfile @@ -67,6 +67,7 @@ ARG SOURCE ARG DEPLOY ARG EXTRA_APTGET_DEPLOY +ARG PIP_OPTS # python is needed for fastcov # pip is needed only to install fastcov (it is removed with # its dependencies after fastcov installation) @@ -82,7 +83,7 @@ RUN apt-get update -qq && \ ca-certificates \ glibc-tools jq strace \ tzdata && \ - pip install fastcov && \ + pip install ${PIP_OPTS} fastcov && \ apt-get autoremove -qq -y python3-pip && \ apt-get clean diff --git a/ci/mpi-ctest b/ci/mpi-ctest index 3ddc796ab9..f8ca1b14d8 100755 --- a/ci/mpi-ctest +++ b/ci/mpi-ctest @@ -20,9 +20,16 @@ fi # Create coverage reports for code run if [[ "$ENABLE_COVERAGE" == "YES" ]]; then - TZ=CET date +"Start creating codecov reports from rank $SLURM_PROCID at: %H:%M:%S %z with $SLURM_CPUS_PER_TASK threads" + # On daint-mc (XC40) reduce the number of tasks to avoid out-of-memory error + if [ $SLURM_CPUS_ON_NODE -eq 72 -a "$SLURM_CLUSTER_NAME" = "daint" ]; then + COV_THREADS=$((SLURM_CPUS_PER_TASK/2)) + else + COV_THREADS=$SLURM_CPUS_PER_TASK + fi - fastcov --jobs $SLURM_CPUS_PER_TASK --gcov gcov --process-gcno --branch-coverage --include /DLA-Future/ --exclude /DLA-Future/test/ /DLA-Future/miniapp/ --lcov -o "$LOCAL_REPORTS/run.info" &> /dev/null + TZ=CET date +"Start creating codecov reports from rank $SLURM_PROCID at: %H:%M:%S %z with $COV_THREADS threads" + + fastcov --jobs $COV_THREADS --gcov gcov --process-gcno --branch-coverage --include /DLA-Future/ --exclude /DLA-Future/test/ /DLA-Future/miniapp/ --lcov -o "$LOCAL_REPORTS/run.info" &> /dev/null cp "$LOCAL_REPORTS/run.info" "$SHARED_REPORTS/codecov-$REPORT_NAME.info" diff --git a/test/unit/c_api/grid/test_grid_c_api.cpp b/test/unit/c_api/grid/test_grid_c_api.cpp index 5bd2e03210..cb85b51cfb 100644 --- a/test/unit/c_api/grid/test_grid_c_api.cpp +++ b/test/unit/c_api/grid/test_grid_c_api.cpp @@ -43,7 +43,7 @@ TEST(GridTest, GridScaLAPACKOrdering) { #endif TEST(GridTest, GridDLAFOrdering) { - for (const auto [key, value] : ordering) { + for (const auto& [key, value] : ordering) { dlaf::comm::Communicator world(MPI_COMM_WORLD); dlaf::comm::CommunicatorGrid row_major(world, 2, 3, value);