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

Support reshaping with static shapes and dimensions conversion in tensor broadcasting

Browse Source
This commit is contained in:
Eugene Zhulenev
2018-09-14 15:25:27 -07:00
parent 9b864cdb37
commit 1b8d70a22b
4 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unsupported/test/cxx11_tensor_broadcasting.cpp
View File

@@ -115,7 +115,7 @@ static void test_static_broadcasting()
Tensor<float, 3, DataLayout> tensor(8,3,5);
tensor.setRandom();
#if EIGEN_HAS_CONSTEXPR
#if defined(EIGEN_HAS_INDEX_LIST)
Eigen::IndexList<Eigen::type2index<2>, Eigen::type2index<3>, Eigen::type2index<4>> broadcasts;
#else
Eigen::array<int, 3> broadcasts;

23
unsupported/test/cxx11_tensor_morphing.cpp
View File

@@ -41,6 +41,28 @@ static void test_simple_reshape()
}
}
template <typename>
static void test_static_reshape() {
#if defined(EIGEN_HAS_INDEX_LIST)
using Eigen::type2index;
Tensor<float, 5> tensor(2, 3, 1, 7, 1);
tensor.setRandom();
// New dimensions: [2, 3, 7]
Eigen::IndexList<type2index<2>, type2index<3>, type2index<7>> dim;
Tensor<float, 3> reshaped = tensor.reshape(dim);
for (int i = 0; i < 2; ++i) {
for (int j = 0; j < 3; ++j) {
for (int k = 0; k < 7; ++k) {
VERIFY_IS_EQUAL(tensor(i, j, 0, k, 0), reshaped(i, j, k));
}
}
}
#endif
}
template<typename>
static void test_reshape_in_expr() {
MatrixXf m1(2,3*5*7*11);
@@ -462,6 +484,7 @@ static void test_composition()
EIGEN_DECLARE_TEST(cxx11_tensor_morphing)
{
CALL_SUBTEST_1(test_simple_reshape<void>());
CALL_SUBTEST_1(test_static_reshape<void>());
CALL_SUBTEST_1(test_reshape_in_expr<void>());
CALL_SUBTEST_1(test_reshape_as_lvalue<void>());