mirror of
https://gitlab.com/libeigen/eigen.git
synced 2026-04-10 11:34:33 +08:00
Pull latest updates from upstream
This commit is contained in:
@@ -19,12 +19,30 @@ macro(ei_add_test_internal testname testname_with_suffix)
|
||||
endif()
|
||||
|
||||
if(EIGEN_ADD_TEST_FILENAME_EXTENSION STREQUAL cu)
|
||||
cuda_add_executable(${targetname} ${filename})
|
||||
if(EIGEN_TEST_CUDA_CLANG)
|
||||
set_source_files_properties(${filename} PROPERTIES LANGUAGE CXX)
|
||||
if(CUDA_64_BIT_DEVICE_CODE)
|
||||
link_directories("${CUDA_TOOLKIT_ROOT_DIR}/lib64")
|
||||
else()
|
||||
link_directories("${CUDA_TOOLKIT_ROOT_DIR}/lib")
|
||||
endif()
|
||||
if (${ARGC} GREATER 2)
|
||||
add_executable(${targetname} ${filename})
|
||||
else()
|
||||
add_executable(${targetname} ${filename} OPTIONS ${ARGV2})
|
||||
endif()
|
||||
target_link_libraries(${targetname} "cudart_static" "cuda" "dl" "rt" "pthread")
|
||||
else()
|
||||
if (${ARGC} GREATER 2)
|
||||
cuda_add_executable(${targetname} ${filename} OPTIONS ${ARGV2})
|
||||
else()
|
||||
cuda_add_executable(${targetname} ${filename})
|
||||
endif()
|
||||
endif()
|
||||
else()
|
||||
add_executable(${targetname} ${filename})
|
||||
endif()
|
||||
|
||||
|
||||
if (targetname MATCHES "^eigen2_")
|
||||
add_dependencies(eigen2_buildtests ${targetname})
|
||||
else()
|
||||
@@ -305,13 +323,29 @@ macro(ei_testing_print_summary)
|
||||
else()
|
||||
message(STATUS "ARMv8 NEON: Using architecture defaults")
|
||||
endif()
|
||||
|
||||
|
||||
if(EIGEN_TEST_ZVECTOR)
|
||||
message(STATUS "S390X ZVECTOR: ON")
|
||||
else()
|
||||
message(STATUS "S390X ZVECTOR: Using architecture defaults")
|
||||
endif()
|
||||
|
||||
if(EIGEN_TEST_CXX11)
|
||||
message(STATUS "C++11: ON")
|
||||
else()
|
||||
message(STATUS "C++11: OFF")
|
||||
endif()
|
||||
|
||||
if(EIGEN_TEST_CUDA)
|
||||
if(EIGEN_TEST_CUDA_CLANG)
|
||||
message(STATUS "CUDA: ON (using clang)")
|
||||
else()
|
||||
message(STATUS "CUDA: ON (using nvcc)")
|
||||
endif()
|
||||
else()
|
||||
message(STATUS "CUDA: OFF")
|
||||
endif()
|
||||
|
||||
endif() # vectorization / alignment options
|
||||
|
||||
message(STATUS "\n${EIGEN_TESTING_SUMMARY}")
|
||||
@@ -443,6 +477,8 @@ macro(ei_get_cxxflags VAR)
|
||||
set(${VAR} NEON)
|
||||
elseif(EIGEN_TEST_NEON64)
|
||||
set(${VAR} NEON)
|
||||
elseif(EIGEN_TEST_ZVECTOR)
|
||||
set(${VAR} ZVECTOR)
|
||||
elseif(EIGEN_TEST_VSX)
|
||||
set(${VAR} VSX)
|
||||
elseif(EIGEN_TEST_ALTIVEC)
|
||||
|
||||
Reference in New Issue
Block a user