devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tightened the definition of isOfNormalIndex to take into account integer types in addition to arrays of indices

Browse Source 
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.
This commit is contained in:
Benoit Steiner
2015-10-14 09:31:37 -07:00
parent fc7478c04d
commit 6585efc553
6 changed files with 41 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unsupported/test/CMakeLists.txt
View File

@@ -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")

25
unsupported/test/cxx11_tensor_customIndex.cpp → unsupported/test/cxx11_tensor_custom_index.cpp
View File

@@ -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>();
}