diff options
| author |  a-doumoulakis <anonymous@invalid.net> | 2017-05-05 19:26:27 +0100 |
|---|---|---|
| committer | a-doumoulakis <anonymous@invalid.net> | 2017-05-05 19:26:27 +0100 |
| commit | 052426b824038bbee1c1c48c3df65dfccd79ae24 (patch) | |
| tree | e79f12613782bdcc94373cc031959359ebd5522f /cmake | |
| parent | 0d08165a7f7a95c35dead32ec2d567e9a4b609b0 (diff) | |
Add support for triSYCL
Eigen is now able to use triSYCL with EIGEN_SYCL_TRISYCL and TRISYCL_INCLUDE_DIR options
Fix contraction kernel with correct nd_item dimension
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/EigenTesting.cmake | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/cmake/EigenTesting.cmake b/cmake/EigenTesting.cmake index a92a2978b..848233342 100644 --- a/cmake/EigenTesting.cmake +++ b/cmake/EigenTesting.cmake @@ -111,7 +111,7 @@ endmacro(ei_add_test_internal) # SYCL macro(ei_add_test_internal_sycl testname testname_with_suffix) - include_directories( SYSTEM ${COMPUTECPP_PACKAGE_ROOT_DIR}/include) + set(targetname ${testname_with_suffix}) if(EIGEN_ADD_TEST_FILENAME_EXTENSION) @@ -124,18 +124,25 @@ macro(ei_add_test_internal_sycl testname testname_with_suffix) set( bc_file ${CMAKE_CURRENT_BINARY_DIR}/${filename}) set( host_file ${CMAKE_CURRENT_SOURCE_DIR}/${filename}) - ADD_CUSTOM_COMMAND( - OUTPUT ${include_file} - COMMAND ${CMAKE_COMMAND} -E echo "\\#include \\\"${host_file}\\\"" > ${include_file} - COMMAND ${CMAKE_COMMAND} -E echo "\\#include \\\"${bc_file}.sycl\\\"" >> ${include_file} - DEPENDS ${filename} ${bc_file}.sycl - COMMENT "Building ComputeCpp integration header file ${include_file}" - ) - # Add a custom target for the generated integration header - add_custom_target(${testname}_integration_header_sycl DEPENDS ${include_file}) - - add_executable(${targetname} ${include_file}) - add_dependencies(${targetname} ${testname}_integration_header_sycl) + if(NOT EIGEN_SYCL_TRISYCL) + include_directories( SYSTEM ${COMPUTECPP_PACKAGE_ROOT_DIR}/include) + + ADD_CUSTOM_COMMAND( + OUTPUT ${include_file} + COMMAND ${CMAKE_COMMAND} -E echo "\\#include \\\"${host_file}\\\"" > ${include_file} + COMMAND ${CMAKE_COMMAND} -E echo "\\#include \\\"${bc_file}.sycl\\\"" >> ${include_file} + DEPENDS ${filename} ${bc_file}.sycl + COMMENT "Building ComputeCpp integration header file ${include_file}" + ) + + # Add a custom target for the generated integration header + add_custom_target(${testname}_integration_header_sycl DEPENDS ${include_file}) + add_executable(${targetname} ${include_file}) + add_dependencies(${targetname} ${testname}_integration_header_sycl) + else() + add_executable(${targetname} ${host_file}) + endif() + add_sycl_to_target(${targetname} ${filename} ${CMAKE_CURRENT_BINARY_DIR}) if (targetname MATCHES "^eigen2_") @@ -467,7 +474,11 @@ macro(ei_testing_print_summary) endif() if(EIGEN_TEST_SYCL) - message(STATUS "SYCL: ON") + if(EIGEN_SYCL_TRISYCL) + message(STATUS "SYCL: ON (using triSYCL)") + else() + message(STATUS "SYCL: ON (using computeCPP)") + endif() else() message(STATUS "SYCL: OFF") endif() |