Pulled latest updates from trunk

This commit is contained in:
Benoit Steiner 2016-07-11 14:29:05 -07:00
commit 013a904237

View File

@ -225,19 +225,19 @@ if(CUDA_FOUND AND EIGEN_TEST_CUDA)
set(EIGEN_ADD_TEST_FILENAME_EXTENSION "cu") set(EIGEN_ADD_TEST_FILENAME_EXTENSION "cu")
ei_add_test(cxx11_tensor_device) ei_add_test(cxx11_tensor_device)
#ei_add_test(cxx11_tensor_cuda) ei_add_test(cxx11_tensor_cuda)
#ei_add_test(cxx11_tensor_contract_cuda) ei_add_test(cxx11_tensor_contract_cuda)
#ei_add_test(cxx11_tensor_reduction_cuda) ei_add_test(cxx11_tensor_reduction_cuda)
#ei_add_test(cxx11_tensor_argmax_cuda) ei_add_test(cxx11_tensor_argmax_cuda)
#ei_add_test(cxx11_tensor_cast_float16_cuda) ei_add_test(cxx11_tensor_cast_float16_cuda)
#ei_add_test(cxx11_tensor_scan_cuda) ei_add_test(cxx11_tensor_scan_cuda)
# The random number generation code requires arch 3.5 or greater. # The random number generation code requires arch 3.5 or greater.
if (${EIGEN_CUDA_COMPUTE_ARCH} GREATER 34) if (${EIGEN_CUDA_COMPUTE_ARCH} GREATER 34)
# ei_add_test(cxx11_tensor_random_cuda) ei_add_test(cxx11_tensor_random_cuda)
endif() endif()
#ei_add_test(cxx11_tensor_of_float16_cuda) ei_add_test(cxx11_tensor_of_float16_cuda)
unset(EIGEN_ADD_TEST_FILENAME_EXTENSION) unset(EIGEN_ADD_TEST_FILENAME_EXTENSION)
endif() endif()