diff options
| author |  Christoph Hertzberg <chtz@informatik.uni-bremen.de> | 2015-09-02 22:51:43 +0200 |
|---|---|---|
| committer | Christoph Hertzberg <chtz@informatik.uni-bremen.de> | 2015-09-02 22:51:43 +0200 |
| commit | 5ad7981f7360f8acd820f954591b5d365ab62a21 (patch) | |
| tree | 9f32f3518f5a60b6b64ab95a6736c3cf32579851 | |
| parent | aa768add0bd273763d06edb3ef6800ccb04284ef (diff) | |
Use full packet size for Dynamic-sized objects (otherwise, the unalignedcount unit test fails with AVX enabled)
| -rw-r--r-- | Eigen/src/Core/util/XprHelper.h | 2 | ||||
| -rw-r--r-- | unsupported/test/CMakeLists.txt | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Eigen/src/Core/util/XprHelper.h b/Eigen/src/Core/util/XprHelper.h index f1520e4e2..c31cd4801 100644 --- a/Eigen/src/Core/util/XprHelper.h +++ b/Eigen/src/Core/util/XprHelper.h @@ -127,7 +127,7 @@ template<typename T> struct unpacket_traits }; template<int Size, typename PacketType, - bool Stop = (Size%unpacket_traits<PacketType>::size)==0 || is_same<PacketType,typename unpacket_traits<PacketType>::half>::value> + bool Stop = Size==Dynamic || (Size%unpacket_traits<PacketType>::size)==0 || is_same<PacketType,typename unpacket_traits<PacketType>::half>::value> struct find_best_packet_helper; template< int Size, typename PacketType> diff --git a/unsupported/test/CMakeLists.txt b/unsupported/test/CMakeLists.txt index b161cb370..79e70ced4 100644 --- a/unsupported/test/CMakeLists.txt +++ b/unsupported/test/CMakeLists.txt @@ -5,6 +5,7 @@ add_custom_target(BuildUnsupported) include_directories(../../test ../../unsupported ../../Eigen ${CMAKE_CURRENT_BINARY_DIR}/../../test) +find_package (Threads) find_package(GoogleHash) if(GOOGLEHASH_FOUND) @@ -133,7 +134,7 @@ if(EIGEN_TEST_CXX11) ei_add_test(cxx11_tensor_argmax "-std=c++0x") ei_add_test(cxx11_tensor_shuffling "-std=c++0x") ei_add_test(cxx11_tensor_striding "-std=c++0x") - ei_add_test(cxx11_tensor_thread_pool "-std=c++0x") + ei_add_test(cxx11_tensor_thread_pool "-pthread" "${CMAKE_THREAD_LIBS_INIT}") ei_add_test(cxx11_tensor_ref "-std=c++0x") ei_add_test(cxx11_tensor_random "-std=c++0x") ei_add_test(cxx11_tensor_casts "-std=c++0x") |