From 33e174613987cfc6c83576dc0fe8086c7a5d1b1f Mon Sep 17 00:00:00 2001 From: Eugene Zhulenev Date: Wed, 9 Oct 2019 12:45:31 -0700 Subject: Block evaluation for TensorChipping + fixed bugs in TensorPadding and TensorSlicing --- unsupported/test/cxx11_tensor_executor.cpp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (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 efae81961..8fb4ba752 100644 --- a/unsupported/test/cxx11_tensor_executor.cpp +++ b/unsupported/test/cxx11_tensor_executor.cpp @@ -180,9 +180,8 @@ static void test_execute_chipping_lvalue(Device d) \ const auto offset = internal::random(0, dims[(CHIP_DIM)] - 1); \ \ - /* Generate random data to fill non-chipped dimensions*/ \ Tensor random(dims); \ - random.setRandom(); \ + random.setZero(); \ \ Tensor golden(dims); \ golden = random; \ @@ -716,13 +715,13 @@ EIGEN_DECLARE_TEST(cxx11_tensor_executor) { CALL_SUBTEST_COMBINATIONS_V2(3, test_execute_broadcasting, float, 4); CALL_SUBTEST_COMBINATIONS_V2(3, test_execute_broadcasting, float, 5); - CALL_SUBTEST_COMBINATIONS_V1(4, test_execute_chipping_rvalue, float, 3); - CALL_SUBTEST_COMBINATIONS_V1(4, test_execute_chipping_rvalue, float, 4); - CALL_SUBTEST_COMBINATIONS_V1(4, test_execute_chipping_rvalue, float, 5); + CALL_SUBTEST_COMBINATIONS_V2(4, test_execute_chipping_rvalue, float, 3); + CALL_SUBTEST_COMBINATIONS_V2(4, test_execute_chipping_rvalue, float, 4); + CALL_SUBTEST_COMBINATIONS_V2(4, test_execute_chipping_rvalue, float, 5); - CALL_SUBTEST_COMBINATIONS_V1(5, test_execute_chipping_lvalue, float, 3); - CALL_SUBTEST_COMBINATIONS_V1(5, test_execute_chipping_lvalue, float, 4); - CALL_SUBTEST_COMBINATIONS_V1(5, test_execute_chipping_lvalue, float, 5); + CALL_SUBTEST_COMBINATIONS_V2(5, test_execute_chipping_lvalue, float, 3); + CALL_SUBTEST_COMBINATIONS_V2(5, test_execute_chipping_lvalue, float, 4); + CALL_SUBTEST_COMBINATIONS_V2(5, test_execute_chipping_lvalue, float, 5); CALL_SUBTEST_COMBINATIONS_V1(6, test_execute_shuffle_rvalue, float, 3); CALL_SUBTEST_COMBINATIONS_V1(6, test_execute_shuffle_rvalue, float, 4); @@ -752,10 +751,10 @@ EIGEN_DECLARE_TEST(cxx11_tensor_executor) { CALL_SUBTEST_COMBINATIONS_V1(11, test_execute_slice_lvalue, float, 4); CALL_SUBTEST_COMBINATIONS_V1(11, test_execute_slice_lvalue, float, 5); - CALL_SUBTEST_COMBINATIONS_V1(12, test_execute_broadcasting_of_forced_eval, float, 2); - CALL_SUBTEST_COMBINATIONS_V1(12, test_execute_broadcasting_of_forced_eval, float, 3); - CALL_SUBTEST_COMBINATIONS_V1(12, test_execute_broadcasting_of_forced_eval, float, 4); - CALL_SUBTEST_COMBINATIONS_V1(12, test_execute_broadcasting_of_forced_eval, float, 5); + CALL_SUBTEST_COMBINATIONS_V2(12, test_execute_broadcasting_of_forced_eval, float, 2); + CALL_SUBTEST_COMBINATIONS_V2(12, test_execute_broadcasting_of_forced_eval, float, 3); + CALL_SUBTEST_COMBINATIONS_V2(12, test_execute_broadcasting_of_forced_eval, float, 4); + CALL_SUBTEST_COMBINATIONS_V2(12, test_execute_broadcasting_of_forced_eval, float, 5); CALL_SUBTEST_COMBINATIONS_V1(13, test_execute_generator_op, float, 2); CALL_SUBTEST_COMBINATIONS_V1(13, test_execute_generator_op, float, 3); -- cgit v1.2.3