diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 68cd68040..8872ad0b6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,6 +7,10 @@ # Public License v. 2.0. If a copy of the MPL was not distributed # with this file, You can obtain one at http://mozilla.org/MPL/2.0/. +default: +# automatically cancels a job when a new pipeline for the same branch is triggered + interruptible: true + stages: - checkformat - build diff --git a/ci/build.linux.gitlab-ci.yml b/ci/build.linux.gitlab-ci.yml index ba4971a62..9dbb54fd1 100644 --- a/ci/build.linux.gitlab-ci.yml +++ b/ci/build.linux.gitlab-ci.yml @@ -1,5 +1,6 @@ # Base configuration for linux cross-compilation. .build:linux:cross: + needs: [] extends: .common:linux:cross stage: build variables: @@ -147,57 +148,6 @@ build:linux:docs: # Build on regular linux to limit GPU cost. - saas-linux-2xlarge-amd64 -# NVidia no longer provides docker images < CUDA 11.0.3. -# # GCC-7, CUDA-9.2 -# build:linux:cuda-9.2:gcc-7: -# extends: .build:linux:cuda -# image: nvidia/cuda:9.2-devel-ubuntu18.04 -# variables: -# # cuda 9.2 doesn't support sm_75, so lower to 70. -# EIGEN_CI_CUDA_COMPUTE_ARCH: "50;70" -# EIGEN_CI_C_COMPILER: gcc-7 -# EIGEN_CI_CXX_COMPILER: g++-7 - -# # Clang-10, CUDA-9.2 -# build:linux:cuda-9.2:clang-10: -# extends: build:linux:cuda-9.2:gcc-7 -# variables: -# EIGEN_CI_C_COMPILER: clang-10 -# EIGEN_CI_CXX_COMPILER: clang++-10 -# EIGEN_CI_TEST_CUDA_CLANG: "on" - -# # GCC-8, CUDA-10.2 -# build:linux:cuda-10.2:gcc-8: -# extends: .build:linux:cuda -# image: nvidia/cuda:10.2-devel-ubuntu18.04 -# variables: -# EIGEN_CI_C_COMPILER: gcc-8 -# EIGEN_CI_CXX_COMPILER: g++-8 - -# # Clang-10, CUDA-10.2 -# build:linux:cuda-10.2:clang-10: -# extends: build:linux:cuda-10.2:gcc-8 -# variables: -# EIGEN_CI_C_COMPILER: clang-10 -# EIGEN_CI_CXX_COMPILER: clang++-10 -# EIGEN_CI_TEST_CUDA_CLANG: "on" - -# GCC-10, CUDA-11.4 -build:linux:cuda-11.4:gcc-10: - extends: .build:linux:cuda - image: nvidia/cuda:11.4.3-devel-ubuntu20.04 - variables: - EIGEN_CI_C_COMPILER: gcc-10 - EIGEN_CI_CXX_COMPILER: g++-10 - -# Clang-12, CUDA-11.4 -build:linux:cuda-11.4:clang-12: - extends: build:linux:cuda-11.4:gcc-10 - variables: - EIGEN_CI_C_COMPILER: clang-12 - EIGEN_CI_CXX_COMPILER: clang++-12 - EIGEN_CI_TEST_CUDA_CLANG: "on" - # GCC-10, CUDA-12.2 build:linux:cuda-12.2:gcc-10: extends: .build:linux:cuda diff --git a/ci/build.windows.gitlab-ci.yml b/ci/build.windows.gitlab-ci.yml index 604fd2ca0..87be69495 100644 --- a/ci/build.windows.gitlab-ci.yml +++ b/ci/build.windows.gitlab-ci.yml @@ -1,5 +1,6 @@ # Base configuration for windows builds. .build:windows: + needs: [] extends: .common:windows stage: build variables: @@ -25,15 +26,16 @@ ######### MSVC ################################################################# -# MSVC 14.16 (VS 2017) -build:windows:x86-64:msvc-14.16:default: +# MSVC 14.29 (VS 2019) 32 bit + +build:windows:x86:msvc-14.29:default: extends: .build:windows variables: - EIGEN_CI_MSVC_VER: "14.16" - # Override to remove unsupported /d2ReducedOptimizeHugeFunctions. - EIGEN_CI_TEST_CUSTOM_CXX_FLAGS: "/DEIGEN_STRONG_INLINE=inline;/Os" + EIGEN_CI_MSVC_VER: "14.29" + EIGEN_CI_MSVC_ARCH: "x86" + +# MSVC 14.29 (VS 2019) 64 bit -# MSVC 14.29 (VS 2019) build:windows:x86-64:msvc-14.29:default: extends: .build:windows variables: @@ -49,7 +51,9 @@ build:windows:x86-64:msvc-14.29:avx512dq: variables: EIGEN_CI_ADDITIONAL_ARGS: "-DEIGEN_TEST_AVX512DQ=on" -######### MSVC + CUDA ########################################################## + +# MSVC 14.29 (VS 2019) + CUDA + .build:windows:cuda: extends: .build:windows variables: @@ -65,46 +69,9 @@ build:windows:x86-64:msvc-14.29:avx512dq: - x86-64 - cuda -# The CUDA 9.2 compiler crashes with an internal error. -# # MSVC 14.16 + CUDA 9.2 -# build:windows:x86-64:cuda-9.2:msvc-14.16: -# extends: .build:windows:cuda -# variables: -# # CUDA 9.2 doesn't support sm_75. -# EIGEN_CI_CUDA_COMPUTE_ARCH: "50;70" -# # CUDA 9.2 only supports up to VS 2017. -# EIGEN_CI_MSVC_VER: "14.16" -# EIGEN_CI_TEST_CUSTOM_CXX_FLAGS: "/DEIGEN_STRONG_INLINE=inline;/Os" -# EIGEN_CI_BEFORE_SCRIPT: $$env:CUDA_PATH=$$env:CUDA_PATH_V9_2 - -# MSVC 14.29 + CUDA 10.2 -build:windows:x86-64:cuda-10.2:msvc-14.29: - extends: .build:windows:cuda - variables: - EIGEN_CI_MSVC_VER: "14.29" - EIGEN_CI_BEFORE_SCRIPT: $$env:CUDA_PATH=$$env:CUDA_PATH_V10_2 - # MSVC 14.29 + CUDA 11.4 build:windows:x86-64:cuda-11.4:msvc-14.29: extends: .build:windows:cuda variables: EIGEN_CI_MSVC_VER: "14.29" - EIGEN_CI_BEFORE_SCRIPT: $$env:CUDA_PATH=$$env:CUDA_PATH_V11_4 - -######## MR Smoke Tests ######################################################## - -# MSVC 14.29 64-bit (VS 2019) -build:windows:x86-64:msvc-14.29:avx512dq:smoketest: - extends: build:windows:x86-64:msvc-14.29:avx512dq - variables: - EIGEN_CI_BUILD_TARGET: buildsmoketests - rules: - - if: $CI_PIPELINE_SOURCE == "merge_request_event" - -# MSVC 14.29 32-bit (VS 2019) -build:windows:x86:msvc-14.29:avx512dq:smoketest: - extends: build:windows:x86-64:msvc-14.29:avx512dq:smoketest - variables: - EIGEN_CI_MSVC_ARCH: "x86" - rules: - - if: $CI_PIPELINE_SOURCE == "merge_request_event" + EIGEN_CI_BEFORE_SCRIPT: $$env:CUDA_PATH=$$env:CUDA_PATH_V11_4 \ No newline at end of file diff --git a/ci/test.linux.gitlab-ci.yml b/ci/test.linux.gitlab-ci.yml index 47d48c840..b3599f38f 100644 --- a/ci/test.linux.gitlab-ci.yml +++ b/ci/test.linux.gitlab-ci.yml @@ -204,61 +204,6 @@ test:linux:x86-64:clang-12:avx512dq:unsupported: tags: - saas-linux-medium-amd64-gpu-standard -# NVidia no longer provides docker images < CUDA 11.0.3. -# # GCC-7, CUDA-9.2 -# test:linux:cuda-9.2:gcc-7: -# extends: .test:linux:cuda -# image: nvidia/cuda:9.2-devel-ubuntu18.04 -# needs: [ build:linux:cuda-9.2:gcc-7 ] -# variables: -# EIGEN_CI_CXX_COMPILER: g++-7 -# EIGEN_CI_CC_COMPILER: gcc-7 - -# # Clang-10, CUDA-9.2 -# test:linux:cuda-9.2:clang-10: -# extends: .test:linux:cuda -# image: nvidia/cuda:9.2-devel-ubuntu18.04 -# needs: [ build:linux:cuda-9.2:clang-10 ] -# variables: -# EIGEN_CI_CXX_COMPILER: clang++-10 -# EIGEN_CI_CC_COMPILER: clang-10 - -# # GCC-8, CUDA-10.2 -# test:linux:cuda-10.2:gcc-8: -# extends: .test:linux:cuda -# image: nvidia/cuda:10.2-devel-ubuntu18.04 -# needs: [ build:linux:cuda-10.2:gcc-8 ] -# variables: -# EIGEN_CI_CXX_COMPILER: g++-8 -# EIGEN_CI_CC_COMPILER: gcc-8 - -# # Clang-10, CUDA-10.2 -# test:linux:cuda-10.2:clang-10: -# extends: .test:linux:cuda -# image: nvidia/cuda:10.2-devel-ubuntu18.04 -# needs: [ build:linux:cuda-10.2:clang-10 ] -# variables: -# EIGEN_CI_CXX_COMPILER: clang++-10 -# EIGEN_CI_CC_COMPILER: clang-10 - -# GCC-10, CUDA-11.4 -test:linux:cuda-11.4:gcc-10: - extends: .test:linux:cuda - image: nvidia/cuda:11.4.3-devel-ubuntu20.04 - needs: [ build:linux:cuda-11.4:gcc-10 ] - variables: - EIGEN_CI_CXX_COMPILER: g++-10 - EIGEN_CI_CC_COMPILER: gcc-10 - -# Clang-12, CUDA-11.4 -test:linux:cuda-11.4:clang-12: - extends: .test:linux:cuda - image: nvidia/cuda:11.4.3-devel-ubuntu20.04 - needs: [ build:linux:cuda-11.4:clang-12 ] - variables: - EIGEN_CI_CXX_COMPILER: clang++-12 - EIGEN_CI_CC_COMPILER: clang-12 - # GCC-10, CUDA-12.2 test:linux:cuda-12.2:gcc-10: extends: .test:linux:cuda diff --git a/ci/test.windows.gitlab-ci.yml b/ci/test.windows.gitlab-ci.yml index f107d4f49..17bb065de 100644 --- a/ci/test.windows.gitlab-ci.yml +++ b/ci/test.windows.gitlab-ci.yml @@ -17,22 +17,8 @@ ##### MSVC ##################################################################### -# MSVC 14.16 (VS 2017) -.test:windows:x86-64:msvc-14.16:default: - extends: .test:windows - needs: [ build:windows:x86-64:msvc-14.16:default ] +# MSVC 14.29 (VS 2019) 64 bit -test:windows:x86-64:msvc-14.16:default:official: - extends: .test:windows:x86-64:msvc-14.16:default - variables: - EIGEN_CI_CTEST_LABEL: Official - -test:windows:x86-64:msvc-14.16:default:unsupported: - extends: .test:windows:x86-64:msvc-14.16:default - variables: - EIGEN_CI_CTEST_LABEL: Unsupported - -# MSVC 14.29 (VS 2019) .test:windows:x86-64:msvc-14.29:default: extends: .test:windows needs: [ build:windows:x86-64:msvc-14.29:default ] @@ -80,7 +66,8 @@ test:windows:x86-64:msvc-14.29:avx512dq:unsupported: variables: EIGEN_CI_CTEST_LABEL: Unsupported -##### MSVC + CUDA ############################################################## +# MSVC 14.29 (VS 2019) + CUDA + .test:windows:cuda: extends: .test:windows allow_failure: true @@ -92,18 +79,7 @@ test:windows:x86-64:msvc-14.29:avx512dq:unsupported: - x86-64 - cuda -# The CUDA 9.2 compiler crashes with an internal error. -# # MSVC 14.16 + CUDA 9.2 -# 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 - needs: [ build:windows:x86-64:cuda-11.4:msvc-14.29 ] + needs: [ build:windows:x86-64:cuda-11.4:msvc-14.29 ] \ No newline at end of file