From 9b7a6f0122f6817a3c12bc75803d4270cd9db507 Mon Sep 17 00:00:00 2001 From: Benoit Steiner Date: Thu, 10 Jul 2014 11:27:27 -0700 Subject: Added tests for tensor slicing --- unsupported/test/cxx11_tensor_morphing.cpp | 132 ++++++++++++++++++++++++++++- 1 file changed, 130 insertions(+), 2 deletions(-) (limited to 'unsupported/test/cxx11_tensor_morphing.cpp') diff --git a/unsupported/test/cxx11_tensor_morphing.cpp b/unsupported/test/cxx11_tensor_morphing.cpp index 21af9e0b5..fbfdaadb7 100644 --- a/unsupported/test/cxx11_tensor_morphing.cpp +++ b/unsupported/test/cxx11_tensor_morphing.cpp @@ -52,8 +52,7 @@ static void test_reshape_in_expr() { TensorMap> tensor2(m2.data(), 3,5,7,11,13); Tensor::Dimensions newDims1{{2,3*5*7*11}}; Tensor::Dimensions newDims2{{3*5*7*11,13}}; - typedef Tensor::DimensionPair DimPair; - array contract_along{{DimPair(1, 0)}}; + array::DimensionPair, 1> contract_along{{1, 0}}; Tensor tensor3(2,13); tensor3 = tensor1.reshape(newDims1).contract(tensor2.reshape(newDims2), contract_along); @@ -65,8 +64,137 @@ static void test_reshape_in_expr() { } } + +static void test_reshape_as_lvalue() +{ + Tensor tensor(2,3,7); + tensor.setRandom(); + + Tensor tensor2d(6,7); + Tensor::Dimensions dim{{2,3,7}}; + tensor2d.reshape(dim) = tensor; + + Tensor tensor5d(2,3,1,7,1); + tensor5d.reshape(dim).device(Eigen::DefaultDevice()) = tensor; + + for (int i = 0; i < 2; ++i) { + for (int j = 0; j < 3; ++j) { + for (int k = 0; k < 7; ++k) { + VERIFY_IS_EQUAL(tensor2d(i+2*j,k), tensor(i,j,k)); + VERIFY_IS_EQUAL(tensor5d(i,j,0,k,0), tensor(i,j,k)); + } + } + } +} + + +static void test_simple_slice() +{ + Tensor tensor(2,3,5,7,11); + tensor.setRandom(); + + Tensor slice1(1,1,1,1,1); + Eigen::DSizes indices(Eigen::array(1,2,3,4,5)); + Eigen::DSizes sizes(Eigen::array(1,1,1,1,1)); + slice1 = tensor.slice(indices, sizes); + VERIFY_IS_EQUAL(slice1(0,0,0,0,0), tensor(1,2,3,4,5)); + + Tensor slice2(1,1,2,2,3); + Eigen::DSizes indices2(Eigen::array(1,1,3,4,5)); + Eigen::DSizes sizes2(Eigen::array(1,1,2,2,3)); + slice2 = tensor.slice(indices2, sizes2); + for (int i = 0; i < 2; ++i) { + for (int j = 0; j < 2; ++j) { + for (int k = 0; k < 3; ++k) { + VERIFY_IS_EQUAL(slice2(0,0,i,j,k), tensor(1,1,3+i,4+j,5+k)); + } + } + } +} + + +static void test_slice_in_expr() { + MatrixXf m1(7,7); + MatrixXf m2(3,3); + m1.setRandom(); + m2.setRandom(); + + MatrixXf m3 = m1.block(1, 2, 3, 3) * m2.block(0, 2, 3, 1); + + TensorMap> tensor1(m1.data(), 7, 7); + TensorMap> tensor2(m2.data(), 3, 3); + Tensor tensor3(3,1); + array::DimensionPair, 1> contract_along{{1, 0}}; + + Eigen::DSizes indices1(Eigen::array(1,2)); + Eigen::DSizes sizes1(Eigen::array(3,3)); + Eigen::DSizes indices2(Eigen::array(0,2)); + Eigen::DSizes sizes2(Eigen::array(3,1)); + tensor3 = tensor1.slice(indices1, sizes1).contract(tensor2.slice(indices2, sizes2), contract_along); + + Map res(tensor3.data(), 3, 1); + for (int i = 0; i < 3; ++i) { + for (int j = 0; j < 1; ++j) { + VERIFY_IS_APPROX(res(i,j), m3(i,j)); + } + } +} + + +static void test_slice_as_lvalue() +{ + Tensor tensor1(2,2,7); + tensor1.setRandom(); + Tensor tensor2(2,2,7); + tensor2.setRandom(); + Tensor tensor3(4,3,5); + tensor3.setRandom(); + Tensor tensor4(4,3,2); + tensor4.setRandom(); + + Tensor result(4,5,7); + Eigen::DSizes sizes12(Eigen::array(2,2,7)); + Eigen::DSizes first_slice(Eigen::array(0,0,0)); + result.slice(first_slice, sizes12) = tensor1; + Eigen::DSizes second_slice(Eigen::array(2,0,0)); + result.slice(second_slice, sizes12).device(Eigen::DefaultDevice()) = tensor2; + + Eigen::DSizes sizes3(Eigen::array(4,3,5)); + Eigen::DSizes third_slice(Eigen::array(0,2,0)); + result.slice(third_slice, sizes3) = tensor3; + + Eigen::DSizes sizes4(Eigen::array(4,3,2)); + Eigen::DSizes fourth_slice(Eigen::array(0,2,5)); + result.slice(fourth_slice, sizes4) = tensor4; + + for (int j = 0; j < 2; ++j) { + for (int k = 0; k < 7; ++k) { + for (int i = 0; i < 2; ++i) { + VERIFY_IS_EQUAL(result(i,j,k), tensor1(i,j,k)); + VERIFY_IS_EQUAL(result(i+2,j,k), tensor2(i,j,k)); + } + } + } + for (int i = 0; i < 4; ++i) { + for (int j = 2; j < 5; ++j) { + for (int k = 0; k < 5; ++k) { + VERIFY_IS_EQUAL(result(i,j,k), tensor3(i,j-2,k)); + } + for (int k = 5; k < 7; ++k) { + VERIFY_IS_EQUAL(result(i,j,k), tensor4(i,j-2,k-5)); + } + } + } +} + + void test_cxx11_tensor_morphing() { CALL_SUBTEST(test_simple_reshape()); CALL_SUBTEST(test_reshape_in_expr()); + CALL_SUBTEST(test_reshape_as_lvalue()); + + CALL_SUBTEST(test_simple_slice()); + CALL_SUBTEST(test_slice_in_expr()); + CALL_SUBTEST(test_slice_as_lvalue()); } -- cgit v1.2.3