GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-11 19:29: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)

6
unsupported/test/cxx11_tensor_fixed_size.cpp
View File

@ -130,9 +130,9 @@ static void test_tensor_map()
static void test_2d() static void test_2d()
{ {
float data1[6]; float data1[6];
TensorMap<TensorFixedSize<float, Sizes<2, 3> >> mat1(data1,2,3); TensorMap<TensorFixedSize<float, Sizes<2, 3> > > mat1(data1,2,3);
float data2[6]; float data2[6];
TensorMap<TensorFixedSize<float, Sizes<2, 3>, RowMajor>> mat2(data2,2,3); TensorMap<TensorFixedSize<float, Sizes<2, 3>, RowMajor> > mat2(data2,2,3);
VERIFY_IS_EQUAL((mat1.size()), 2*3); VERIFY_IS_EQUAL((mat1.size()), 2*3);
VERIFY_IS_EQUAL(mat1.rank(), 2); VERIFY_IS_EQUAL(mat1.rank(), 2);
@ -153,7 +153,7 @@ static void test_2d()
mat2(1,1) = -4.0; mat2(1,1) = -4.0;
mat2(1,2) = -5.0; mat2(1,2) = -5.0;
TensorFixedSize<float, Sizes<2, 3>> mat3; TensorFixedSize<float, Sizes<2, 3> > mat3;
TensorFixedSize<float, Sizes<2, 3>, RowMajor> mat4; TensorFixedSize<float, Sizes<2, 3>, RowMajor> mat4;
mat3 = mat1.abs(); mat3 = mat1.abs();
mat4 = mat2.abs(); mat4 = mat2.abs();

36
unsupported/test/cxx11_tensor_map.cpp
View File

@ -19,8 +19,8 @@ static void test_0d()
Tensor<int, 0> scalar1; Tensor<int, 0> scalar1;
Tensor<int, 0, RowMajor> scalar2; Tensor<int, 0, RowMajor> scalar2;
TensorMap<Tensor<const int, 0>> scalar3(scalar1.data()); TensorMap<Tensor<const int, 0> > scalar3(scalar1.data());
TensorMap<Tensor<const int, 0, RowMajor>> scalar4(scalar2.data()); TensorMap<Tensor<const int, 0, RowMajor> > scalar4(scalar2.data());
scalar1() = 7; scalar1() = 7;
scalar2() = 13; scalar2() = 13;
@ -37,8 +37,8 @@ static void test_1d()
Tensor<int, 1> vec1(6); Tensor<int, 1> vec1(6);
Tensor<int, 1, RowMajor> vec2(6); Tensor<int, 1, RowMajor> vec2(6);
TensorMap<Tensor<const int, 1>> vec3(vec1.data(), 6); TensorMap<Tensor<const int, 1> > vec3(vec1.data(), 6);
TensorMap<Tensor<const int, 1, RowMajor>> vec4(vec2.data(), 6); TensorMap<Tensor<const int, 1, RowMajor> > vec4(vec2.data(), 6);
vec1(0) = 4; vec2(0) = 0; vec1(0) = 4; vec2(0) = 0;
vec1(1) = 8; vec2(1) = 1; vec1(1) = 8; vec2(1) = 1;
@ -85,8 +85,8 @@ static void test_2d()
mat2(1,1) = 4; mat2(1,1) = 4;
mat2(1,2) = 5; mat2(1,2) = 5;
TensorMap<Tensor<const int, 2>> mat3(mat1.data(), 2, 3); TensorMap<Tensor<const int, 2> > mat3(mat1.data(), 2, 3);
TensorMap<Tensor<const int, 2, RowMajor>> mat4(mat2.data(), 2, 3); TensorMap<Tensor<const int, 2, RowMajor> > mat4(mat2.data(), 2, 3);
VERIFY_IS_EQUAL(mat3.rank(), 2); VERIFY_IS_EQUAL(mat3.rank(), 2);
VERIFY_IS_EQUAL(mat3.size(), 6); VERIFY_IS_EQUAL(mat3.size(), 6);
@ -129,8 +129,8 @@ 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);
@ -173,8 +173,8 @@ static void test_from_tensor()
} }
} }
TensorMap<Tensor<int, 3>> mat3(mat1); TensorMap<Tensor<int, 3> > mat3(mat1);
TensorMap<Tensor<int, 3, RowMajor>> mat4(mat2); TensorMap<Tensor<int, 3, RowMajor> > mat4(mat2);
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);
@ -199,19 +199,23 @@ static void test_from_tensor()
} }
} }
TensorFixedSize<int, Sizes<2,3,7>> mat5; TensorFixedSize<int, Sizes<2,3,7> > mat5;
val = 0; val = 0;
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++;
} }
} }
} }
TensorMap<TensorFixedSize<int, Sizes<2,3,7>>> mat6(mat5); TensorMap<TensorFixedSize<int, Sizes<2,3,7> > > mat6(mat5);
VERIFY_IS_EQUAL(mat6.rank(), 3); VERIFY_IS_EQUAL(mat6.rank(), 3);
VERIFY_IS_EQUAL(mat6.size(), 2*3*7); VERIFY_IS_EQUAL(mat6.size(), 2*3*7);
@ -233,8 +237,8 @@ static void test_from_tensor()
static int f(const TensorMap<Tensor<int, 3> >& tensor) { static int f(const TensorMap<Tensor<int, 3> >& tensor) {
// Size<0> empty; // Size<0> empty;
EIGEN_STATIC_ASSERT((internal::array_size<Sizes<>>::value == 0), YOU_MADE_A_PROGRAMMING_MISTAKE); EIGEN_STATIC_ASSERT((internal::array_size<Sizes<> >::value == 0), YOU_MADE_A_PROGRAMMING_MISTAKE);
EIGEN_STATIC_ASSERT((internal::array_size<DSizes<int, 0>>::value == 0), YOU_MADE_A_PROGRAMMING_MISTAKE); EIGEN_STATIC_ASSERT((internal::array_size<DSizes<int, 0> >::value == 0), YOU_MADE_A_PROGRAMMING_MISTAKE);
Tensor<int, 0> result = tensor.sum(); Tensor<int, 0> result = tensor.sum();
return result(); return result();
} }
@ -253,7 +257,7 @@ static void test_casting()
} }
} }
TensorMap<Tensor<int, 3>> map(tensor); TensorMap<Tensor<int, 3> > map(tensor);
int sum1 = f(map); int sum1 = f(map);
int sum2 = f(tensor); int sum2 = f(tensor);

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);