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

Made several tensor tests compatible with cxx03

Browse Source
This commit is contained in:
Benoit Steiner 2016-04-29 17:22:37 -07:00
parent c0882ef4d9
commit d14105f158
4 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
unsupported/test/CMakeLists.txt
View File

@ -114,6 +114,9 @@ ei_add_test(kronecker_product)
# the tests depended on c++11. This isn't the case anymore so we ought to rename them. # the tests depended on c++11. This isn't the case anymore so we ought to rename them.
ei_add_test(cxx11_float16) ei_add_test(cxx11_float16)
ei_add_test(cxx11_tensor_dimension) ei_add_test(cxx11_tensor_dimension)
ei_add_test(cxx11_tensor_map)
ei_add_test(cxx11_tensor_assign)
ei_add_test(cxx11_tensor_comparisons)
ei_add_test(cxx11_tensor_forced_eval) ei_add_test(cxx11_tensor_forced_eval)
ei_add_test(cxx11_tensor_math) ei_add_test(cxx11_tensor_math)
ei_add_test(cxx11_tensor_const) ei_add_test(cxx11_tensor_const)
@ -139,10 +142,8 @@ if(EIGEN_TEST_CXX11)
ei_add_test(cxx11_meta) ei_add_test(cxx11_meta)
ei_add_test(cxx11_tensor_simple) ei_add_test(cxx11_tensor_simple)
# ei_add_test(cxx11_tensor_symmetry) # ei_add_test(cxx11_tensor_symmetry)
ei_add_test(cxx11_tensor_assign)
ei_add_test(cxx11_tensor_index_list) ei_add_test(cxx11_tensor_index_list)
ei_add_test(cxx11_tensor_mixed_indices) ei_add_test(cxx11_tensor_mixed_indices)
ei_add_test(cxx11_tensor_comparisons)
ei_add_test(cxx11_tensor_contraction) ei_add_test(cxx11_tensor_contraction)
ei_add_test(cxx11_tensor_convolution) ei_add_test(cxx11_tensor_convolution)
ei_add_test(cxx11_tensor_expr) ei_add_test(cxx11_tensor_expr)
@ -151,7 +152,6 @@ if(EIGEN_TEST_CXX11)
ei_add_test(cxx11_tensor_of_complex) ei_add_test(cxx11_tensor_of_complex)
ei_add_test(cxx11_tensor_of_strings) ei_add_test(cxx11_tensor_of_strings)
ei_add_test(cxx11_tensor_lvalue) ei_add_test(cxx11_tensor_lvalue)
ei_add_test(cxx11_tensor_map)
ei_add_test(cxx11_tensor_broadcasting) ei_add_test(cxx11_tensor_broadcasting)
ei_add_test(cxx11_tensor_chipping) ei_add_test(cxx11_tensor_chipping)
ei_add_test(cxx11_tensor_concatenation) ei_add_test(cxx11_tensor_concatenation)

8
unsupported/test/cxx11_tensor_map.cpp
View File

@ -130,7 +130,7 @@ static void test_3d()
} }
TensorMap<Tensor<const int, 3> > mat3(mat1.data(), 2, 3, 7); TensorMap<Tensor<const int, 3> > mat3(mat1.data(), 2, 3, 7);
TensorMap<Tensor<const int, 3, RowMajor>> mat4(mat2.data(), array<DenseIndex, 3>{{2, 3, 7}}); TensorMap<Tensor<const int, 3, RowMajor> > mat4(mat2.data(), 2, 3, 7);
VERIFY_IS_EQUAL(mat3.rank(), 3); VERIFY_IS_EQUAL(mat3.rank(), 3);
VERIFY_IS_EQUAL(mat3.size(), 2*3*7); VERIFY_IS_EQUAL(mat3.size(), 2*3*7);
@ -205,7 +205,11 @@ static void test_from_tensor()
for (int i = 0; i < 2; ++i) { for (int i = 0; i < 2; ++i) {
for (int j = 0; j < 3; ++j) { for (int j = 0; j < 3; ++j) {
for (int k = 0; k < 7; ++k) { for (int k = 0; k < 7; ++k) {
mat5(i,j,k) = val; array<ptrdiff_t, 3> coords;
coords[0] = i;
coords[1] = j;
coords[2] = k;
mat5(coords) = val;
val++; val++;
} }
} }

5
unsupported/test/cxx11_tensor_simple.cpp
View File

@ -195,7 +195,10 @@ static void test_3d()
VERIFY_IS_EQUAL((epsilon(0,2,1)), -1); VERIFY_IS_EQUAL((epsilon(0,2,1)), -1);
VERIFY_IS_EQUAL((epsilon(1,0,2)), -1); VERIFY_IS_EQUAL((epsilon(1,0,2)), -1);
array<Eigen::DenseIndex, 3> dims{{2,3,4}}; array<Eigen::DenseIndex, 3> dims;
dims[0] = 2;
dims[1] = 3;
dims[2] = 4;
Tensor<int, 3> t1(dims); Tensor<int, 3> t1(dims);
Tensor<int, 3, RowMajor> t2(dims); Tensor<int, 3, RowMajor> t2(dims);