diff options
author | Mehdi Goli <mehdi.goli@codeplay.com> | 2018-08-02 14:30:48 +0100 |
---|---|---|
committer | Mehdi Goli <mehdi.goli@codeplay.com> | 2018-08-02 14:30:48 +0100 |
commit | 516d2621b96a0c41ff999781b8bbcaa527a7c6ee (patch) | |
tree | 4f0400993bceef60072831800189af764b61f654 /unsupported/test/cxx11_tensor_trace.cpp | |
parent | 62169419aba9048c6c66c71ce4910241e594cbe1 (diff) |
fixing compilation error for cxx11_tensor_trace.cpp error on Microsoft Visual Studio.
Diffstat (limited to 'unsupported/test/cxx11_tensor_trace.cpp')
-rw-r--r-- | unsupported/test/cxx11_tensor_trace.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/unsupported/test/cxx11_tensor_trace.cpp b/unsupported/test/cxx11_tensor_trace.cpp index 1579bc1eb..0cb23060e 100644 --- a/unsupported/test/cxx11_tensor_trace.cpp +++ b/unsupported/test/cxx11_tensor_trace.cpp @@ -37,7 +37,7 @@ static void test_all_dimensions_trace() { VERIFY_IS_EQUAL(result1(), sum); 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); VERIFY_IS_EQUAL(result2.rank(), 0); sum = 0.0f; @@ -52,7 +52,7 @@ template <int DataLayout> static void test_simple_trace() { Tensor<float, 3, DataLayout> tensor1(3, 5, 3); tensor1.setRandom(); - array<ptrdiff_t, 2> dims1({{0, 2}}); + array<ptrdiff_t, 2> dims1 = { { 0, 2 } }; Tensor<float, 1, DataLayout> result1 = tensor1.trace(dims1); VERIFY_IS_EQUAL(result1.rank(), 1); 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); tensor2.setRandom(); - array<ptrdiff_t, 2> dims2({{2, 3}}); + array<ptrdiff_t, 2> dims2 = { { 2, 3 } }; Tensor<float, 2, DataLayout> result2 = tensor2.trace(dims2); VERIFY_IS_EQUAL(result2.rank(), 2); 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); VERIFY_IS_EQUAL(result3.rank(), 2); 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); 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); VERIFY_IS_EQUAL(result4.rank(), 2); 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); tensor4.setRandom(); - array<ptrdiff_t, 2> dims5({{1, 3}}); + array<ptrdiff_t, 2> dims5 = { { 1, 3 } }; Tensor<float, 3, DataLayout> result5 = tensor4.trace(dims5); VERIFY_IS_EQUAL(result5.rank(), 3); VERIFY_IS_EQUAL(result5.dimension(0), 3); @@ -140,7 +140,7 @@ template<int DataLayout> static void test_trace_in_expr() { Tensor<float, 4, DataLayout> tensor(2, 3, 5, 3); tensor.setRandom(); - array<ptrdiff_t, 2> dims({{1, 3}}); + array<ptrdiff_t, 2> dims = { { 1, 3 } }; Tensor<float, 2, DataLayout> result(2, 5); result = result.constant(1.0f) - tensor.trace(dims); VERIFY_IS_EQUAL(result.rank(), 2); @@ -168,4 +168,4 @@ EIGEN_DECLARE_TEST(cxx11_tensor_trace) { CALL_SUBTEST(test_simple_trace<RowMajor>()); CALL_SUBTEST(test_trace_in_expr<ColMajor>()); CALL_SUBTEST(test_trace_in_expr<RowMajor>()); -} +}
\ No newline at end of file |