GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-04-24 02:29:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated the cxx11_tensor_convolution test to avoid using cxx11 features. This should enable the test to compile with gcc 4.7 and older

Browse Source
This commit is contained in:
Benoit Steiner 2015-04-16 12:29:16 -07:00
parent d19d09ae6a
commit da5b98a94d
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
unsupported/test/cxx11_tensor_convolution.cpp
View File

@ -51,7 +51,9 @@ static void test_expr()
kernel.setRandom(); kernel.setRandom();
Tensor<float, 2, DataLayout> result(2,2); Tensor<float, 2, DataLayout> result(2,2);
Eigen::array<ptrdiff_t, 2> dims({0, 1}); Eigen::array<ptrdiff_t, 2> dims;
dims[0] = 0;
dims[1] = 1;
result = input.convolve(kernel, dims); result = input.convolve(kernel, dims);
VERIFY_IS_APPROX(result(0,0), input(0,0)*kernel(0,0) + input(0,1)*kernel(0,1) + VERIFY_IS_APPROX(result(0,0), input(0,0)*kernel(0,0) + input(0,1)*kernel(0,1) +
@ -75,7 +77,8 @@ static void test_modes() {
kernel(1) = 1.0f; kernel(1) = 1.0f;
kernel(2) = 0.0f; kernel(2) = 0.0f;
const Eigen::array<ptrdiff_t, 1> dims({0}); Eigen::array<ptrdiff_t, 1> dims;
dims[0] = 0;
Eigen::array<std::pair<ptrdiff_t, ptrdiff_t>, 1> padding; Eigen::array<std::pair<ptrdiff_t, ptrdiff_t>, 1> padding;
// Emulate VALID mode (as defined in // Emulate VALID mode (as defined in
@ -116,9 +119,12 @@ static void test_strides() {
input.setRandom(); input.setRandom();
kernel.setRandom(); kernel.setRandom();
const Eigen::array<ptrdiff_t, 1> dims({0}); Eigen::array<ptrdiff_t, 1> dims;
const Eigen::array<ptrdiff_t, 1> stride_of_3({3}); dims[0] = 0;
const Eigen::array<ptrdiff_t, 1> stride_of_2({2}); Eigen::array<ptrdiff_t, 1> stride_of_3;
stride_of_3[0] = 3;
Eigen::array<ptrdiff_t, 1> stride_of_2;
stride_of_2[0] = 2;
Tensor<float, 1, DataLayout> result; Tensor<float, 1, DataLayout> result;
result = input.stride(stride_of_3).convolve(kernel, dims).stride(stride_of_2); result = input.stride(stride_of_3).convolve(kernel, dims).stride(stride_of_2);