diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-10-14 09:31:37 -0700 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-10-14 09:31:37 -0700 |
| commit | 6585efc55354b38c65de8c23599e99f3caaca843 (patch) | |
| tree | ad42da7e739b65f78d542b53dfee4137ac63e5b9 /unsupported/test | |
| parent | fc7478c04d16b8585d6eaff1ae2f473e247aaf2e (diff) | |
Tightened the definition of isOfNormalIndex to take into account integer types in addition to arrays of indices
Only compile the custom index code when EIGEN_HAS_SFINAE is defined. For the time beeing, EIGEN_HAS_SFINAE is a synonym for EIGEN_HAS_VARIADIC_TEMPLATES, but this might evolve in the future.
Moved some code around.
Diffstat (limited to 'unsupported/test')
| -rw-r--r-- | unsupported/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | unsupported/test/cxx11_tensor_custom_index.cpp (renamed from unsupported/test/cxx11_tensor_customIndex.cpp) | 25 |
2 files changed, 12 insertions, 15 deletions
diff --git a/unsupported/test/CMakeLists.txt b/unsupported/test/CMakeLists.txt index e9656f404..8865892e6 100644 --- a/unsupported/test/CMakeLists.txt +++ b/unsupported/test/CMakeLists.txt @@ -142,7 +142,7 @@ if(EIGEN_TEST_CXX11) ei_add_test(cxx11_tensor_io "-std=c++0x") ei_add_test(cxx11_tensor_generator "-std=c++0x") ei_add_test(cxx11_tensor_custom_op "-std=c++0x") - ei_add_test(cxx11_tensor_customIndex "-std=c++0x") + ei_add_test(cxx11_tensor_custom_index "-std=c++0x") # These tests needs nvcc # ei_add_test(cxx11_tensor_device "-std=c++0x") diff --git a/unsupported/test/cxx11_tensor_customIndex.cpp b/unsupported/test/cxx11_tensor_custom_index.cpp index 6ec809890..ff9545a7a 100644 --- a/unsupported/test/cxx11_tensor_customIndex.cpp +++ b/unsupported/test/cxx11_tensor_custom_index.cpp @@ -1,7 +1,7 @@ // This file is part of Eigen, a lightweight C++ template library // for linear algebra. // -// Copyright (C) 2014 Benoit Steiner <benoit.steiner.goog@gmail.com> +// Copyright (C) 2015 Benoit Steiner <benoit.steiner.goog@gmail.com> // // This Source Code Form is subject to the terms of the Mozilla // Public License v. 2.0. If a copy of the MPL was not distributed @@ -17,25 +17,22 @@ using Eigen::Tensor; template <int DataLayout> -static void test_customIndex() { - +static void test_custom_index() { + Tensor<float, 4, DataLayout> tensor(2, 3, 5, 7); - - using NormalIndex = DSizes<ptrdiff_t, 4>; - using CustomIndex = Matrix<unsigned int , 4, 1>; - tensor.setRandom(); + using NormalIndex = DSizes<ptrdiff_t, 4>; + using CustomIndex = Matrix<unsigned int , 4, 1>; CustomIndex coeffC(1,2,4,1); NormalIndex coeff(1,2,4,1); - - VERIFY_IS_EQUAL(tensor.coeff( coeffC ), tensor.coeff( coeff )); - VERIFY_IS_EQUAL(tensor.coeffRef( coeffC ), tensor.coeffRef( coeff )); - + + VERIFY_IS_EQUAL(tensor.coeff(coeffC), tensor.coeff(coeff)); + VERIFY_IS_EQUAL(tensor.coeffRef(coeffC), tensor.coeffRef(coeff)); } -void test_cxx11_tensor_customIndex() { - CALL_SUBTEST(test_customIndex<ColMajor>()); - CALL_SUBTEST(test_customIndex<RowMajor>()); +void test_cxx11_tensor_custom_index() { + test_custom_index<ColMajor>(); + test_custom_index<RowMajor>(); } |