GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-09-23 14:53:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated CMake

Browse Source 
This patch updates the minimum required CMake version to 3.10 and removes the EIGEN_TEST_CXX11 CMake option, including corresponding logic.
This commit is contained in:
Erik Schultheis 2021-11-29 20:24:20 +00:00 committed by David Tellenbach
parent f33a31b823
commit 4a76880351
3 changed files with 168 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -1,5 +1,5 @@
# cmake_minimum_require must be the first command of the file # cmake_minimum_require must be the first command of the file
cmake_minimum_required(VERSION 3.5.0) cmake_minimum_required(VERSION 3.10.0)
# NOTE Remove setting the policy once the minimum required CMake version is # NOTE Remove setting the policy once the minimum required CMake version is
# increased to at least 3.15. Retain enabling the export to package registry. # increased to at least 3.15. Retain enabling the export to package registry.
@ -88,9 +88,6 @@ include(CMakeDependentOption)
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
option(EIGEN_TEST_CXX11 "Enable testing of unsupported CXX11 tests (i.e. those starting with cxx11_)." OFF)
macro(ei_add_cxx_compiler_flag FLAG) macro(ei_add_cxx_compiler_flag FLAG)
string(REGEX REPLACE "-" "" SFLAG1 ${FLAG}) string(REGEX REPLACE "-" "" SFLAG1 ${FLAG})
string(REGEX REPLACE "\\+" "p" SFLAG ${SFLAG1}) string(REGEX REPLACE "\\+" "p" SFLAG ${SFLAG1})

10
cmake/EigenTesting.cmake
View File

@ -382,12 +382,6 @@ macro(ei_testing_print_summary)
message(STATUS "S390X ZVECTOR: Using architecture defaults") message(STATUS "S390X ZVECTOR: Using architecture defaults")
endif() endif()
if(EIGEN_TEST_CXX11)
message(STATUS "C++11: ON")
else()
message(STATUS "C++11: OFF")
endif()
if(EIGEN_TEST_SYCL) if(EIGEN_TEST_SYCL)
if(EIGEN_SYCL_TRISYCL) if(EIGEN_SYCL_TRISYCL)
message(STATUS "SYCL: ON (using triSYCL)") message(STATUS "SYCL: ON (using triSYCL)")
@ -614,10 +608,6 @@ macro(ei_set_build_string)
set(TMP_BUILD_STRING ${TMP_BUILD_STRING}-64bit) set(TMP_BUILD_STRING ${TMP_BUILD_STRING}-64bit)
endif() endif()
if(EIGEN_TEST_CXX11)
set(TMP_BUILD_STRING ${TMP_BUILD_STRING}-cxx11)
endif()
if(EIGEN_BUILD_STRING_SUFFIX) if(EIGEN_BUILD_STRING_SUFFIX)
set(TMP_BUILD_STRING ${TMP_BUILD_STRING}-${EIGEN_BUILD_STRING_SUFFIX}) set(TMP_BUILD_STRING ${TMP_BUILD_STRING}-${EIGEN_BUILD_STRING_SUFFIX})
endif() endif()

185
unsupported/test/CMakeLists.txt
View File

