diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2014-10-10 15:20:37 -0700 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2014-10-10 15:20:37 -0700 |
| commit | a991f94c0e5c51555875564ce58681a82d07cd69 (patch) | |
| tree | 14dec39546e66b5c44c425888fa90739656a4b4b | |
| parent | 498b7eed25bdb3b90f2fc45dd822c96aa08db2f8 (diff) | |
Fixed the thread pool test
| -rw-r--r-- | test/main.h | 4 | ||||
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h | 2 | ||||
| -rw-r--r-- | unsupported/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | unsupported/test/cxx11_tensor_thread_pool.cpp | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/test/main.h b/test/main.h index b504970f3..9cb41c828 100644 --- a/test/main.h +++ b/test/main.h @@ -47,8 +47,8 @@ // protected by parenthesis against macro expansion, the min()/max() macros // are defined here and any not-parenthesized min/max call will cause a // compiler error. -#define min(A,B) please_protect_your_min_with_parentheses -#define max(A,B) please_protect_your_max_with_parentheses +//#define min(A,B) please_protect_your_min_with_parentheses +//#define max(A,B) please_protect_your_max_with_parentheses #define FORBIDDEN_IDENTIFIER (this_identifier_is_forbidden_to_avoid_clashes) this_identifier_is_forbidden_to_avoid_clashes // B0 is defined in POSIX header termios.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h b/unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h index faf965df8..84768ca09 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h @@ -131,7 +131,7 @@ class TensorExecutor<Expression, ThreadPoolDevice, Vectorizable> const Index numblocks = size / blocksize; Index i = 0; - vector<std::future<void> > results; + std::vector<std::future<void> > results; results.reserve(numblocks); for (int i = 0; i < numblocks; ++i) { results.push_back(std::async(std::launch::async, &EvalRange<Evaluator, Index>::run, &evaluator, i*blocksize, (i+1)*blocksize)); diff --git a/unsupported/test/CMakeLists.txt b/unsupported/test/CMakeLists.txt index 75423f516..1c4d0838a 100644 --- a/unsupported/test/CMakeLists.txt +++ b/unsupported/test/CMakeLists.txt @@ -122,5 +122,5 @@ if(EIGEN_TEST_CXX11) # ei_add_test(cxx11_tensor_shuffling "-std=c++0x") ei_add_test(cxx11_tensor_striding "-std=c++0x") # ei_add_test(cxx11_tensor_device "-std=c++0x") -# ei_add_test(cxx11_tensor_thread_pool "-std=c++0x") + ei_add_test(cxx11_tensor_thread_pool "-std=c++0x") endif() diff --git a/unsupported/test/cxx11_tensor_thread_pool.cpp b/unsupported/test/cxx11_tensor_thread_pool.cpp index 2e67b2064..e02d8e4be 100644 --- a/unsupported/test/cxx11_tensor_thread_pool.cpp +++ b/unsupported/test/cxx11_tensor_thread_pool.cpp @@ -17,9 +17,9 @@ using Eigen::Tensor; void test_cxx11_tensor_thread_pool() { - Eigen::Tensor<float, 3> in1(Eigen::array<ptrdiff_t, 3>(2,3,7)); - Eigen::Tensor<float, 3> in2(Eigen::array<ptrdiff_t, 3>(2,3,7)); - Eigen::Tensor<float, 3> out(Eigen::array<ptrdiff_t, 3>(2,3,7)); + Eigen::Tensor<float, 3> in1(2,3,7); + Eigen::Tensor<float, 3> in2(2,3,7); + Eigen::Tensor<float, 3> out(2,3,7); in1.setRandom(); in2.setRandom(); @@ -30,7 +30,7 @@ void test_cxx11_tensor_thread_pool() for (int i = 0; i < 2; ++i) { for (int j = 0; j < 3; ++j) { for (int k = 0; k < 7; ++k) { - VERIFY_IS_APPROX(out(Eigen::array<ptrdiff_t, 3>(i,j,k)), in1(Eigen::array<ptrdiff_t, 3>(i,j,k)) + in2(Eigen::array<ptrdiff_t, 3>(i,j,k)) * 3.14f); + VERIFY_IS_APPROX(out(i,j,k), in1(i,j,k) + in2(i,j,k) * 3.14f); } } } |