mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2024-12-21 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged in codeplaysoftware/eigen-upstream-pure/Fixing_visual_studio_error_For_tensor_trace (pull request PR-452)

Browse Source 
Fixing compilation error for cxx11_tensor_trace.cpp on Microsoft Visual Studio.
This commit is contained in:
Benoit Steiner 2018-08-02 17:54:26 +00:00
commit 113d8343d6
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
unsupported/test/cxx11_tensor_trace.cpp
View File

@ -37,7 +37,7 @@ static void test_all_dimensions_trace() {
VERIFY_IS_EQUAL(result1(), sum); VERIFY_IS_EQUAL(result1(), sum);
Tensor<float, 5, DataLayout> tensor2(7, 7, 7, 7, 7); Tensor<float, 5, DataLayout> tensor2(7, 7, 7, 7, 7);
array<ptrdiff_t, 5> dims({{2, 1, 0, 3, 4}}); array<ptrdiff_t, 5> dims = { { 2, 1, 0, 3, 4 } };
Tensor<float, 0, DataLayout> result2 = tensor2.trace(dims); Tensor<float, 0, DataLayout> result2 = tensor2.trace(dims);
VERIFY_IS_EQUAL(result2.rank(), 0); VERIFY_IS_EQUAL(result2.rank(), 0);
sum = 0.0f; sum = 0.0f;
@ -52,7 +52,7 @@ template <int DataLayout>
static void test_simple_trace() { static void test_simple_trace() {
Tensor<float, 3, DataLayout> tensor1(3, 5, 3); Tensor<float, 3, DataLayout> tensor1(3, 5, 3);
tensor1.setRandom(); tensor1.setRandom();
array<ptrdiff_t, 2> dims1({{0, 2}}); array<ptrdiff_t, 2> dims1 = { { 0, 2 } };
Tensor<float, 1, DataLayout> result1 = tensor1.trace(dims1); Tensor<float, 1, DataLayout> result1 = tensor1.trace(dims1);
VERIFY_IS_EQUAL(result1.rank(), 1); VERIFY_IS_EQUAL(result1.rank(), 1);
VERIFY_IS_EQUAL(result1.dimension(0), 5); VERIFY_IS_EQUAL(result1.dimension(0), 5);
@ -67,7 +67,7 @@ static void test_simple_trace() {
Tensor<float, 4, DataLayout> tensor2(5, 5, 7, 7); Tensor<float, 4, DataLayout> tensor2(5, 5, 7, 7);
tensor2.setRandom(); tensor2.setRandom();
array<ptrdiff_t, 2> dims2({{2, 3}}); array<ptrdiff_t, 2> dims2 = { { 2, 3 } };
Tensor<float, 2, DataLayout> result2 = tensor2.trace(dims2); Tensor<float, 2, DataLayout> result2 = tensor2.trace(dims2);
VERIFY_IS_EQUAL(result2.rank(), 2); VERIFY_IS_EQUAL(result2.rank(), 2);
VERIFY_IS_EQUAL(result2.dimension(0), 5); VERIFY_IS_EQUAL(result2.dimension(0), 5);
@ -82,7 +82,7 @@ static void test_simple_trace() {
} }
} }
array<ptrdiff_t, 2> dims3({{1, 0}}); array<ptrdiff_t, 2> dims3 = { { 1, 0 } };
Tensor<float, 2, DataLayout> result3 = tensor2.trace(dims3); Tensor<float, 2, DataLayout> result3 = tensor2.trace(dims3);
VERIFY_IS_EQUAL(result3.rank(), 2); VERIFY_IS_EQUAL(result3.rank(), 2);
VERIFY_IS_EQUAL(result3.dimension(0), 7); VERIFY_IS_EQUAL(result3.dimension(0), 7);
@ -99,7 +99,7 @@ static void test_simple_trace() {
Tensor<float, 5, DataLayout> tensor3(3, 7, 3, 7, 3); Tensor<float, 5, DataLayout> tensor3(3, 7, 3, 7, 3);
tensor3.setRandom(); tensor3.setRandom();
array<ptrdiff_t, 3> dims4({{0, 2, 4}}); array<ptrdiff_t, 3> dims4 = { { 0, 2, 4 } };
Tensor<float, 2, DataLayout> result4 = tensor3.trace(dims4); Tensor<float, 2, DataLayout> result4 = tensor3.trace(dims4);
VERIFY_IS_EQUAL(result4.rank(), 2); VERIFY_IS_EQUAL(result4.rank(), 2);
VERIFY_IS_EQUAL(result4.dimension(0), 7); VERIFY_IS_EQUAL(result4.dimension(0), 7);
@ -116,7 +116,7 @@ static void test_simple_trace() {
Tensor<float, 5, DataLayout> tensor4(3, 7, 4, 7, 5); Tensor<float, 5, DataLayout> tensor4(3, 7, 4, 7, 5);
tensor4.setRandom(); tensor4.setRandom();
array<ptrdiff_t, 2> dims5({{1, 3}}); array<ptrdiff_t, 2> dims5 = { { 1, 3 } };
Tensor<float, 3, DataLayout> result5 = tensor4.trace(dims5); Tensor<float, 3, DataLayout> result5 = tensor4.trace(dims5);
VERIFY_IS_EQUAL(result5.rank(), 3); VERIFY_IS_EQUAL(result5.rank(), 3);
VERIFY_IS_EQUAL(result5.dimension(0), 3); VERIFY_IS_EQUAL(result5.dimension(0), 3);
@ -140,7 +140,7 @@ template<int DataLayout>
static void test_trace_in_expr() { static void test_trace_in_expr() {
Tensor<float, 4, DataLayout> tensor(2, 3, 5, 3); Tensor<float, 4, DataLayout> tensor(2, 3, 5, 3);
tensor.setRandom(); tensor.setRandom();
array<ptrdiff_t, 2> dims({{1, 3}}); array<ptrdiff_t, 2> dims = { { 1, 3 } };
Tensor<float, 2, DataLayout> result(2, 5); Tensor<float, 2, DataLayout> result(2, 5);
result = result.constant(1.0f) - tensor.trace(dims); result = result.constant(1.0f) - tensor.trace(dims);
VERIFY_IS_EQUAL(result.rank(), 2); VERIFY_IS_EQUAL(result.rank(), 2);