From 1cfd51908ce8fd446e2c6daf329a2e7cec29c1bb Mon Sep 17 00:00:00 2001 From: Benoit Steiner Date: Wed, 25 Feb 2015 13:29:12 -0800 Subject: Added support for RowMajor layout to the tensor patch extraction cofde. --- unsupported/test/cxx11_tensor_patch.cpp | 114 +++++++++++++++++++++++--------- 1 file changed, 83 insertions(+), 31 deletions(-) (limited to 'unsupported/test/cxx11_tensor_patch.cpp') diff --git a/unsupported/test/cxx11_tensor_patch.cpp b/unsupported/test/cxx11_tensor_patch.cpp index 0ee7b46d4..434359730 100644 --- a/unsupported/test/cxx11_tensor_patch.cpp +++ b/unsupported/test/cxx11_tensor_patch.cpp @@ -13,24 +13,34 @@ using Eigen::Tensor; +template static void test_simple_patch() { - Tensor tensor(2,3,5,7); + Tensor tensor(2,3,5,7); tensor.setRandom(); array patch_dims; + patch_dims[0] = 1; patch_dims[1] = 1; patch_dims[2] = 1; patch_dims[3] = 1; - Tensor no_patch; + Tensor no_patch; no_patch = tensor.extract_patches(patch_dims); - VERIFY_IS_EQUAL(no_patch.dimension(0), 1); - VERIFY_IS_EQUAL(no_patch.dimension(1), 1); - VERIFY_IS_EQUAL(no_patch.dimension(2), 1); - VERIFY_IS_EQUAL(no_patch.dimension(3), 1); - VERIFY_IS_EQUAL(no_patch.dimension(4), tensor.size()); + if (DataLayout == ColMajor) { + VERIFY_IS_EQUAL(no_patch.dimension(0), 1); + VERIFY_IS_EQUAL(no_patch.dimension(1), 1); + VERIFY_IS_EQUAL(no_patch.dimension(2), 1); + VERIFY_IS_EQUAL(no_patch.dimension(3), 1); + VERIFY_IS_EQUAL(no_patch.dimension(4), tensor.size()); + } else { + VERIFY_IS_EQUAL(no_patch.dimension(0), tensor.size()); + VERIFY_IS_EQUAL(no_patch.dimension(1), 1); + VERIFY_IS_EQUAL(no_patch.dimension(2), 1); + VERIFY_IS_EQUAL(no_patch.dimension(3), 1); + VERIFY_IS_EQUAL(no_patch.dimension(4), 1); + } for (int i = 0; i < tensor.size(); ++i) { VERIFY_IS_EQUAL(tensor.data()[i], no_patch.data()[i]); @@ -40,14 +50,22 @@ static void test_simple_patch() patch_dims[1] = 3; patch_dims[2] = 5; patch_dims[3] = 7; - Tensor single_patch; + Tensor single_patch; single_patch = tensor.extract_patches(patch_dims); - VERIFY_IS_EQUAL(single_patch.dimension(0), 2); - VERIFY_IS_EQUAL(single_patch.dimension(1), 3); - VERIFY_IS_EQUAL(single_patch.dimension(2), 5); - VERIFY_IS_EQUAL(single_patch.dimension(3), 7); - VERIFY_IS_EQUAL(single_patch.dimension(4), 1); + if (DataLayout == ColMajor) { + VERIFY_IS_EQUAL(single_patch.dimension(0), 2); + VERIFY_IS_EQUAL(single_patch.dimension(1), 3); + VERIFY_IS_EQUAL(single_patch.dimension(2), 5); + VERIFY_IS_EQUAL(single_patch.dimension(3), 7); + VERIFY_IS_EQUAL(single_patch.dimension(4), 1); + } else { + VERIFY_IS_EQUAL(single_patch.dimension(0), 1); + VERIFY_IS_EQUAL(single_patch.dimension(1), 2); + VERIFY_IS_EQUAL(single_patch.dimension(2), 3); + VERIFY_IS_EQUAL(single_patch.dimension(3), 5); + VERIFY_IS_EQUAL(single_patch.dimension(4), 7); + } for (int i = 0; i < tensor.size(); ++i) { VERIFY_IS_EQUAL(tensor.data()[i], single_patch.data()[i]); @@ -57,23 +75,40 @@ static void test_simple_patch() patch_dims[1] = 2; patch_dims[2] = 2; patch_dims[3] = 1; - Tensor twod_patch; + Tensor twod_patch; twod_patch = tensor.extract_patches(patch_dims); - VERIFY_IS_EQUAL(twod_patch.dimension(0), 1); - VERIFY_IS_EQUAL(twod_patch.dimension(1), 2); - VERIFY_IS_EQUAL(twod_patch.dimension(2), 2); - VERIFY_IS_EQUAL(twod_patch.dimension(3), 1); - VERIFY_IS_EQUAL(twod_patch.dimension(4), 2*2*4*7); + if (DataLayout == ColMajor) { + VERIFY_IS_EQUAL(twod_patch.dimension(0), 1); + VERIFY_IS_EQUAL(twod_patch.dimension(1), 2); + VERIFY_IS_EQUAL(twod_patch.dimension(2), 2); + VERIFY_IS_EQUAL(twod_patch.dimension(3), 1); + VERIFY_IS_EQUAL(twod_patch.dimension(4), 2*2*4*7); + } else { + VERIFY_IS_EQUAL(twod_patch.dimension(0), 2*2*4*7); + VERIFY_IS_EQUAL(twod_patch.dimension(1), 1); + VERIFY_IS_EQUAL(twod_patch.dimension(2), 2); + VERIFY_IS_EQUAL(twod_patch.dimension(3), 2); + VERIFY_IS_EQUAL(twod_patch.dimension(4), 1); + } for (int i = 0; i < 2; ++i) { for (int j = 0; j < 2; ++j) { for (int k = 0; k < 4; ++k) { for (int l = 0; l < 7; ++l) { - int patch_loc = i + 2 * (j + 2 * (k + 4 * l)); + int patch_loc; + if (DataLayout == ColMajor) { + patch_loc = i + 2 * (j + 2 * (k + 4 * l)); + } else { + patch_loc = l + 7 * (k + 4 * (j + 2 * i)); + } for (int x = 0; x < 2; ++x) { for (int y = 0; y < 2; ++y) { - VERIFY_IS_EQUAL(tensor(i,j+x,k+y,l), twod_patch(0,x,y,0,patch_loc)); + if (DataLayout == ColMajor) { + VERIFY_IS_EQUAL(tensor(i,j+x,k+y,l), twod_patch(0,x,y,0,patch_loc)); + } else { + VERIFY_IS_EQUAL(tensor(i,j+x,k+y,l), twod_patch(patch_loc,0,x,y,0)); + } } } } @@ -85,24 +120,41 @@ static void test_simple_patch() patch_dims[1] = 2; patch_dims[2] = 3; patch_dims[3] = 5; - Tensor threed_patch; + Tensor threed_patch; threed_patch = tensor.extract_patches(patch_dims); - VERIFY_IS_EQUAL(threed_patch.dimension(0), 1); - VERIFY_IS_EQUAL(threed_patch.dimension(1), 2); - VERIFY_IS_EQUAL(threed_patch.dimension(2), 3); - VERIFY_IS_EQUAL(threed_patch.dimension(3), 5); - VERIFY_IS_EQUAL(threed_patch.dimension(4), 2*2*3*3); + if (DataLayout == ColMajor) { + VERIFY_IS_EQUAL(threed_patch.dimension(0), 1); + VERIFY_IS_EQUAL(threed_patch.dimension(1), 2); + VERIFY_IS_EQUAL(threed_patch.dimension(2), 3); + VERIFY_IS_EQUAL(threed_patch.dimension(3), 5); + VERIFY_IS_EQUAL(threed_patch.dimension(4), 2*2*3*3); + } else { + VERIFY_IS_EQUAL(threed_patch.dimension(0), 2*2*3*3); + VERIFY_IS_EQUAL(threed_patch.dimension(1), 1); + VERIFY_IS_EQUAL(threed_patch.dimension(2), 2); + VERIFY_IS_EQUAL(threed_patch.dimension(3), 3); + VERIFY_IS_EQUAL(threed_patch.dimension(4), 5); + } for (int i = 0; i < 2; ++i) { for (int j = 0; j < 2; ++j) { for (int k = 0; k < 3; ++k) { for (int l = 0; l < 3; ++l) { - int patch_loc = i + 2 * (j + 2 * (k + 3 * l)); + int patch_loc; + if (DataLayout == ColMajor) { + patch_loc = i + 2 * (j + 2 * (k + 3 * l)); + } else { + patch_loc = l + 3 * (k + 3 * (j + 2 * i)); + } for (int x = 0; x < 2; ++x) { for (int y = 0; y < 3; ++y) { for (int z = 0; z < 5; ++z) { - VERIFY_IS_EQUAL(tensor(i,j+x,k+y,l+z), threed_patch(0,x,y,z,patch_loc)); + if (DataLayout == ColMajor) { + VERIFY_IS_EQUAL(tensor(i,j+x,k+y,l+z), threed_patch(0,x,y,z,patch_loc)); + } else { + VERIFY_IS_EQUAL(tensor(i,j+x,k+y,l+z), threed_patch(patch_loc,0,x,y,z)); + } } } } @@ -112,9 +164,9 @@ static void test_simple_patch() } } - void test_cxx11_tensor_patch() { - CALL_SUBTEST(test_simple_patch()); + CALL_SUBTEST(test_simple_patch()); + CALL_SUBTEST(test_simple_patch()); // CALL_SUBTEST(test_expr_shuffling()); } -- cgit v1.2.3