GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-11 11:19:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge error.

Browse Source
This commit is contained in:
Rasmus Munk Larsen 2018-09-13 16:42:05 -07:00
parent 0db590d22d
commit 6313dde390
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h
View File

@ -1205,7 +1205,6 @@ struct TensorEvaluator<const TensorReductionOp<Op, Dims, ArgType, MakePointer_>,
const Index max_coeff_count, const Index max_coeff_count,
const DSizes<Index, NumInputDims>& input_slice_sizes, const DSizes<Index, NumInputDims>& input_slice_sizes,
DSizes<Index, NumInputDims>* target_input_block_sizes) const { DSizes<Index, NumInputDims>* target_input_block_sizes) const {
typedef typename internal::packet_traits<Scalar>::type Packet;
typedef internal::BlockReducer<Self, Op> BlockReducer; typedef internal::BlockReducer<Self, Op> BlockReducer;
// TODO(andydavis) Compute reducer overhead correctly for the case where // TODO(andydavis) Compute reducer overhead correctly for the case where
// we are preserving the inner most dimension, and a single reducer // we are preserving the inner most dimension, and a single reducer

8
unsupported/test/cxx11_tensor_executor.cpp
View File

@ -27,7 +27,7 @@ static array<Index, NumDims> RandomDims(int min_dim = 1, int max_dim = 20) {
dims[i] = internal::random<int>(min_dim, max_dim); dims[i] = internal::random<int>(min_dim, max_dim);
} }
return dims; return dims;
}; }
template <typename T, int NumDims, typename Device, bool Vectorizable, template <typename T, int NumDims, typename Device, bool Vectorizable,
bool Tileable, int Layout> bool Tileable, int Layout>
@ -117,7 +117,7 @@ static void test_execute_broadcasting(Device d)
for (Index i = 0; i < dst.dimensions().TotalSize(); ++i) { for (Index i = 0; i < dst.dimensions().TotalSize(); ++i) {
VERIFY_IS_EQUAL(dst.coeff(i), golden.coeff(i)); VERIFY_IS_EQUAL(dst.coeff(i), golden.coeff(i));
} }
}; }
template <typename T, int NumDims, typename Device, bool Vectorizable, template <typename T, int NumDims, typename Device, bool Vectorizable,
bool Tileable, int Layout> bool Tileable, int Layout>
@ -155,7 +155,7 @@ static void test_execute_chipping_rvalue(Device d) {
TEST_CHIPPING(5) TEST_CHIPPING(5)
#undef TEST_CHIPPING #undef TEST_CHIPPING
}; }
template <typename T, int NumDims, typename Device, bool Vectorizable, template <typename T, int NumDims, typename Device, bool Vectorizable,
bool Tileable, int Layout> bool Tileable, int Layout>
@ -207,7 +207,7 @@ static void test_execute_chipping_lvalue(Device d) {
TEST_CHIPPING(5) TEST_CHIPPING(5)
#undef TEST_CHIPPING #undef TEST_CHIPPING
}; }
template <typename T, int NumDims, typename Device, bool Vectorizable, template <typename T, int NumDims, typename Device, bool Vectorizable,
bool Tileable, int Layout> bool Tileable, int Layout>