diff options
| -rw-r--r-- | unsupported/test/CMakeLists.txt | 28 | ||||
| -rw-r--r-- | unsupported/test/cxx11_tensor_argmax_cuda.cu (renamed from unsupported/test/cxx11_tensor_argmax_cuda.cpp) | 0 | ||||
| -rw-r--r-- | unsupported/test/cxx11_tensor_contract_cuda.cu (renamed from unsupported/test/cxx11_tensor_contract_cuda.cpp) | 0 | ||||
| -rw-r--r-- | unsupported/test/cxx11_tensor_cuda.cu (renamed from unsupported/test/cxx11_tensor_cuda.cpp) | 0 | ||||
| -rw-r--r-- | unsupported/test/cxx11_tensor_device.cu (renamed from unsupported/test/cxx11_tensor_device.cpp) | 0 | ||||
| -rw-r--r-- | unsupported/test/cxx11_tensor_random_cuda.cu (renamed from unsupported/test/cxx11_tensor_random_cuda.cpp) | 0 | ||||
| -rw-r--r-- | unsupported/test/cxx11_tensor_reduction.cu (renamed from unsupported/test/cxx11_tensor_reduction_cuda.cpp) | 0 |
7 files changed, 20 insertions, 8 deletions
diff --git a/unsupported/test/CMakeLists.txt b/unsupported/test/CMakeLists.txt index 97257b183..5c383aab6 100644 --- a/unsupported/test/CMakeLists.txt +++ b/unsupported/test/CMakeLists.txt @@ -148,12 +148,24 @@ if(EIGEN_TEST_CXX11) ei_add_test(cxx11_tensor_fft "-std=c++0x") ei_add_test(cxx11_tensor_ifft "-std=c++0x") - # These tests needs nvcc -# ei_add_test(cxx11_tensor_device "-std=c++0x") -# ei_add_test(cxx11_tensor_cuda "-std=c++0x") -# ei_add_test(cxx11_tensor_contract_cuda "-std=c++0x") -# ei_add_test(cxx11_tensor_reduction_cuda "-std=c++0x") -# ei_add_test(cxx11_tensor_random_cuda "-std=c++0x") -# ei_add_test(cxx11_tensor_argmax_cuda "-std=c++0x") - endif() + +# These tests needs nvcc +find_package(CUDA 7) +if(CUDA_FOUND) + set(CUDA_PROPAGATE_HOST_FLAGS OFF) + if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + set(CUDA_NVCC_FLAGS "-ccbin /usr/bin/clang" CACHE STRING "nvcc flags" FORCE) + endif() + cuda_include_directories("${CMAKE_CURRENT_BINARY_DIR}" "${CUDA_TOOLKIT_ROOT_DIR}/include") + set(EIGEN_ADD_TEST_FILENAME_EXTENSION "cu") + + ei_add_test(cxx11_tensor_device "-std=c++11") + ei_add_test(cxx11_tensor_cuda "-std=c++11") + ei_add_test(cxx11_tensor_contract_cuda "-std=c++11") + ei_add_test(cxx11_tensor_reduction_cuda "-std=c++11") + ei_add_test(cxx11_tensor_random_cuda "-std=c++11") + ei_add_test(cxx11_tensor_argmax_cuda "-std=c++11 -I/opt-cuda-7.0/include") + + unset(EIGEN_ADD_TEST_FILENAME_EXTENSION) +endif(CUDA_FOUND) diff --git a/unsupported/test/cxx11_tensor_argmax_cuda.cpp b/unsupported/test/cxx11_tensor_argmax_cuda.cu index d37490d15..d37490d15 100644 --- a/unsupported/test/cxx11_tensor_argmax_cuda.cpp +++ b/unsupported/test/cxx11_tensor_argmax_cuda.cu diff --git a/unsupported/test/cxx11_tensor_contract_cuda.cpp b/unsupported/test/cxx11_tensor_contract_cuda.cu index ac447dd7b..ac447dd7b 100644 --- a/unsupported/test/cxx11_tensor_contract_cuda.cpp +++ b/unsupported/test/cxx11_tensor_contract_cuda.cu diff --git a/unsupported/test/cxx11_tensor_cuda.cpp b/unsupported/test/cxx11_tensor_cuda.cu index 49e1894ab..49e1894ab 100644 --- a/unsupported/test/cxx11_tensor_cuda.cpp +++ b/unsupported/test/cxx11_tensor_cuda.cu diff --git a/unsupported/test/cxx11_tensor_device.cpp b/unsupported/test/cxx11_tensor_device.cu index ed5dd7505..ed5dd7505 100644 --- a/unsupported/test/cxx11_tensor_device.cpp +++ b/unsupported/test/cxx11_tensor_device.cu diff --git a/unsupported/test/cxx11_tensor_random_cuda.cpp b/unsupported/test/cxx11_tensor_random_cuda.cu index 5d091de15..5d091de15 100644 --- a/unsupported/test/cxx11_tensor_random_cuda.cpp +++ b/unsupported/test/cxx11_tensor_random_cuda.cu diff --git a/unsupported/test/cxx11_tensor_reduction_cuda.cpp b/unsupported/test/cxx11_tensor_reduction.cu index 9e06eb126..9e06eb126 100644 --- a/unsupported/test/cxx11_tensor_reduction_cuda.cpp +++ b/unsupported/test/cxx11_tensor_reduction.cu |