From 5ad7981f7360f8acd820f954591b5d365ab62a21 Mon Sep 17 00:00:00 2001 From: Christoph Hertzberg Date: Wed, 2 Sep 2015 22:51:43 +0200 Subject: Use full packet size for Dynamic-sized objects (otherwise, the unalignedcount unit test fails with AVX enabled) --- Eigen/src/Core/util/XprHelper.h | 2 +- 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 struct unpacket_traits }; template::size)==0 || is_same::half>::value> + bool Stop = Size==Dynamic || (Size%unpacket_traits::size)==0 || is_same::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") -- cgit v1.2.3