@ -105,8 +105,7 @@ ei_add_test(bessel_functions)
ei_add_test(special_functions) ei_add_test(special_functions)
ei_add_test(special_packetmath "-DEIGEN_FAST_MATH=1") ei_add_test(special_packetmath "-DEIGEN_FAST_MATH=1")
if(EIGEN_TEST_CXX11) if(EIGEN_TEST_SYCL)
if(EIGEN_TEST_SYCL)
set(EIGEN_SYCL ON) set(EIGEN_SYCL ON)
# Forward CMake options as preprocessor definitions # Forward CMake options as preprocessor definitions
if(EIGEN_SYCL_USE_DEFAULT_SELECTOR) if(EIGEN_SYCL_USE_DEFAULT_SELECTOR)
@ -185,103 +184,101 @@ if(EIGEN_TEST_CXX11)
-cl-mad-enable) -cl-mad-enable)
endif() endif()
ei_add_test(cxx11_tensor_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_sycl)
ei_add_test(cxx11_tensor_image_op_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_image_op_sycl)
ei_add_test(cxx11_tensor_math_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_math_sycl)
ei_add_test(cxx11_tensor_forced_eval_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_forced_eval_sycl)
ei_add_test(cxx11_tensor_broadcast_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_broadcast_sycl)
ei_add_test(cxx11_tensor_device_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_device_sycl)
ei_add_test(cxx11_tensor_reduction_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_reduction_sycl)
ei_add_test(cxx11_tensor_morphing_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_morphing_sycl)
ei_add_test(cxx11_tensor_shuffling_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_shuffling_sycl)
ei_add_test(cxx11_tensor_padding_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_padding_sycl)
ei_add_test(cxx11_tensor_builtins_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_builtins_sycl)
ei_add_test(cxx11_tensor_contract_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_contract_sycl)
ei_add_test(cxx11_tensor_concatenation_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_concatenation_sycl)
ei_add_test(cxx11_tensor_reverse_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_reverse_sycl)
ei_add_test(cxx11_tensor_convolution_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_convolution_sycl)
ei_add_test(cxx11_tensor_striding_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_striding_sycl)
ei_add_test(cxx11_tensor_chipping_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_chipping_sycl)
ei_add_test(cxx11_tensor_layout_swap_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_layout_swap_sycl)
ei_add_test(cxx11_tensor_inflation_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_inflation_sycl)
ei_add_test(cxx11_tensor_random_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_random_sycl)
ei_add_test(cxx11_tensor_generator_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_generator_sycl)
ei_add_test(cxx11_tensor_patch_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_patch_sycl)
ei_add_test(cxx11_tensor_image_patch_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_image_patch_sycl)
ei_add_test(cxx11_tensor_volume_patch_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_volume_patch_sycl)
ei_add_test(cxx11_tensor_argmax_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_argmax_sycl)
ei_add_test(cxx11_tensor_custom_op_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_custom_op_sycl)
ei_add_test(cxx11_tensor_scan_sycl ${STD_CXX_FLAG}) ei_add_test(cxx11_tensor_scan_sycl)
set(EIGEN_SYCL OFF) set(EIGEN_SYCL OFF)
endif() endif()
ei_add_test(cxx11_eventcount "-pthread" "${CMAKE_THREAD_LIBS_INIT}") ei_add_test(cxx11_eventcount "-pthread" "${CMAKE_THREAD_LIBS_INIT}")
ei_add_test(cxx11_runqueue "-pthread" "${CMAKE_THREAD_LIBS_INIT}") ei_add_test(cxx11_runqueue "-pthread" "${CMAKE_THREAD_LIBS_INIT}")
ei_add_test(cxx11_non_blocking_thread_pool "-pthread" "${CMAKE_THREAD_LIBS_INIT}") ei_add_test(cxx11_non_blocking_thread_pool "-pthread" "${CMAKE_THREAD_LIBS_INIT}")
ei_add_test(cxx11_meta) ei_add_test(cxx11_meta)
ei_add_test(cxx11_maxsizevector) ei_add_test(cxx11_maxsizevector)
ei_add_test(cxx11_tensor_argmax) ei_add_test(cxx11_tensor_argmax)
ei_add_test(cxx11_tensor_assign) ei_add_test(cxx11_tensor_assign)
ei_add_test(cxx11_tensor_block_access) ei_add_test(cxx11_tensor_block_access)
ei_add_test(cxx11_tensor_block_eval) ei_add_test(cxx11_tensor_block_eval)
ei_add_test(cxx11_tensor_block_io) ei_add_test(cxx11_tensor_block_io)
ei_add_test(cxx11_tensor_broadcasting) ei_add_test(cxx11_tensor_broadcasting)
ei_add_test(cxx11_tensor_casts) ei_add_test(cxx11_tensor_casts)
ei_add_test(cxx11_tensor_chipping) ei_add_test(cxx11_tensor_chipping)
ei_add_test(cxx11_tensor_comparisons) ei_add_test(cxx11_tensor_comparisons)
ei_add_test(cxx11_tensor_concatenation) ei_add_test(cxx11_tensor_concatenation)
ei_add_test(cxx11_tensor_const) ei_add_test(cxx11_tensor_const)
ei_add_test(cxx11_tensor_contraction) ei_add_test(cxx11_tensor_contraction)
ei_add_test(cxx11_tensor_convolution) ei_add_test(cxx11_tensor_convolution)
ei_add_test(cxx11_tensor_custom_index) ei_add_test(cxx11_tensor_custom_index)
ei_add_test(cxx11_tensor_custom_op) ei_add_test(cxx11_tensor_custom_op)
ei_add_test(cxx11_tensor_dimension) ei_add_test(cxx11_tensor_dimension)
ei_add_test(cxx11_tensor_empty) ei_add_test(cxx11_tensor_empty)
ei_add_test(cxx11_tensor_executor "-pthread" "${CMAKE_THREAD_LIBS_INIT}") ei_add_test(cxx11_tensor_executor "-pthread" "${CMAKE_THREAD_LIBS_INIT}")
ei_add_test(cxx11_tensor_expr) ei_add_test(cxx11_tensor_expr)
ei_add_test(cxx11_tensor_fft) ei_add_test(cxx11_tensor_fft)
ei_add_test(cxx11_tensor_fixed_size) ei_add_test(cxx11_tensor_fixed_size)
ei_add_test(cxx11_tensor_forced_eval) ei_add_test(cxx11_tensor_forced_eval)
ei_add_test(cxx11_tensor_generator) ei_add_test(cxx11_tensor_generator)
ei_add_test(cxx11_tensor_ifft) ei_add_test(cxx11_tensor_ifft)
ei_add_test(cxx11_tensor_image_patch) ei_add_test(cxx11_tensor_image_patch)
ei_add_test(cxx11_tensor_index_list) ei_add_test(cxx11_tensor_index_list)
ei_add_test(cxx11_tensor_inflation) ei_add_test(cxx11_tensor_inflation)
ei_add_test(cxx11_tensor_intdiv) ei_add_test(cxx11_tensor_intdiv)
ei_add_test(cxx11_tensor_io) ei_add_test(cxx11_tensor_io)
ei_add_test(cxx11_tensor_layout_swap) ei_add_test(cxx11_tensor_layout_swap)
ei_add_test(cxx11_tensor_lvalue) ei_add_test(cxx11_tensor_lvalue)
ei_add_test(cxx11_tensor_map) ei_add_test(cxx11_tensor_map)
ei_add_test(cxx11_tensor_math) ei_add_test(cxx11_tensor_math)
ei_add_test(cxx11_tensor_mixed_indices) ei_add_test(cxx11_tensor_mixed_indices)
ei_add_test(cxx11_tensor_morphing) ei_add_test(cxx11_tensor_morphing)
ei_add_test(cxx11_tensor_move) ei_add_test(cxx11_tensor_move)
ei_add_test(cxx11_tensor_notification "-pthread" "${CMAKE_THREAD_LIBS_INIT}") ei_add_test(cxx11_tensor_notification "-pthread" "${CMAKE_THREAD_LIBS_INIT}")
ei_add_test(cxx11_tensor_of_complex) ei_add_test(cxx11_tensor_of_complex)
ei_add_test(cxx11_tensor_of_const_values) ei_add_test(cxx11_tensor_of_const_values)
ei_add_test(cxx11_tensor_of_strings) ei_add_test(cxx11_tensor_of_strings)
ei_add_test(cxx11_tensor_padding) ei_add_test(cxx11_tensor_padding)
ei_add_test(cxx11_tensor_patch) ei_add_test(cxx11_tensor_patch)
ei_add_test(cxx11_tensor_random) ei_add_test(cxx11_tensor_random)
ei_add_test(cxx11_tensor_reduction) ei_add_test(cxx11_tensor_reduction)
ei_add_test(cxx11_tensor_ref) ei_add_test(cxx11_tensor_ref)
ei_add_test(cxx11_tensor_roundings) ei_add_test(cxx11_tensor_roundings)
ei_add_test(cxx11_tensor_scan) ei_add_test(cxx11_tensor_scan)
ei_add_test(cxx11_tensor_shuffling) ei_add_test(cxx11_tensor_shuffling)
ei_add_test(cxx11_tensor_simple) ei_add_test(cxx11_tensor_simple)
ei_add_test(cxx11_tensor_striding) ei_add_test(cxx11_tensor_striding)
ei_add_test(cxx11_tensor_sugar) ei_add_test(cxx11_tensor_sugar)
ei_add_test(cxx11_tensor_thread_local "-pthread" "${CMAKE_THREAD_LIBS_INIT}") ei_add_test(cxx11_tensor_thread_local "-pthread" "${CMAKE_THREAD_LIBS_INIT}")
ei_add_test(cxx11_tensor_thread_pool "-pthread" "${CMAKE_THREAD_LIBS_INIT}") ei_add_test(cxx11_tensor_thread_pool "-pthread" "${CMAKE_THREAD_LIBS_INIT}")
ei_add_test(cxx11_tensor_trace) ei_add_test(cxx11_tensor_trace)
ei_add_test(cxx11_tensor_volume_patch) ei_add_test(cxx11_tensor_volume_patch)
# ei_add_test(cxx11_tensor_symmetry) # ei_add_test(cxx11_tensor_symmetry)
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8" AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8" AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
# This test requires __uint128_t which is only available on 64bit systems # This test requires __uint128_t which is only available on 64bit systems
ei_add_test(cxx11_tensor_uint128) ei_add_test(cxx11_tensor_uint128)
endif()
endif() endif()
find_package(CUDA 9.0) find_package(CUDA 9.0)