diff options
| author |  Rasmus Munk Larsen <rmlarsen@google.com> | 2018-09-13 16:42:05 -0700 |
|---|---|---|
| committer | Rasmus Munk Larsen <rmlarsen@google.com> | 2018-09-13 16:42:05 -0700 |
| commit | 6313dde390604cbb05b3317d1dcd13ac75978d29 (patch) | |
| tree | 11ee77b3992cc2997387e9d7011fa70cc2a5f45a /unsupported | |
| parent | 0db590d22db198154f4302d85fbbd892316d36da (diff) | |
Fix merge error.
Diffstat (limited to 'unsupported')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h | 1 | ||||
| -rw-r--r-- | unsupported/test/cxx11_tensor_executor.cpp | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h b/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h index e8c47c5b5..3a405f5e6 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h @@ -1205,7 +1205,6 @@ struct TensorEvaluator<const TensorReductionOp<Op, Dims, ArgType, MakePointer_>, const Index max_coeff_count, const DSizes<Index, NumInputDims>& input_slice_sizes, DSizes<Index, NumInputDims>* target_input_block_sizes) const { - typedef typename internal::packet_traits<Scalar>::type Packet; typedef internal::BlockReducer<Self, Op> BlockReducer; // TODO(andydavis) Compute reducer overhead correctly for the case where // we are preserving the inner most dimension, and a single reducer diff --git a/unsupported/test/cxx11_tensor_executor.cpp b/unsupported/test/cxx11_tensor_executor.cpp index 8639e7b38..1bb99854c 100644 --- a/unsupported/test/cxx11_tensor_executor.cpp +++ b/unsupported/test/cxx11_tensor_executor.cpp @@ -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); } return dims; -}; +} template <typename T, int NumDims, typename Device, bool Vectorizable, bool Tileable, int Layout> @@ -117,7 +117,7 @@ static void test_execute_broadcasting(Device d) for (Index i = 0; i < dst.dimensions().TotalSize(); ++i) { VERIFY_IS_EQUAL(dst.coeff(i), golden.coeff(i)); } -}; +} template <typename T, int NumDims, typename Device, bool Vectorizable, bool Tileable, int Layout> @@ -155,7 +155,7 @@ static void test_execute_chipping_rvalue(Device d) { TEST_CHIPPING(5) #undef TEST_CHIPPING -}; +} template <typename T, int NumDims, typename Device, bool Vectorizable, bool Tileable, int Layout> @@ -207,7 +207,7 @@ static void test_execute_chipping_lvalue(Device d) { TEST_CHIPPING(5) #undef TEST_CHIPPING -}; +} template <typename T, int NumDims, typename Device, bool Vectorizable, bool Tileable, int Layout> |