aboutsummaryrefslogtreecommitdiffhomepage
path: root/unsupported/test/cxx11_tensor_morphing.cpp
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2016-07-11 11:46:55 +0200
committerGravatar Gael Guennebaud <g.gael@free.fr>2016-07-11 11:46:55 +0200
commit131ee4bb8ea1d4a6c5f876efc93a84d82320e7ba (patch)
treefa085a70072b7e2a028757a060062d1fcc02d20b /unsupported/test/cxx11_tensor_morphing.cpp
parent194daa30485a4f3a39a4f81a8c8d11372f32a00f (diff)
Split test_slice_in_expr which seems to be huge for visual
Diffstat (limited to 'unsupported/test/cxx11_tensor_morphing.cpp')
-rw-r--r--unsupported/test/cxx11_tensor_morphing.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/unsupported/test/cxx11_tensor_morphing.cpp b/unsupported/test/cxx11_tensor_morphing.cpp
index 233d69493..f7de43110 100644
--- a/unsupported/test/cxx11_tensor_morphing.cpp
+++ b/unsupported/test/cxx11_tensor_morphing.cpp
@@ -13,7 +13,7 @@
using Eigen::Tensor;
-template<typename=void>
+template<typename>
static void test_simple_reshape()
{
Tensor<float, 5> tensor1(2,3,1,7,1);
@@ -41,7 +41,7 @@ static void test_simple_reshape()
}
}
-template<typename=void>
+template<typename>
static void test_reshape_in_expr() {
MatrixXf m1(2,3*5*7*11);
MatrixXf m2(3*5*7*11,13);
@@ -66,7 +66,7 @@ static void test_reshape_in_expr() {
}
}
-template<typename=void>
+template<typename>
static void test_reshape_as_lvalue()
{
Tensor<float, 3> tensor(2,3,7);
@@ -461,25 +461,25 @@ static void test_composition()
void test_cxx11_tensor_morphing()
{
- CALL_SUBTEST_1(test_simple_reshape());
- CALL_SUBTEST_1(test_reshape_in_expr());
- CALL_SUBTEST_1(test_reshape_as_lvalue());
+ CALL_SUBTEST_1(test_simple_reshape<void>());
+ CALL_SUBTEST_1(test_reshape_in_expr<void>());
+ CALL_SUBTEST_1(test_reshape_as_lvalue<void>());
CALL_SUBTEST_1(test_simple_slice<ColMajor>());
CALL_SUBTEST_1(test_simple_slice<RowMajor>());
CALL_SUBTEST_1(test_const_slice());
CALL_SUBTEST_2(test_slice_in_expr<ColMajor>());
- CALL_SUBTEST_2(test_slice_in_expr<RowMajor>());
- CALL_SUBTEST_3(test_slice_as_lvalue<ColMajor>());
- CALL_SUBTEST_3(test_slice_as_lvalue<RowMajor>());
- CALL_SUBTEST_4(test_slice_raw_data<ColMajor>());
- CALL_SUBTEST_4(test_slice_raw_data<RowMajor>());
-
- CALL_SUBTEST_5(test_strided_slice_write<ColMajor>());
- CALL_SUBTEST_5(test_strided_slice<ColMajor>());
- CALL_SUBTEST_5(test_strided_slice_write<RowMajor>());
- CALL_SUBTEST_5(test_strided_slice<RowMajor>());
-
- CALL_SUBTEST_6(test_composition<ColMajor>());
- CALL_SUBTEST_6(test_composition<RowMajor>());
+ CALL_SUBTEST_3(test_slice_in_expr<RowMajor>());
+ CALL_SUBTEST_4(test_slice_as_lvalue<ColMajor>());
+ CALL_SUBTEST_4(test_slice_as_lvalue<RowMajor>());
+ CALL_SUBTEST_5(test_slice_raw_data<ColMajor>());
+ CALL_SUBTEST_5(test_slice_raw_data<RowMajor>());
+
+ CALL_SUBTEST_6(test_strided_slice_write<ColMajor>());
+ CALL_SUBTEST_6(test_strided_slice<ColMajor>());
+ CALL_SUBTEST_6(test_strided_slice_write<RowMajor>());
+ CALL_SUBTEST_6(test_strided_slice<RowMajor>());
+
+ CALL_SUBTEST_7(test_composition<ColMajor>());
+ CALL_SUBTEST_7(test_composition<RowMajor>());
}