GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-07-02 03:05:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix cmake warning and default to j0.

Browse Source
This commit is contained in:
Antonio Sánchez 2025-03-29 16:09:40 +00:00 committed by Rasmus Munk Larsen
parent e0c99a8dd6
commit 9cc9209b9b
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ci/test.windows.gitlab-ci.yml
View File

@ -10,7 +10,7 @@
- if: $CI_PIPELINE_SOURCE == "web" && $CI_PROJECT_NAMESPACE == "libeigen" - if: $CI_PIPELINE_SOURCE == "web" && $CI_PROJECT_NAMESPACE == "libeigen"
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_PROJECT_NAMESPACE == "libeigen" && $CI_MERGE_REQUEST_LABELS =~ "/all-tests/" - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_PROJECT_NAMESPACE == "libeigen" && $CI_MERGE_REQUEST_LABELS =~ "/all-tests/"
tags: tags:
- eigen-runner - eigen-runner
- windows - windows
- x86-64 - x86-64
@ -64,7 +64,7 @@ test:windows:x86-64:msvc-14.29:avx2:unsupported:
.test:windows:x86-64:msvc-14.29:avx512dq: .test:windows:x86-64:msvc-14.29:avx512dq:
extends: .test:windows extends: .test:windows
needs: [ build:windows:x86-64:msvc-14.29:avx512dq ] needs: [ build:windows:x86-64:msvc-14.29:avx512dq ]
tags: tags:
- eigen-runner - eigen-runner
- windows - windows
- x86-64 - x86-64
@ -86,7 +86,7 @@ test:windows:x86-64:msvc-14.29:avx512dq:unsupported:
allow_failure: true allow_failure: true
variables: variables:
EIGEN_CI_CTEST_LABEL: gpu EIGEN_CI_CTEST_LABEL: gpu
tags: tags:
- eigen-runner - eigen-runner
- windows - windows
- x86-64 - x86-64
@ -97,12 +97,12 @@ test:windows:x86-64:msvc-14.29:avx512dq:unsupported:
# test:windows:x86-64:cuda-9.2:msvc-14.16: # test:windows:x86-64:cuda-9.2:msvc-14.16:
# extends: .test:windows:cuda # extends: .test:windows:cuda
# needs: [ build:windows:x86-64:cuda-9.2:msvc-14.16 ] # needs: [ build:windows:x86-64:cuda-9.2:msvc-14.16 ]
# MSVC 14.29 + CUDA 10.2 # MSVC 14.29 + CUDA 10.2
test:windows:x86-64:cuda-10.2:msvc-14.29: test:windows:x86-64:cuda-10.2:msvc-14.29:
extends: .test:windows:cuda extends: .test:windows:cuda
needs: [ build:windows:x86-64:cuda-10.2:msvc-14.29 ] needs: [ build:windows:x86-64:cuda-10.2:msvc-14.29 ]
# MSVC 14.29 + CUDA 11.4 # MSVC 14.29 + CUDA 11.4
test:windows:x86-64:cuda-11.4:msvc-14.29: test:windows:x86-64:cuda-11.4:msvc-14.29:
extends: .test:windows:cuda extends: .test:windows:cuda

12
cmake/EigenConfigureTesting.cmake
View File

@ -2,7 +2,7 @@ include(EigenTesting)
include(CheckCXXSourceCompiles) include(CheckCXXSourceCompiles)
# configure the "site" and "buildname" # configure the "site" and "buildname"
ei_set_sitename() ei_set_sitename()
# retrieve and store the build string # retrieve and store the build string
@ -12,11 +12,7 @@ add_custom_target(buildtests)
if (NOT EIGEN_CTEST_ARGS) if (NOT EIGEN_CTEST_ARGS)
# By default, run tests in parallel on all available cores. # By default, run tests in parallel on all available cores.
include(ProcessorCount) set(EIGEN_CTEST_ARGS "" CACHE STRING "-j0")
ProcessorCount(NPROC)
if(NOT NPROC EQUAL 0)
set(EIGEN_CTEST_ARGS "" CACHE STRING "-j"${NPROC})
endif()
endif() endif()
add_custom_target(check COMMAND "ctest" ${EIGEN_CTEST_ARGS}) add_custom_target(check COMMAND "ctest" ${EIGEN_CTEST_ARGS})
@ -24,7 +20,7 @@ add_dependencies(check buildtests)
# Convenience target for only building GPU tests. # Convenience target for only building GPU tests.
add_custom_target(buildtests_gpu) add_custom_target(buildtests_gpu)
add_custom_target(check_gpu COMMAND "ctest" "--output-on-failure" add_custom_target(check_gpu COMMAND "ctest" "--output-on-failure"
"--no-compress-output" "--no-compress-output"
"--build-no-clean" "--build-no-clean"
"-T" "test" "-T" "test"
@ -70,7 +66,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(CTEST_CUSTOM_COVERAGE_EXCLUDE "/test/") set(CTEST_CUSTOM_COVERAGE_EXCLUDE "/test/")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_FLAGS}")
endif() endif()
elseif(MSVC) elseif(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_CRT_SECURE_NO_WARNINGS /D_SCL_SECURE_NO_WARNINGS") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_CRT_SECURE_NO_WARNINGS /D_SCL_SECURE_NO_WARNINGS")
endif() endif()