From fe8c3ef3cbb9670335a8fdc31af552730baa8da2 Mon Sep 17 00:00:00 2001 From: David Tellenbach Date: Wed, 19 Aug 2020 18:27:45 +0000 Subject: Add possibility to split test suit build targets and improved CI configuration - Introduce CMake option `EIGEN_SPLIT_TESTSUITE` that allows to divide the single test build target into several subtargets - Add CI pipeline for merge request that can be run by GitLab's shared runners - Add nightly CI pipeline --- .gitignore | 1 + .gitlab-ci.yml | 80 ++------------------------ CMakeLists.txt | 4 ++ ci/CTest2JUnit.xsl | 120 +++++++++++++++++++++++++++++++++++++++ ci/build-tests.gitlab-ci.yml | 131 +++++++++++++++++++++++++++++++++++++++++++ ci/run-tests.gitlab-ci.yml | 128 ++++++++++++++++++++++++++++++++++++++++++ cmake/EigenTesting.cmake | 60 ++++++++++++++++++++ test/CMakeLists.txt | 7 +-- 8 files changed, 451 insertions(+), 80 deletions(-) create mode 100644 ci/CTest2JUnit.xsl create mode 100644 ci/build-tests.gitlab-ci.yml create mode 100644 ci/run-tests.gitlab-ci.yml diff --git a/.gitignore b/.gitignore index fc0e5486c..6b969957f 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ lapack/reference .*project .settings Makefile +!ci/build-tests.gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b860dd63..356565b61 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,78 +13,10 @@ stages: - doc variables: - CMAKE_GENERATOR: "Ninja" - BUILDDIR: builddir + BUILDDIR: builddir + EIGEN_CI_CMAKE_GENEATOR: "Ninja" + EIGEN_CI_TESTSUITE_SIZE: 15 -.build-tests: - allow_failure: true - stage: build - image: fedora:31 - before_script: - - dnf -y install gcc-c++-9.2.1 cmake make ninja-build - script: - - cmake -B ${BUILDDIR} -DEIGEN_TEST_CXX11=${EIGEN_TEST_CXX11} - - cmake --build ${BUILDDIR} --target buildtests - cache: - key: "build-cache-cxx11-${EIGEN_TEST_CXX11}" - paths: - - ${BUILDDIR}/ - policy: push - artifacts: - name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" - paths: - - ${BUILDDIR}/ - expire_in: 5 days - -.run_tests: - allow_failure: true - stage: test - image: fedora:31 - before_script: - - dnf -y install gcc-c++-9.2.1 cmake make ninja-build - script: - - cd ${BUILDDIR} && ctest --output-on-failure - cache: - key: "build-cache-cxx11-${EIGEN_TEST_CXX11}" - paths: - - ${BUILDDIR}/ - policy: pull - -build-test-cxx11-on: - extends: .build-tests - variables: - EIGEN_TEST_CXX11: "ON" - -build-test-cxx11-off: - extends: .build-tests - variables: - EIGEN_TEST_CXX11: "OFF" - -run-tests-cxx11-on: - extends: .run_tests - variables: - EIGEN_TEST_CXX11: "ON" - needs: ["build-test-cxx11-on"] - -run-tests-cxx11-off: - extends: .run_tests - variables: - EIGEN_TEST_CXX11: "OFF" - needs: ["build-test-cxx11-off"] - -build-doc: - image: fedora:31 - only: - - schedules - stage: doc - before_script: - - dnf -y install gcc-c++-9.2.1 cmake make doxygen doxygen-latex - script: - - cmake -G "Unix Makefiles" -B ${BUILDDIR} -DCMAKE_BUILD_TYPE=Release - - cmake --build ${BUILDDIR} --target doc - artifacts: - name: "$CI_JOB_NAME-$CI_JOB_ID" - paths: - - ${BUILDDIR}/doc/html - expire_in: 2 days - needs: [] +include: + - "/ci/build-tests.gitlab-ci.yml" + - "/ci/run-tests.gitlab-ci.yml" diff --git a/CMakeLists.txt b/CMakeLists.txt index 818f4a5e4..ef78e3fc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -664,3 +664,7 @@ install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/UseEigen3.cmake # Add uninstall target add_custom_target ( uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/EigenUninstall.cmake) + +if (EIGEN_SPLIT_TESTSUITE) + ei_split_testsuite("${EIGEN_SPLIT_TESTSUITE}") +endif() \ No newline at end of file diff --git a/ci/CTest2JUnit.xsl b/ci/CTest2JUnit.xsl new file mode 100644 index 000000000..8ba21f4e6 --- /dev/null +++ b/ci/CTest2JUnit.xsl @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + BuildName: + BuildStamp: + Name: + Generator: + CompilerName: + OSName: + Hostname: + OSRelease: + OSVersion: + OSPlatform: + Is64Bits: + VendorString: + VendorID: + FamilyID: + ModelID: + ProcessorCacheSize: + NumberOfLogicalCPU: + NumberOfPhysicalCPU: + TotalVirtualMemory: + TotalPhysicalMemory: + LogicalProcessorsPerPhysical: + ProcessorClockFrequency: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ci/build-tests.gitlab-ci.yml b/ci/build-tests.gitlab-ci.yml new file mode 100644 index 000000000..2b69b2841 --- /dev/null +++ b/ci/build-tests.gitlab-ci.yml @@ -0,0 +1,131 @@ +.build-tests-base: + stage: build + image: ubuntu:18.04 + before_script: + - apt-get update -y + - apt-get install -y --no-install-recommends software-properties-common + - add-apt-repository -y ppa:ubuntu-toolchain-r/test + - apt-get update + - apt-get install --no-install-recommends -y ${EIGEN_CI_CXX_COMPILER} ${EIGEN_CI_CC_COMPILER} cmake ninja-build + script: + - mkdir -p ${BUILDDIR} && cd ${BUILDDIR} + - echo "CXX=${EIGEN_CI_CXX_COMPILER} CC=${EIGEN_CI_CC_COMPILER} cmake -G ${EIGEN_CI_CMAKE_GENEATOR} -DEIGEN_SPLIT_TESTSUITE=${EIGEN_CI_TESTSUITE_SIZE} -DEIGEN_TEST_CXX11=${EIGEN_TEST_CXX11} ${EIGEN_CI_ADDITIONAL_ARGS} .." + - CXX=${EIGEN_CI_CXX_COMPILER} CC=${EIGEN_CI_CC_COMPILER} cmake -G ${EIGEN_CI_CMAKE_GENEATOR} -DEIGEN_SPLIT_TESTSUITE=${EIGEN_CI_TESTSUITE_SIZE} -DEIGEN_TEST_CXX11=${EIGEN_TEST_CXX11} ${EIGEN_CI_ADDITIONAL_ARGS}.. + - echo "cmake --build . --target buildtestspart${EIGEN_CI_TESTSUITE_PART}" + - cmake --build . --target buildtestspart${EIGEN_CI_TESTSUITE_PART} + artifacts: + name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" + paths: + - ${BUILDDIR}/ + expire_in: 5 days + +# Base for all build jobs building the whole testsuite in one job. Note that +# this cannot be run on GitLab's shared runners due to their timeout. +.build-tests-single-base: + extends: .build-tests-base + script: + - mkdir -p ${BUILDDIR} && cd ${BUILDDIR} + - echo "CXX=${EIGEN_CI_CXX_COMPILER} CC=${EIGEN_CI_CC_COMPILER} cmake -G ${EIGEN_CI_CMAKE_GENEATOR} -DEIGEN_TEST_CXX11=${EIGEN_TEST_CXX11} ${EIGEN_CI_CXX_FLAGS} ${EIGEN_CI_ADDITIONAL_ARGS}.." + - CXX=${EIGEN_CI_CXX_COMPILER} CC=${EIGEN_CI_CC_COMPILER} cmake -G ${EIGEN_CI_CMAKE_GENEATOR} -DEIGEN_TEST_CXX11=${EIGEN_TEST_CXX11} ${EIGEN_CI_ADDITIONAL_ARGS}.. + - echo "cmake --build . --target buildtests" + - cmake --build . --target buildtests + tags: + - eigen-runner + - x86 + - linux + only: + - schedules + +# Base for all build jobs using a splitted testsuite such that the job can be +# run on GitLab's own shared runners +.build-tests-split-base: + extends: .build-tests-base + script: + - mkdir -p ${BUILDDIR} && cd ${BUILDDIR} + - echo "CXX=${EIGEN_CI_CXX_COMPILER} CC=${EIGEN_CI_CC_COMPILER} cmake -G ${EIGEN_CI_CMAKE_GENEATOR} -DEIGEN_SPLIT_TESTSUITE=${EIGEN_CI_TESTSUITE_SIZE} -DEIGEN_TEST_CXX11=${EIGEN_TEST_CXX11} ${EIGEN_CI_CXX_FLAGS} -DEIGEN_TEST_AVX=On -DEIGEN_TEST_AVX2=On .." + - CXX=${EIGEN_CI_CXX_COMPILER} CC=${EIGEN_CI_CC_COMPILER} cmake -G ${EIGEN_CI_CMAKE_GENEATOR} -DEIGEN_SPLIT_TESTSUITE=${EIGEN_CI_TESTSUITE_SIZE} -DEIGEN_TEST_CXX11=${EIGEN_TEST_CXX11} -DEIGEN_TEST_AVX=On -DEIGEN_TEST_AVX2=On .. + - echo "cmake --build . --target buildtestspart${EIGEN_CI_TESTSUITE_PART}" + - cmake --build . --target buildtestspart${EIGEN_CI_TESTSUITE_PART} + only: + - merge_requests + +########################## Nightly running jobs ################################ + +# GCC 4.8 +# This is the oldest GCC version we support +build-tests-g++-4.8-cxx11-on: + extends: .build-tests-single-base + variables: + EIGEN_CI_CXX_COMPILER: "g++-4.8" + EIGEN_CI_CC_COMPILER: "gcc-4.8" + EIGEN_TEST_CXX11: "on" + +build-tests-g++-4.8-cxx11-off: + extends: .build-tests-single-base + variables: + EIGEN_CI_CXX_COMPILER: "g++-4.8" + EIGEN_CI_CC_COMPILER: "gcc-4.8" + EIGEN_TEST_CXX11: "off" + +# Clang 10 +build-tests-clang++-10-cxx11-on: + extends: .build-tests-single-base + variables: + EIGEN_CI_CXX_COMPILER: "clang++-10" + EIGEN_CI_CC_COMPILER: "clang-10" + EIGEN_TEST_CXX11: "on" + EIGEN_CI_ADDITIONAL_ARGS: "-DEIGEN_TEST_AVX=On -DEIGEN_TEST_AVX2=On" + +build-tests-clang++-10-cxx11-off: + extends: .build-tests-single-base + variables: + EIGEN_CI_CXX_COMPILER: "clang++-10" + EIGEN_CI_CC_COMPILER: "clang-10" + EIGEN_TEST_CXX11: "off" + EIGEN_CI_ADDITIONAL_ARGS: "-DEIGEN_TEST_AVX=On -DEIGEN_TEST_AVX2=On" + +# GCC 10 +build-tests-g++-10-cxx11-off: + extends: .build-tests-single-base + variables: + EIGEN_CI_CXX_COMPILER: "g++-10" + EIGEN_CI_CC_COMPILER: "gcc-10" + EIGEN_TEST_CXX11: "off" + EIGEN_CI_ADDITIONAL_ARGS: "-DEIGEN_TEST_AVX=On -DEIGEN_TEST_AVX2=On" + +build-tests-g++-10-cxx11-on: + extends: .build-tests-single-base + variables: + EIGEN_CI_CXX_COMPILER: "g++-10" + EIGEN_CI_CC_COMPILER: "gcc-10" + EIGEN_TEST_CXX11: "on" + EIGEN_CI_ADDITIONAL_ARGS: "-DEIGEN_TEST_AVX=On -DEIGEN_TEST_AVX2=On" + +########################### Merge request jobs ################################# + +# GCC 10 +build-tests-g++-9-cxx11-on-mr: + only: + - merge_requests + extends: .build-tests-split-base + variables: + EIGEN_CI_CXX_COMPILER: "g++-9" + EIGEN_CI_CC_COMPILER: "gcc-9" + EIGEN_CI_ADDITIONAL_ARGS: "-DEIGEN_TEST_AVX=On -DEIGEN_TEST_AVX2=On" + parallel: + matrix: + - EIGEN_CI_TESTSUITE_PART: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14] + EIGEN_TEST_CXX11: "on" + +build-tests-g++-9-cxx11-off-mr: + only: + - merge_requests + extends: .build-tests-split-base + variables: + EIGEN_CI_CXX_COMPILER: "g++-9" + EIGEN_CI_CC_COMPILER: "gcc-9" + EIGEN_CI_ADDITIONAL_ARGS: "-DEIGEN_TEST_AVX=On -DEIGEN_TEST_AVX2=On" + parallel: + matrix: + - EIGEN_CI_TESTSUITE_PART: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14] + EIGEN_TEST_CXX11: "off" diff --git a/ci/run-tests.gitlab-ci.yml b/ci/run-tests.gitlab-ci.yml new file mode 100644 index 000000000..c8ad66e7b --- /dev/null +++ b/ci/run-tests.gitlab-ci.yml @@ -0,0 +1,128 @@ +.run_tests: + allow_failure: true + stage: test + image: ubuntu:18.04 + before_script: + - apt-get update -y + - apt-get install -y --no-install-recommends software-properties-common + - add-apt-repository -y ppa:ubuntu-toolchain-r/test + - apt-get update + - apt-get install --no-install-recommends -y ${EIGEN_CI_CXX_COMPILER} ${EIGEN_CI_CC_COMPILER} cmake ninja-build xsltproc + script: + - echo "cd ${BUILDDIR} && ctest --output-on-failure --no-compress-output --build-no-clean -T test" + - cd ${BUILDDIR} && ctest --output-on-failure --no-compress-output --build-no-clean -T test + after_script: + - apt-get update -y + - apt-get install --no-install-recommends -y xsltproc + - cd ${BUILDDIR} + - xsltproc ../ci/CTest2JUnit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > "JUnitTestResults_$CI_JOB_ID.xml" + artifacts: + reports: + junit: + - ${BUILDDIR}/JUnitTestResults_$CI_JOB_ID.xml + expire_in: 5 days + +########################## Nightly running jobs ################################ +# GCC 4.8 +run-tests-g++-4.8-cxx11-on: + only: + - schedules + extends: .run_tests + variables: + EIGEN_CI_CXX_COMPILER: g++-4.8 + EIGEN_CI_CC_COMPILER: gcc-4.8 + needs: [ "build-tests-g++-4.8-cxx11-on" ] + tags: + - eigen-runner + - x86 + - linux + +run-tests-g++-4.8-cxx11-off: + only: + - schedules + extends: .run_tests + variables: + EIGEN_CI_CXX_COMPILER: g++-4.8 + EIGEN_CI_CC_COMPILER: gcc-4.8 + needs: [ "build-tests-g++-4.8-cxx11-off" ] + tags: + - eigen-runner + - x86 + - linux + +# Clang 10 +run-tests-clang++-10-cxx11-on: + only: + - schedules + extends: .run_tests + variables: + EIGEN_CI_CXX_COMPILER: clang++-10 + EIGEN_CI_CC_COMPILER: clang-10 + needs: [ "build-tests-clang++-10-cxx11-on" ] + tags: + - eigen-runner + - x86 + - linux + +run-tests-clang++-10-cxx11-off: + only: + - schedules + extends: .run_tests + variables: + EIGEN_CI_CXX_COMPILER: clang++-10 + EIGEN_CI_CC_COMPILER: clang-10 + needs: [ "build-tests-clang++-10-cxx11-off" ] + tags: + - eigen-runner + - x86 + - linux + +# GCC 10 +run-tests-g++-10-cxx11-on: + only: + - schedules + extends: .run_tests + variables: + EIGEN_CI_CXX_COMPILER: g++-10 + EIGEN_CI_CC_COMPILER: gcc-10 + needs: [ "build-tests-g++-10-cxx11-on" ] + tags: + - eigen-runner + - x86 + - linux + +run-tests-g++-10-cxx11-off: + only: + - schedules + extends: .run_tests + variables: + EIGEN_CI_CXX_COMPILER: g++-10 + EIGEN_CI_CC_COMPILER: gcc-10 + needs: [ "build-tests-g++-10-cxx11-off" ] + tags: + - eigen-runner + - x86 + - linux + +########################### Merge request jobs ################################# + +# GCC 10 +run-tests-g++-9-cxx11-on-mr: + only: + - merge_requests + extends: .run_tests + variables: + EIGEN_CI_CXX_COMPILER: g++-9 + EIGEN_CI_CC_COMPILER: gcc-9 + dependencies: + - build-tests-g++-9-cxx11-on-mr + +run-tests-g++-9-cxx11-off-mr: + only: + - merge_requests + extends: .run_tests + variables: + EIGEN_CI_CXX_COMPILER: g++-9 + EIGEN_CI_CC_COMPILER: gcc-9 + dependencies: + - build-tests-g++-9-cxx11-off-mr diff --git a/cmake/EigenTesting.cmake b/cmake/EigenTesting.cmake index c98393e5e..fae5bc1e4 100644 --- a/cmake/EigenTesting.cmake +++ b/cmake/EigenTesting.cmake @@ -648,3 +648,63 @@ macro(ei_test_get_compilerver_from_cxx_version_string) ei_test1_get_compilerver_from_cxx_version_string("g++-mp-4.4 (GCC) 4.4.6" "g++" "4.4.6") ei_test1_get_compilerver_from_cxx_version_string("g++-mp-4.4 (GCC) 2011" "g++" "4.4") endmacro() + +# Split all tests listed in EIGEN_TESTS_LIST into num_splits many targets +# named buildtestspartN with N = { 0, ..., num_splits-1}. +# +# The intention behind the existance of this macro is the size of Eigen's +# testsuite. Together with the relativly big compile-times building all tests +# can take a substantial amount of time depending on the available hardware. +# +# The last buildtestspartN target will build possible remaining tests. +# +# An example: +# +# EIGEN_TESTS_LIST= [ test1, test2, test3, test4, test5, test6, test7 ] +# +# A call to ei_split_testsuite(3) creates the following targets with dependencies +# +# Target Dependencies +# ------ ------------ +# buildtestspart0 test1, test2 +# buildtestspart1 test3, test4 +# buildtestspart2 test5, test6, test7 +# +macro(ei_split_testsuite num_splits) + get_property(EIGEN_TESTS_LIST GLOBAL PROPERTY EIGEN_TESTS_LIST) + + # Translate EIGEN_TESTS_LIST into a CMake list + string(REGEX REPLACE "\n" " " EIGEN_TESTS_LIST "${EIGEN_TESTS_LIST}") + set(EIGEN_TESTS_LIST "${EIGEN_TESTS_LIST}") + separate_arguments(EIGEN_TESTS_LIST) + + set(eigen_test_count "0") + foreach(t IN ITEMS ${EIGEN_TESTS_LIST}) + math(EXPR eigen_test_count "${eigen_test_count}+1") + endforeach() + + # Get number of tests per target + math(EXPR num_tests_per_target "${eigen_test_count}/${num_splits} - ${eigen_test_count}/${num_splits} % 1") + + set(test_idx "0") + math(EXPR target_bound "${num_splits}-1") + foreach(part RANGE "0" "${target_bound}") + # Create target + set(current_target "buildtestspart${part}") + add_custom_target("${current_target}") + math(EXPR upper_bound "${test_idx} + ${num_tests_per_target} - 1") + foreach(test_idx RANGE "${test_idx}" "${upper_bound}") + list(GET EIGEN_TESTS_LIST "${test_idx}" curr_test) + add_dependencies("${current_target}" "${curr_test}") + endforeach() + math(EXPR test_idx "${test_idx} + ${num_tests_per_target}") + endforeach() + + # Handle the possibly remaining tests + math(EXPR test_idx "${num_splits} * ${num_tests_per_target}") + math(EXPR target_bound "${eigen_test_count} - 1") + foreach(test_idx RANGE "${test_idx}" "${target_bound}") + list(GET EIGEN_TESTS_LIST "${test_idx}" curr_test) + add_dependencies("${current_target}" "${curr_test}") + endforeach() +endmacro(ei_split_testsuite num_splits) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 6b2f4828d..013ad6cb3 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -443,16 +443,11 @@ if (EIGEN_TEST_HIP) message(FATAL_ERROR "HIP_PLATFORM = nvcc is not supported within Eigen") else () message(FATAL_ERROR "Unknown HIP_PLATFORM = ${HIP_PLATFORM}") - endif() - + endif() endif() - else () - message(FATAL_ERROR "EIGEN_TEST_HIP is ON, but the specified HIP_PATH (${HIP_PATH}) does not exist") - endif() - endif() option(EIGEN_TEST_BUILD_DOCUMENTATION "Test building the doxygen documentation" OFF) -- cgit v1.2.3