From 4a2c4901ce1627c9511d2f23d3a33d903c42069f Mon Sep 17 00:00:00 2001 From: Antonio Sanchez Date: Tue, 1 Jul 2025 12:18:36 -0700 Subject: [PATCH] Update CI configuration from master. --- ci/build.linux.gitlab-ci.yml | 39 +++++++++++++------------ ci/deploy.gitlab-ci.yml | 2 +- ci/test.linux.gitlab-ci.yml | 55 ++++++++++++++--------------------- ci/test.windows.gitlab-ci.yml | 17 +++++------ 4 files changed, 50 insertions(+), 63 deletions(-) diff --git a/ci/build.linux.gitlab-ci.yml b/ci/build.linux.gitlab-ci.yml index a5916f0eb..3d6cd3857 100644 --- a/ci/build.linux.gitlab-ci.yml +++ b/ci/build.linux.gitlab-ci.yml @@ -7,9 +7,7 @@ script: - . ci/scripts/build.linux.script.sh tags: - - linux - - eigen-runner - - cross-compiler + - saas-linux-2xlarge-amd64 rules: - if: $CI_PIPELINE_SOURCE == "schedule" && $CI_PROJECT_NAMESPACE == "libeigen" - if: $CI_PIPELINE_SOURCE == "web" && $CI_PROJECT_NAMESPACE == "libeigen" @@ -103,7 +101,7 @@ build:linux:cross:x86-64:clang-12:avx512dq: variables: EIGEN_CI_ADDITIONAL_ARGS: "-DEIGEN_TEST_AVX512DQ=on" -build:linux:doc: +build:linux:docs: extends: .build:linux:cross variables: EIGEN_CI_TARGET_ARCH: any @@ -245,11 +243,13 @@ build:linux:rocm-latest:gcc-10: EIGEN_CI_CROSS_TARGET_TRIPLE: arm-linux-gnueabihf EIGEN_CI_ADDITIONAL_ARGS: > -DEIGEN_TEST_CUSTOM_CXX_FLAGS=-march=armv7-a;-mfpu=neon-vfpv4 + -DCMAKE_SYSTEM_NAME=Linux + -DCMAKE_CROSSCOMPILING_EMULATOR=qemu-arm-static;-L;/usr/arm-linux-gnueabihf build:linux:cross:arm:gcc-10:default: extends: .build:linux:cross:arm variables: - EIGEN_CI_CROSS_INSTALL: g++-10-arm-linux-gnueabihf + EIGEN_CI_CROSS_INSTALL: g++-10-arm-linux-gnueabihf qemu-user-static EIGEN_CI_CROSS_C_COMPILER: arm-linux-gnueabihf-gcc-10 EIGEN_CI_CROSS_CXX_COMPILER: arm-linux-gnueabihf-g++-10 @@ -259,7 +259,7 @@ build:linux:cross:arm:clang-12:default: EIGEN_CI_INSTALL: clang-12 EIGEN_CI_C_COMPILER: clang-12 EIGEN_CI_CXX_COMPILER: clang++-12 - EIGEN_CI_CROSS_INSTALL: g++-10-arm-linux-gnueabihf clang-12 + EIGEN_CI_CROSS_INSTALL: g++-10-arm-linux-gnueabihf clang-12 qemu-user-static ######## aarch64 ############################################################### @@ -269,6 +269,8 @@ build:linux:cross:arm:clang-12:default: EIGEN_CI_TARGET_ARCH: aarch64 EIGEN_CI_CROSS_TARGET_TRIPLE: aarch64-linux-gnu EIGEN_CI_ADDITIONAL_ARGS: -DEIGEN_TEST_CUSTOM_CXX_FLAGS=-march=armv8.2-a+fp16 + tags: + - saas-linux-large-arm64 build:linux:cross:aarch64:gcc-10:default: extends: .build:linux:cross:aarch64 @@ -291,28 +293,27 @@ build:linux:cross:aarch64:clang-12:default: .build:linux:cross:ppc64le: extends: .build:linux:cross + image: ubuntu:24.04 variables: EIGEN_CI_TARGET_ARCH: ppc64le EIGEN_CI_CROSS_TARGET_TRIPLE: powerpc64le-linux-gnu + EIGEN_CI_ADDITIONAL_ARGS: >- + -DCMAKE_SYSTEM_NAME=Linux + -DCMAKE_CROSSCOMPILING_EMULATOR=qemu-ppc64le-static;-L;/usr/powerpc64le-linux-gnu -build:linux:cross:ppc64le:gcc-10:default: +build:linux:cross:ppc64le:gcc-14:default: extends: .build:linux:cross:ppc64le variables: - EIGEN_CI_C_COMPILER: gcc-10 - EIGEN_CI_CXX_COMPILER: g++-10 - EIGEN_CI_CROSS_INSTALL: g++-10-powerpc64le-linux-gnu - EIGEN_CI_CROSS_C_COMPILER: powerpc64le-linux-gnu-gcc-10 - EIGEN_CI_CROSS_CXX_COMPILER: powerpc64le-linux-gnu-g++-10 - # Temporarily disable MMA until #2457 is resolved. - EIGEN_CI_ADDITIONAL_ARGS: "-DEIGEN_ALTIVEC_DISABLE_MMA=1" + EIGEN_CI_CROSS_INSTALL: g++-14-powerpc64le-linux-gnu qemu-user-static + EIGEN_CI_CROSS_C_COMPILER: powerpc64le-linux-gnu-gcc-14 + EIGEN_CI_CROSS_CXX_COMPILER: powerpc64le-linux-gnu-g++-14 -build:linux:cross:ppc64le:clang-12:default: +build:linux:cross:ppc64le:clang-16:default: extends: .build:linux:cross:ppc64le variables: - EIGEN_CI_INSTALL: clang-12 - EIGEN_CI_C_COMPILER: clang-12 - EIGEN_CI_CXX_COMPILER: clang++-12 - EIGEN_CI_CROSS_INSTALL: g++-10-powerpc64le-linux-gnu clang-12 + EIGEN_CI_C_COMPILER: clang-16 + EIGEN_CI_CXX_COMPILER: clang++-16 + EIGEN_CI_CROSS_INSTALL: g++-14-powerpc64le-linux-gnu clang-16 qemu-user-static ######## MR Smoke Tests ######################################################## diff --git a/ci/deploy.gitlab-ci.yml b/ci/deploy.gitlab-ci.yml index 311313920..3c4db06b9 100644 --- a/ci/deploy.gitlab-ci.yml +++ b/ci/deploy.gitlab-ci.yml @@ -19,7 +19,7 @@ deploy:tag:nightly: deploy:docs: stage: deploy image: busybox - dependencies: [ build:linux:doc ] + dependencies: [ build:linux:docs ] variables: PAGES_PREFIX: docs-nightly script: diff --git a/ci/test.linux.gitlab-ci.yml b/ci/test.linux.gitlab-ci.yml index 754745bf6..939960553 100644 --- a/ci/test.linux.gitlab-ci.yml +++ b/ci/test.linux.gitlab-ci.yml @@ -9,6 +9,8 @@ - if: $CI_PIPELINE_SOURCE == "schedule" && $CI_PROJECT_NAMESPACE == "libeigen" - if: $CI_PIPELINE_SOURCE == "web" && $CI_PROJECT_NAMESPACE == "libeigen" - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "libeigen" + tags: + - saas-linux-2xlarge-amd64 ##### x86-64 ################################################################### .test:linux:x86-64: @@ -16,10 +18,6 @@ variables: EIGEN_CI_TARGET_ARCH: x86_64 EIGEN_CI_CROSS_TARGET_TRIPLE: x86_64-linux-gnu - tags: - - eigen-runner - - linux - - x86-64 # GCC-6 (minimum on Ubuntu 18.04) .test:linux:x86-64:gcc-6:default: @@ -293,18 +291,13 @@ test:linux:cuda-12.2:clang-12: variables: EIGEN_CI_TARGET_ARCH: arm EIGEN_CI_CROSS_TARGET_TRIPLE: arm-linux-gnueabihf - # Enable cross-compiled arm binary to run on aarch64. - EIGEN_CI_BEFORE_SCRIPT: "ln -s /usr/arm-linux-gnueabihf/lib/ld-linux-armhf.so.3 /lib/ && export LD_LIBRARY_PATH=/usr/arm-linux-gnueabihf/lib/" - tags: - - eigen-runner - - linux - - aarch64 + EIGEN_CI_CTEST_ARGS: --timeout 2000 .test:linux:arm:gcc-10:default: extends: .test:linux:arm needs: [ build:linux:cross:arm:gcc-10:default ] variables: - EIGEN_CI_CROSS_INSTALL: g++-10-arm-linux-gnueabihf + EIGEN_CI_CROSS_INSTALL: g++-10-arm-linux-gnueabihf qemu-user-static test:linux:arm:gcc-10:default:official: extends: .test:linux:arm:gcc-10:default @@ -320,7 +313,7 @@ test:linux:arm:gcc-10:default:unsupported: extends: .test:linux:arm needs: [ build:linux:cross:arm:clang-12:default ] variables: - EIGEN_CI_CROSS_INSTALL: g++-10-arm-linux-gnueabihf clang-12 + EIGEN_CI_CROSS_INSTALL: g++-10-arm-linux-gnueabihf clang-12 qemu-user-static test:linux:arm:clang-12:default:official: extends: .test:linux:arm:clang-12:default @@ -340,9 +333,7 @@ test:linux:arm:clang-12:default:unsupported: EIGEN_CI_TARGET_ARCH: aarch64 EIGEN_CI_CROSS_TARGET_TRIPLE: aarch64-linux-gnu tags: - - eigen-runner - - linux - - aarch64 + - saas-linux-large-arm64 .test:linux:aarch64:gcc-10:default: extends: .test:linux:aarch64 @@ -380,43 +371,41 @@ test:linux:aarch64:clang-12:default:unsupported: .test:linux:ppc64le: extends: .test:linux + image: ubuntu:24.04 variables: EIGEN_CI_TARGET_ARCH: ppc64le EIGEN_CI_CROSS_TARGET_TRIPLE: powerpc64le-linux-gnu - tags: - - eigen-runner - - linux - - ppc64le + EIGEN_CI_CTEST_ARGS: --timeout 2000 -.test:linux:ppc64le:gcc-10:default: +.test:linux:ppc64le:gcc-14:default: extends: .test:linux:ppc64le - needs: [ build:linux:cross:ppc64le:gcc-10:default ] + needs: [ build:linux:cross:ppc64le:gcc-14:default ] variables: - EIGEN_CI_INSTALL: g++-10 + EIGEN_CI_CROSS_INSTALL: g++-14-powerpc64le-linux-gnu qemu-user-static -test:linux:ppc64le:gcc-10:default:official: - extends: .test:linux:ppc64le:gcc-10:default +test:linux:ppc64le:gcc-14:default:official: + extends: .test:linux:ppc64le:gcc-14:default variables: EIGEN_CI_CTEST_LABEL: Official -test:linux:ppc64le:gcc-10:default:unsupported: - extends: .test:linux:ppc64le:gcc-10:default +test:linux:ppc64le:gcc-14:default:unsupported: + extends: .test:linux:ppc64le:gcc-14:default variables: EIGEN_CI_CTEST_LABEL: Unsupported -.test:linux:ppc64le:clang-12:default: +.test:linux:ppc64le:clang-16:default: extends: .test:linux:ppc64le - needs: [ build:linux:cross:ppc64le:clang-12:default ] + needs: [ build:linux:cross:ppc64le:clang-16:default ] variables: - EIGEN_CI_INSTALL: clang-12 + EIGEN_CI_CROSS_INSTALL: g++-14-powerpc64le-linux-gnu clang-16 qemu-user-static -test:linux:ppc64le:clang-12:default:official: - extends: .test:linux:ppc64le:clang-12:default +test:linux:ppc64le:clang-16:default:official: + extends: .test:linux:ppc64le:clang-16:default variables: EIGEN_CI_CTEST_LABEL: Official -test:linux:ppc64le:clang-12:default:unsupported: - extends: .test:linux:ppc64le:clang-12:default +test:linux:ppc64le:clang-16:default:unsupported: + extends: .test:linux:ppc64le:clang-16:default variables: EIGEN_CI_CTEST_LABEL: Unsupported diff --git a/ci/test.windows.gitlab-ci.yml b/ci/test.windows.gitlab-ci.yml index 45b88c6c3..f107d4f49 100644 --- a/ci/test.windows.gitlab-ci.yml +++ b/ci/test.windows.gitlab-ci.yml @@ -8,8 +8,9 @@ rules: - if: $CI_PIPELINE_SOURCE == "schedule" && $CI_PROJECT_NAMESPACE == "libeigen" - if: $CI_PIPELINE_SOURCE == "web" && $CI_PROJECT_NAMESPACE == "libeigen" - - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "libeigen" - tags: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_PROJECT_NAMESPACE == "libeigen" && $CI_MERGE_REQUEST_LABELS =~ "/all-tests/" + + tags: - eigen-runner - windows - x86-64 @@ -36,10 +37,6 @@ test:windows:x86-64:msvc-14.16:default:unsupported: extends: .test:windows needs: [ build:windows:x86-64:msvc-14.29:default ] -test:windows:x86-64:msvc-14.29:default:official: - extends: .test:windows:x86-64:msvc-14.29:default - needs: [ build:windows:x86-64:msvc-14.29:cxx03 ] - test:windows:x86-64:msvc-14.29:default:official: extends: .test:windows:x86-64:msvc-14.29:default variables: @@ -67,7 +64,7 @@ test:windows:x86-64:msvc-14.29:avx2:unsupported: .test:windows:x86-64:msvc-14.29:avx512dq: extends: .test:windows needs: [ build:windows:x86-64:msvc-14.29:avx512dq ] - tags: + tags: - eigen-runner - windows - x86-64 @@ -89,7 +86,7 @@ test:windows:x86-64:msvc-14.29:avx512dq:unsupported: allow_failure: true variables: EIGEN_CI_CTEST_LABEL: gpu - tags: + tags: - eigen-runner - windows - x86-64 @@ -100,12 +97,12 @@ test:windows:x86-64:msvc-14.29:avx512dq:unsupported: # test:windows:x86-64:cuda-9.2:msvc-14.16: # extends: .test:windows:cuda # needs: [ build:windows:x86-64:cuda-9.2:msvc-14.16 ] - + # MSVC 14.29 + CUDA 10.2 test:windows:x86-64:cuda-10.2:msvc-14.29: extends: .test:windows:cuda needs: [ build:windows:x86-64:cuda-10.2:msvc-14.29 ] - + # MSVC 14.29 + CUDA 11.4 test:windows:x86-64:cuda-11.4:msvc-14.29: extends: .test:windows:cuda