diff options
| author |  Eugene Zhulenev <ezhulenev@google.com> | 2019-10-02 12:44:06 -0700 |
|---|---|---|
| committer | Eugene Zhulenev <ezhulenev@google.com> | 2019-10-02 12:44:06 -0700 |
| commit | 60ae24ee1a6c16114de456d77fcfba6f5a1160ca (patch) | |
| tree | 7b9d5463018055571a5050ca31a8d3df12a3e6fc /unsupported/test/cxx11_tensor_executor.cpp | |
| parent | 6e40454a6e6cc57c07c7340148657c985ca6c928 (diff) | |
Add block evaluation to TensorReshaping/TensorCasting/TensorPadding/TensorSelect
Diffstat (limited to 'unsupported/test/cxx11_tensor_executor.cpp')
| -rw-r--r-- | unsupported/test/cxx11_tensor_executor.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/unsupported/test/cxx11_tensor_executor.cpp b/unsupported/test/cxx11_tensor_executor.cpp index c233fe30f..9094b6507 100644 --- a/unsupported/test/cxx11_tensor_executor.cpp +++ b/unsupported/test/cxx11_tensor_executor.cpp @@ -582,11 +582,10 @@ static void test_async_execute_unary_expr(Device d) Eigen::Barrier done(1); auto on_done = [&done]() { done.Notify(); }; - static const bool TilingOn = Tiling == TiledEvaluation::Off ? false : true; using Assign = TensorAssignOp<decltype(dst), const decltype(expr)>; using DoneCallback = decltype(on_done); using Executor = internal::TensorAsyncExecutor<const Assign, Device, DoneCallback, - Vectorizable, TilingOn>; + Vectorizable, Tiling>; Executor::runAsync(Assign(dst, expr), d, on_done); done.Wait(); @@ -619,11 +618,10 @@ static void test_async_execute_binary_expr(Device d) Eigen::Barrier done(1); auto on_done = [&done]() { done.Notify(); }; - static const bool TilingOn = Tiling == TiledEvaluation::Off ? false : true; using Assign = TensorAssignOp<decltype(dst), const decltype(expr)>; using DoneCallback = decltype(on_done); using Executor = internal::TensorAsyncExecutor<const Assign, Device, DoneCallback, - Vectorizable, TilingOn>; + Vectorizable, Tiling>; Executor::runAsync(Assign(dst, expr), d, on_done); done.Wait(); @@ -737,10 +735,10 @@ EIGEN_DECLARE_TEST(cxx11_tensor_executor) { CALL_SUBTEST_COMBINATIONS_V1(8, test_execute_reduction, float, 4); CALL_SUBTEST_COMBINATIONS_V1(8, test_execute_reduction, float, 5); - CALL_SUBTEST_COMBINATIONS_V1(9, test_execute_reshape, float, 2); - CALL_SUBTEST_COMBINATIONS_V1(9, test_execute_reshape, float, 3); - CALL_SUBTEST_COMBINATIONS_V1(9, test_execute_reshape, float, 4); - CALL_SUBTEST_COMBINATIONS_V1(9, test_execute_reshape, float, 5); + CALL_SUBTEST_COMBINATIONS_V2(9, test_execute_reshape, float, 2); + CALL_SUBTEST_COMBINATIONS_V2(9, test_execute_reshape, float, 3); + CALL_SUBTEST_COMBINATIONS_V2(9, test_execute_reshape, float, 4); + CALL_SUBTEST_COMBINATIONS_V2(9, test_execute_reshape, float, 5); CALL_SUBTEST_COMBINATIONS_V1(10, test_execute_slice_rvalue, float, 2); CALL_SUBTEST_COMBINATIONS_V1(10, test_execute_slice_rvalue, float, 3); @@ -779,4 +777,3 @@ EIGEN_DECLARE_TEST(cxx11_tensor_executor) { // Force CMake to split this test. // EIGEN_SUFFIXES;1;2;3;4;5;6;7;8;9;10;11;12;13;14;15;16 } - |