mirror of
https://gitlab.com/libeigen/eigen.git
synced 2025-07-07 21:51:47 +08:00
Fixed a bug when chipping tensors laid out in row major order.
This commit is contained in:
parent
a1f1e1e51d
commit
1de49ef4c2
@ -157,6 +157,8 @@ struct TensorEvaluator<const TensorChippingOp<DimId, ArgType>, Device>
|
|||||||
eigen_assert(NumInputDims > m_dim.actualDim());
|
eigen_assert(NumInputDims > m_dim.actualDim());
|
||||||
|
|
||||||
const typename TensorEvaluator<ArgType, Device>::Dimensions& input_dims = m_impl.dimensions();
|
const typename TensorEvaluator<ArgType, Device>::Dimensions& input_dims = m_impl.dimensions();
|
||||||
|
eigen_assert(op.offset() < input_dims[m_dim.actualDim()]);
|
||||||
|
|
||||||
int j = 0;
|
int j = 0;
|
||||||
for (int i = 0; i < NumInputDims; ++i) {
|
for (int i = 0; i < NumInputDims; ++i) {
|
||||||
if (i != m_dim.actualDim()) {
|
if (i != m_dim.actualDim()) {
|
||||||
@ -246,7 +248,9 @@ struct TensorEvaluator<const TensorChippingOp<DimId, ArgType>, Device>
|
|||||||
|
|
||||||
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Scalar* data() const {
|
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Scalar* data() const {
|
||||||
Scalar* result = m_impl.data();
|
Scalar* result = m_impl.data();
|
||||||
if (m_dim.actualDim() == NumDims && result) {
|
if (((static_cast<int>(Layout) == static_cast<int>(ColMajor) && m_dim.actualDim() == NumDims) ||
|
||||||
|
(static_cast<int>(Layout) == static_cast<int>(RowMajor) && m_dim.actualDim() == 0)) &&
|
||||||
|
result) {
|
||||||
return result + m_inputOffset;
|
return result + m_inputOffset;
|
||||||
} else {
|
} else {
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -340,11 +340,9 @@ static void test_chip_as_lvalue()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void test_chip_raw_data_col_major()
|
||||||
template<int DataLayout>
|
|
||||||
static void test_chip_raw_data()
|
|
||||||
{
|
{
|
||||||
Tensor<float, 5, DataLayout> tensor(2,3,5,7,11);
|
Tensor<float, 5, ColMajor> tensor(2,3,5,7,11);
|
||||||
tensor.setRandom();
|
tensor.setRandom();
|
||||||
|
|
||||||
typedef TensorEvaluator<decltype(tensor.template chip<4>(3)), DefaultDevice> Evaluator4;
|
typedef TensorEvaluator<decltype(tensor.template chip<4>(3)), DefaultDevice> Evaluator4;
|
||||||
@ -353,12 +351,7 @@ static void test_chip_raw_data()
|
|||||||
for (int j = 0; j < 3; ++j) {
|
for (int j = 0; j < 3; ++j) {
|
||||||
for (int k = 0; k < 5; ++k) {
|
for (int k = 0; k < 5; ++k) {
|
||||||
for (int l = 0; l < 7; ++l) {
|
for (int l = 0; l < 7; ++l) {
|
||||||
int chip_index;
|
int chip_index = i + 2 * (j + 3 * (k + 5 * l));
|
||||||
if (DataLayout == ColMajor) {
|
|
||||||
chip_index = i + 2 * (j + 3 * (k + 5 * l));
|
|
||||||
} else {
|
|
||||||
chip_index = 11 * (l + 7 * (k + 5 * (j + 3 * i)));
|
|
||||||
}
|
|
||||||
VERIFY_IS_EQUAL(chip.data()[chip_index], tensor(i,j,k,l,3));
|
VERIFY_IS_EQUAL(chip.data()[chip_index], tensor(i,j,k,l,3));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -382,6 +375,41 @@ static void test_chip_raw_data()
|
|||||||
VERIFY_IS_EQUAL(chip3.data(), static_cast<float*>(0));
|
VERIFY_IS_EQUAL(chip3.data(), static_cast<float*>(0));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void test_chip_raw_data_row_major()
|
||||||
|
{
|
||||||
|
Tensor<float, 5, RowMajor> tensor(11,7,5,3,2);
|
||||||
|
tensor.setRandom();
|
||||||
|
|
||||||
|
typedef TensorEvaluator<decltype(tensor.template chip<0>(3)), DefaultDevice> Evaluator0;
|
||||||
|
auto chip = Evaluator0(tensor.template chip<0>(3), DefaultDevice());
|
||||||
|
for (int i = 0; i < 7; ++i) {
|
||||||
|
for (int j = 0; j < 5; ++j) {
|
||||||
|
for (int k = 0; k < 3; ++k) {
|
||||||
|
for (int l = 0; l < 2; ++l) {
|
||||||
|
int chip_index = l + 2 * (k + 3 * (j + 5 * i));
|
||||||
|
VERIFY_IS_EQUAL(chip.data()[chip_index], tensor(3,i,j,k,l));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
typedef TensorEvaluator<decltype(tensor.template chip<1>(0)), DefaultDevice> Evaluator1;
|
||||||
|
auto chip1 = Evaluator1(tensor.template chip<1>(0), DefaultDevice());
|
||||||
|
VERIFY_IS_EQUAL(chip1.data(), static_cast<float*>(0));
|
||||||
|
|
||||||
|
typedef TensorEvaluator<decltype(tensor.template chip<2>(0)), DefaultDevice> Evaluator2;
|
||||||
|
auto chip2 = Evaluator2(tensor.template chip<2>(0), DefaultDevice());
|
||||||
|
VERIFY_IS_EQUAL(chip2.data(), static_cast<float*>(0));
|
||||||
|
|
||||||
|
typedef TensorEvaluator<decltype(tensor.template chip<3>(0)), DefaultDevice> Evaluator3;
|
||||||
|
auto chip3 = Evaluator3(tensor.template chip<3>(0), DefaultDevice());
|
||||||
|
VERIFY_IS_EQUAL(chip3.data(), static_cast<float*>(0));
|
||||||
|
|
||||||
|
typedef TensorEvaluator<decltype(tensor.template chip<4>(0)), DefaultDevice> Evaluator4;
|
||||||
|
auto chip4 = Evaluator4(tensor.template chip<4>(0), DefaultDevice());
|
||||||
|
VERIFY_IS_EQUAL(chip4.data(), static_cast<float*>(0));
|
||||||
|
}
|
||||||
|
|
||||||
void test_cxx11_tensor_chipping()
|
void test_cxx11_tensor_chipping()
|
||||||
{
|
{
|
||||||
CALL_SUBTEST(test_simple_chip<ColMajor>());
|
CALL_SUBTEST(test_simple_chip<ColMajor>());
|
||||||
@ -392,6 +420,6 @@ void test_cxx11_tensor_chipping()
|
|||||||
CALL_SUBTEST(test_chip_in_expr<RowMajor>());
|
CALL_SUBTEST(test_chip_in_expr<RowMajor>());
|
||||||
CALL_SUBTEST(test_chip_as_lvalue<ColMajor>());
|
CALL_SUBTEST(test_chip_as_lvalue<ColMajor>());
|
||||||
CALL_SUBTEST(test_chip_as_lvalue<RowMajor>());
|
CALL_SUBTEST(test_chip_as_lvalue<RowMajor>());
|
||||||
CALL_SUBTEST(test_chip_raw_data<ColMajor>());
|
CALL_SUBTEST(test_chip_raw_data_col_major());
|
||||||
CALL_SUBTEST(test_chip_raw_data<RowMajor>());
|
CALL_SUBTEST(test_chip_raw_data_row_major());
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user