mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2024-12-21 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged in ezhulenev/eigen-02 (pull request PR-498)

Browse Source 
Add DSizes index type promotion
This commit is contained in:
Rasmus Munk Larsen 2018-09-17 21:58:38 +00:00
commit 03a88c57e1
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
unsupported/Eigen/CXX11/src/Tensor/TensorDimensions.h
View File

@ -290,10 +290,27 @@ struct DSizes : array<DenseIndex, NumDims> {
}
}
#ifdef EIGEN_HAS_CXX11
// Enable DSizes index type promotion only if we are promoting to the
// larger type, e.g. allow to promote dimensions of type int to long.
template<typename OtherIndex,
typename std::enable_if<
std::is_same<
DenseIndex,
typename internal::promote_index_type<DenseIndex, OtherIndex>::type
>::value, int>::type = 0>
EIGEN_DEVICE_FUNC
explicit DSizes(const array<OtherIndex, NumDims>& other) {
for (int i = 0; i < NumDims; ++i) {
(*this)[i] = static_cast<DenseIndex>(other[i]);
}
}
#endif // EIGEN_HAS_CXX11
#ifdef EIGEN_HAS_INDEX_LIST
template <typename FirstType, typename... OtherTypes>
EIGEN_DEVICE_FUNC
DSizes(const Eigen::IndexList<FirstType, OtherTypes...>& dimensions) {
explicit DSizes(const Eigen::IndexList<FirstType, OtherTypes...>& dimensions) {
for (int i = 0; i < dimensions.count; ++i) {
(*this)[i] = dimensions[i];
}

18
unsupported/test/cxx11_tensor_dimension.cpp
View File

@ -60,10 +60,28 @@ static void test_rank_zero()
VERIFY_IS_EQUAL((int)dscalar.rank(), 0);
}
static void test_index_type_promotion() {
#ifdef EIGEN_HAS_CXX11
Eigen::DSizes<int, 3> src0(1, 2, 3);
Eigen::array<int, 3> src1 = {4, 5, 6};
Eigen::DSizes<long, 3> dst0(src0);
Eigen::DSizes<long, 3> dst1(src1);
VERIFY_IS_EQUAL(dst0[0], 1L);
VERIFY_IS_EQUAL(dst0[1], 2L);
VERIFY_IS_EQUAL(dst0[2], 3L);
VERIFY_IS_EQUAL(dst1[0], 4L);
VERIFY_IS_EQUAL(dst1[1], 5L);
VERIFY_IS_EQUAL(dst1[2], 6L);
#endif // EIGEN_HAS_CXX11
}
EIGEN_DECLARE_TEST(cxx11_tensor_dimension)
{
CALL_SUBTEST(test_dynamic_size());
CALL_SUBTEST(test_fixed_size());
CALL_SUBTEST(test_match());
CALL_SUBTEST(test_rank_zero());
CALL_SUBTEST(test_index_type_promotion());
}