From 878845cb25c1ba9e56883fd0654eafb55a22fc34 Mon Sep 17 00:00:00 2001 From: Eugene Zhulenev Date: Fri, 28 Jun 2019 11:13:44 -0700 Subject: Add block access to TensorReverseOp and make sure that TensorForcedEval uses block access when preferred --- unsupported/test/cxx11_tensor_executor.cpp | 43 +++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) (limited to 'unsupported/test/cxx11_tensor_executor.cpp') diff --git a/unsupported/test/cxx11_tensor_executor.cpp b/unsupported/test/cxx11_tensor_executor.cpp index 162dab7b8..42f0a1bc3 100644 --- a/unsupported/test/cxx11_tensor_executor.cpp +++ b/unsupported/test/cxx11_tensor_executor.cpp @@ -527,6 +527,41 @@ static void test_execute_generator_op(Device d) } } +template +static void test_execute_reverse_rvalue(Device d) +{ + static constexpr int Options = 0 | Layout; + + auto dims = RandomDims(1, numext::pow(1000000.0, 1.0 / NumDims)); + Tensor src(dims); + src.setRandom(); + + // Reverse half of the dimensions. + Eigen::array reverse; + for (int i = 0; i < NumDims; ++i) reverse[i] = (dims[i] % 2 == 0); + + const auto expr = src.reverse(reverse); + + // We assume that reversing on a default device is tested and correct, so + // we can rely on it to verify correctness of tensor executor and tiling. + Tensor golden; + golden = expr; + + // Now do the reversing using configured tensor executor. + Tensor dst(golden.dimensions()); + + using Assign = TensorAssignOp; + using Executor = + internal::TensorExecutor; + + Executor::run(Assign(dst, expr), d); + + for (Index i = 0; i < dst.dimensions().TotalSize(); ++i) { + VERIFY_IS_EQUAL(dst.coeff(i), golden.coeff(i)); + } +} + #define CALL_SUBTEST_PART(PART) \ CALL_SUBTEST_##PART @@ -613,8 +648,14 @@ EIGEN_DECLARE_TEST(cxx11_tensor_executor) { CALL_SUBTEST_COMBINATIONS(13, test_execute_generator_op, float, 4); CALL_SUBTEST_COMBINATIONS(13, test_execute_generator_op, float, 5); + CALL_SUBTEST_COMBINATIONS(14, test_execute_reverse_rvalue, float, 1); + CALL_SUBTEST_COMBINATIONS(14, test_execute_reverse_rvalue, float, 2); + CALL_SUBTEST_COMBINATIONS(14, test_execute_reverse_rvalue, float, 3); + CALL_SUBTEST_COMBINATIONS(14, test_execute_reverse_rvalue, float, 4); + CALL_SUBTEST_COMBINATIONS(14, test_execute_reverse_rvalue, float, 5); + // Force CMake to split this test. - // EIGEN_SUFFIXES;1;2;3;4;5;6;7;8;9;10;11;12;13 + // EIGEN_SUFFIXES;1;2;3;4;5;6;7;8;9;10;11;12;13;14 } #undef CALL_SUBTEST_COMBINATIONS -- cgit v1.2.3