aboutsummaryrefslogtreecommitdiffhomepage
path: root/unsupported/test/cxx11_tensor_morphing.cpp
diff options
context:
space:
mode:
authorGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2015-02-28 01:49:09 -0800
committerGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2015-02-28 01:49:09 -0800
commit61409d9449b02d619ae251681a2f5d3b237d9164 (patch)
tree88d3f81e0fe814d22bffe289d7c2b8dd9df3f7b6 /unsupported/test/cxx11_tensor_morphing.cpp
parent1a7b84dc75807c45ad7e4126d067c8d7eeab296b (diff)
Silenced one more comilation warning
Diffstat (limited to 'unsupported/test/cxx11_tensor_morphing.cpp')
-rw-r--r--unsupported/test/cxx11_tensor_morphing.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/unsupported/test/cxx11_tensor_morphing.cpp b/unsupported/test/cxx11_tensor_morphing.cpp
index cf9fd4803..96364c101 100644
--- a/unsupported/test/cxx11_tensor_morphing.cpp
+++ b/unsupported/test/cxx11_tensor_morphing.cpp
@@ -22,11 +22,11 @@ static void test_simple_reshape()
Tensor<float, 2> tensor3(6,7);
Tensor<float, 2> tensor4(2,21);
- Tensor<float, 3>::Dimensions dim1{{2,3,7}};
+ Tensor<float, 3>::Dimensions dim1(2,3,7);
tensor2 = tensor1.reshape(dim1);
- Tensor<float, 2>::Dimensions dim2{{6,7}};
+ Tensor<float, 2>::Dimensions dim2(6,7);
tensor3 = tensor1.reshape(dim2);
- Tensor<float, 2>::Dimensions dim3{{2,21}};
+ Tensor<float, 2>::Dimensions dim3(2,21);
tensor4 = tensor1.reshape(dim1).reshape(dim3);
for (int i = 0; i < 2; ++i) {
@@ -50,8 +50,8 @@ static void test_reshape_in_expr() {
TensorMap<Tensor<float, 5>> tensor1(m1.data(), 2,3,5,7,11);
TensorMap<Tensor<float, 5>> tensor2(m2.data(), 3,5,7,11,13);
- Tensor<float, 2>::Dimensions newDims1{{2,3*5*7*11}};
- Tensor<float, 2>::Dimensions newDims2{{3*5*7*11,13}};
+ Tensor<float, 2>::Dimensions newDims1(2,3*5*7*11);
+ Tensor<float, 2>::Dimensions newDims2(3*5*7*11,13);
typedef Tensor<float, 1>::DimensionPair DimPair;
array<DimPair, 1> contract_along{{DimPair(1, 0)}};
Tensor<float, 2> tensor3(2,13);
@@ -72,7 +72,7 @@ static void test_reshape_as_lvalue()
tensor.setRandom();
Tensor<float, 2> tensor2d(6,7);
- Tensor<float, 3>::Dimensions dim{{2,3,7}};
+ Tensor<float, 3>::Dimensions dim(2,3,7);
tensor2d.reshape(dim) = tensor;
float scratch[2*3*1*7*1];
@@ -311,7 +311,7 @@ static void test_composition()
Eigen::Tensor<float, 2, DataLayout> matrix(7, 11);
matrix.setRandom();
- const DSizes<ptrdiff_t, 3> newDims{{1, 1, 11}};
+ const DSizes<ptrdiff_t, 3> newDims(1, 1, 11);
Eigen::Tensor<float, 3, DataLayout> tensor =
matrix.slice(DSizes<ptrdiff_t, 2>(2, 0), DSizes<ptrdiff_t, 2>(1, 11)).reshape(newDims);