From 636558fae6b55fead992f9ec948a1ddbf12aa923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raffaele=20Solc=C3=A0?= Date: Mon, 30 Sep 2024 18:27:21 +0200 Subject: [PATCH] keep only 2 configs as first test --- ci/.gitlab-ci.yml | 30 +++++++++++++++--------------- ci/common-ci.yml | 1 + ci/cpu/gcc13_release.yml | 6 +++--- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/ci/.gitlab-ci.yml b/ci/.gitlab-ci.yml index 0204a001ee..9a1d67f9df 100644 --- a/ci/.gitlab-ci.yml +++ b/ci/.gitlab-ci.yml @@ -1,19 +1,19 @@ include: - - local: 'ci/cpu/asan_ubsan_lsan.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/asan_ubsan_lsan.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/clang18_release.yml' - - 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/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' - - local: 'ci/cuda/gcc11_debug_scalapack.yml' - - local: 'ci/cuda/gcc13_release_stdexec.yml' - - local: 'ci/rocm/clang14_release.yml' - - local: 'ci/rocm/clang14_release_stdexec.yml' +# - local: 'ci/cuda/gcc11_release_scalapack.yml' +# - local: 'ci/cuda/gcc11_codecov.yml' +# - local: 'ci/cuda/gcc11_debug_scalapack.yml' +# - local: 'ci/cuda/gcc13_release_stdexec.yml' +# - local: 'ci/rocm/clang14_release.yml' +# - local: 'ci/rocm/clang14_release_stdexec.yml' diff --git a/ci/common-ci.yml b/ci/common-ci.yml index 2747ec40ef..8fb6968087 100644 --- a/ci/common-ci.yml +++ b/ci/common-ci.yml @@ -72,6 +72,7 @@ stages: variables: PERSIST_IMAGE_NAME: $DLAF_IMAGE DOCKER_BUILD_ARGS: '[ + "DEPS_IMAGE", "PIP_OPTS", "NUM_PROCS=$NUM_CORES_BUILD_DLAF" ]' diff --git a/ci/cpu/gcc13_release.yml b/ci/cpu/gcc13_release.yml index daa0d77951..6f95b9603a 100644 --- a/ci/cpu/gcc13_release.yml +++ b/ci/cpu/gcc13_release.yml @@ -5,9 +5,9 @@ cpu gcc13 release deps: extends: .build_deps_common variables: COMPILER: gcc@13 - USE_MKL: "ON" SPACK_ENVIRONMENT: ci/docker/release-cpu.yaml - BUILD_IMAGE: $CSCS_REGISTRY_PATH/cpu-gcc13-release/build + USE_MKL: "ON" + DEPS_IMAGE: $CSCS_REGISTRY_PATH/cpu-gcc13-release/deps cpu gcc13 release build: extends: @@ -16,7 +16,7 @@ cpu gcc13 release build: needs: - cpu gcc13 release deps variables: - DEPLOY_IMAGE: $CSCS_REGISTRY_PATH/cpu-gcc13-release/deploy:$CI_COMMIT_SHA + DLAF_IMAGE: $CSCS_REGISTRY_PATH/cpu-gcc13-release/dlaf:$CI_COMMIT_SHA cpu gcc13 release test: extends: .run_common