Added the EIGEN_HAS_CONSTEXPR define

Gate the tensor index list code based on the value of EIGEN_HAS_CONSTEXPR
This commit is contained in:
Benoit Steiner
2015-02-06 02:51:59 -08:00
parent f64045a060
commit dcb2a8b184
5 changed files with 16 additions and 6 deletions

View File

@@ -11,6 +11,7 @@
#include <Eigen/CXX11/Tensor>
#ifdef EIGEN_HAS_CONSTEXPR
static void test_static_index_list()
{
@@ -254,11 +255,14 @@ static void test_mixed_index_list()
VERIFY_IS_APPROX(result3(0), expected);
}
#endif
void test_cxx11_tensor_index_list()
{
#ifdef EIGEN_HAS_CONSTEXPR
CALL_SUBTEST(test_static_index_list());
CALL_SUBTEST(test_type2index_list());
CALL_SUBTEST(test_dynamic_index_list());
CALL_SUBTEST(test_mixed_index_list());
#endif
}

View File

@@ -284,7 +284,7 @@ static void test_static_dims() {
Tensor<float, 2, DataLayout> out(72, 97);
in.setRandom();
#if __cplusplus <= 199711L
#ifndef EIGEN_HAS_CONSTEXPR
array<int, 2> reduction_axis;
reduction_axis[0] = 1;
reduction_axis[1] = 3;
@@ -314,7 +314,7 @@ static void test_innermost_last_dims() {
in.setRandom();
// Reduce on the innermost dimensions.
#if __cplusplus <= 199711L
#ifndef EIGEN_HAS_CONSTEXPR
array<int, 2> reduction_axis;
reduction_axis[0] = 0;
reduction_axis[1] = 1;
@@ -345,7 +345,7 @@ static void test_innermost_first_dims() {
in.setRandom();
// Reduce on the innermost dimensions.
#if __cplusplus <= 199711L
#ifndef EIGEN_HAS_CONSTEXPR
array<int, 2> reduction_axis;
reduction_axis[0] = 2;
reduction_axis[1] = 3;
@@ -376,7 +376,7 @@ static void test_reduce_middle_dims() {
in.setRandom();
// Reduce on the innermost dimensions.
#if __cplusplus <= 199711L
#ifndef EIGEN_HAS_CONSTEXPR
array<int, 2> reduction_axis;
reduction_axis[0] = 1;
reduction_axis[1] = 2;