aboutsummaryrefslogtreecommitdiffhomepage
path: root/unsupported/test/cxx11_tensor_chipping.cpp
diff options
context:
space:
mode:
authorGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2015-04-16 12:15:27 -0700
committerGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2015-04-16 12:15:27 -0700
commitd19d09ae6a9186550c31cef65fc694fd9d60c3b9 (patch)
treef5b33457f26eeb803000fc5333935e660288a4fc /unsupported/test/cxx11_tensor_chipping.cpp
parent9d7843d0d0879a5c22741f19aaab7ad116bd352e (diff)
Updated a regression test to avoid compilation errors when compiling with gcc 4.7
Diffstat (limited to 'unsupported/test/cxx11_tensor_chipping.cpp')
-rw-r--r--unsupported/test/cxx11_tensor_chipping.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/unsupported/test/cxx11_tensor_chipping.cpp b/unsupported/test/cxx11_tensor_chipping.cpp
index bfc2bad18..1832dec8b 100644
--- a/unsupported/test/cxx11_tensor_chipping.cpp
+++ b/unsupported/test/cxx11_tensor_chipping.cpp
@@ -345,8 +345,8 @@ static void test_chip_raw_data_col_major()
Tensor<float, 5, ColMajor> tensor(2,3,5,7,11);
tensor.setRandom();
- typedef TensorEvaluator<decltype(tensor.template chip<4>(3)), DefaultDevice> Evaluator4;
- auto chip = Evaluator4(tensor.template chip<4>(3), DefaultDevice());
+ typedef TensorEvaluator<decltype(tensor.chip<4>(3)), DefaultDevice> Evaluator4;
+ auto chip = Evaluator4(tensor.chip<4>(3), DefaultDevice());
for (int i = 0; i < 2; ++i) {
for (int j = 0; j < 3; ++j) {
for (int k = 0; k < 5; ++k) {
@@ -358,20 +358,20 @@ static void test_chip_raw_data_col_major()
}
}
- typedef TensorEvaluator<decltype(tensor.template chip<0>(0)), DefaultDevice> Evaluator0;
- auto chip0 = Evaluator0(tensor.template chip<0>(0), DefaultDevice());
+ typedef TensorEvaluator<decltype(tensor.chip<0>(0)), DefaultDevice> Evaluator0;
+ auto chip0 = Evaluator0(tensor.chip<0>(0), DefaultDevice());
VERIFY_IS_EQUAL(chip0.data(), static_cast<float*>(0));
- typedef TensorEvaluator<decltype(tensor.template chip<1>(0)), DefaultDevice> Evaluator1;
- auto chip1 = Evaluator1(tensor.template chip<1>(0), DefaultDevice());
+ typedef TensorEvaluator<decltype(tensor.chip<1>(0)), DefaultDevice> Evaluator1;
+ auto chip1 = Evaluator1(tensor.chip<1>(0), DefaultDevice());
VERIFY_IS_EQUAL(chip1.data(), static_cast<float*>(0));
- typedef TensorEvaluator<decltype(tensor.template chip<2>(0)), DefaultDevice> Evaluator2;
- auto chip2 = Evaluator2(tensor.template chip<2>(0), DefaultDevice());
+ typedef TensorEvaluator<decltype(tensor.chip<2>(0)), DefaultDevice> Evaluator2;
+ auto chip2 = Evaluator2(tensor.chip<2>(0), DefaultDevice());
VERIFY_IS_EQUAL(chip2.data(), static_cast<float*>(0));
- typedef TensorEvaluator<decltype(tensor.template chip<3>(0)), DefaultDevice> Evaluator3;
- auto chip3 = Evaluator3(tensor.template chip<3>(0), DefaultDevice());
+ typedef TensorEvaluator<decltype(tensor.chip<3>(0)), DefaultDevice> Evaluator3;
+ auto chip3 = Evaluator3(tensor.chip<3>(0), DefaultDevice());
VERIFY_IS_EQUAL(chip3.data(), static_cast<float*>(0));
}
@@ -380,8 +380,8 @@ static void test_chip_raw_data_row_major()
Tensor<float, 5, RowMajor> tensor(11,7,5,3,2);
tensor.setRandom();
- typedef TensorEvaluator<decltype(tensor.template chip<0>(3)), DefaultDevice> Evaluator0;
- auto chip = Evaluator0(tensor.template chip<0>(3), DefaultDevice());
+ typedef TensorEvaluator<decltype(tensor.chip<0>(3)), DefaultDevice> Evaluator0;
+ auto chip = Evaluator0(tensor.chip<0>(3), DefaultDevice());
for (int i = 0; i < 7; ++i) {
for (int j = 0; j < 5; ++j) {
for (int k = 0; k < 3; ++k) {
@@ -393,20 +393,20 @@ static void test_chip_raw_data_row_major()
}
}
- typedef TensorEvaluator<decltype(tensor.template chip<1>(0)), DefaultDevice> Evaluator1;
- auto chip1 = Evaluator1(tensor.template chip<1>(0), DefaultDevice());
+ typedef TensorEvaluator<decltype(tensor.chip<1>(0)), DefaultDevice> Evaluator1;
+ auto chip1 = Evaluator1(tensor.chip<1>(0), DefaultDevice());
VERIFY_IS_EQUAL(chip1.data(), static_cast<float*>(0));
- typedef TensorEvaluator<decltype(tensor.template chip<2>(0)), DefaultDevice> Evaluator2;
- auto chip2 = Evaluator2(tensor.template chip<2>(0), DefaultDevice());
+ typedef TensorEvaluator<decltype(tensor.chip<2>(0)), DefaultDevice> Evaluator2;
+ auto chip2 = Evaluator2(tensor.chip<2>(0), DefaultDevice());
VERIFY_IS_EQUAL(chip2.data(), static_cast<float*>(0));
- typedef TensorEvaluator<decltype(tensor.template chip<3>(0)), DefaultDevice> Evaluator3;
- auto chip3 = Evaluator3(tensor.template chip<3>(0), DefaultDevice());
+ typedef TensorEvaluator<decltype(tensor.chip<3>(0)), DefaultDevice> Evaluator3;
+ auto chip3 = Evaluator3(tensor.chip<3>(0), DefaultDevice());
VERIFY_IS_EQUAL(chip3.data(), static_cast<float*>(0));
- typedef TensorEvaluator<decltype(tensor.template chip<4>(0)), DefaultDevice> Evaluator4;
- auto chip4 = Evaluator4(tensor.template chip<4>(0), DefaultDevice());
+ typedef TensorEvaluator<decltype(tensor.chip<4>(0)), DefaultDevice> Evaluator4;
+ auto chip4 = Evaluator4(tensor.chip<4>(0), DefaultDevice());
VERIFY_IS_EQUAL(chip4.data(), static_cast<float*>(0));
}