From 13c3327f5cf829fd9d04a2ab46861e722cd74ca0 Mon Sep 17 00:00:00 2001 From: Eugene Zhulenev Date: Tue, 12 Nov 2019 10:12:28 -0800 Subject: Remove legacy block evaluation support --- .../Eigen/CXX11/src/Tensor/TensorEvaluator.h | 72 ---------------------- 1 file changed, 72 deletions(-) (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorEvaluator.h') diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorEvaluator.h b/unsupported/Eigen/CXX11/src/Tensor/TensorEvaluator.h index ce2305b56..d6a3e6abe 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorEvaluator.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorEvaluator.h @@ -45,7 +45,6 @@ struct TensorEvaluator enum { IsAligned = Derived::IsAligned, PacketAccess = (PacketType::size > 1), - BlockAccess = internal::is_arithmetic::type>::value, BlockAccessV2 = internal::is_arithmetic::type>::value, PreferBlockAccess = false, Layout = Derived::Layout, @@ -55,13 +54,6 @@ struct TensorEvaluator typedef typename internal::remove_const::type ScalarNoConst; - typedef typename internal::TensorBlock - TensorBlock; - typedef typename internal::TensorBlockReader - TensorBlockReader; - typedef typename internal::TensorBlockWriter - TensorBlockWriter; - //===- Tensor block evaluation strategy (see TensorBlock.h) -------------===// typedef internal::TensorBlockDescriptor TensorBlockDesc; typedef internal::TensorBlockScratchAllocator TensorBlockScratch; @@ -160,11 +152,6 @@ struct TensorEvaluator EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void getResourceRequirements( std::vector*) const {} - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void block(TensorBlock* block) const { - assert(m_data != NULL); - TensorBlockReader::Run(block, m_data); - } - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorBlockV2 blockV2(TensorBlockDesc& desc, TensorBlockScratch& scratch, bool /*root_of_expr_ast*/ = false) const { @@ -172,12 +159,6 @@ struct TensorEvaluator return TensorBlockV2::materialize(m_data, m_dims, desc, scratch); } - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void writeBlock( - const TensorBlock& block) { - assert(m_data != NULL); - TensorBlockWriter::Run(block, m_data); - } - template EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void writeBlockV2( const TensorBlockDesc& desc, const TensorBlockV2& block) { @@ -263,7 +244,6 @@ struct TensorEvaluator enum { IsAligned = Derived::IsAligned, PacketAccess = (PacketType::size > 1), - BlockAccess = internal::is_arithmetic::value, BlockAccessV2 = internal::is_arithmetic::value, PreferBlockAccess = false, Layout = Derived::Layout, @@ -271,11 +251,6 @@ struct TensorEvaluator RawAccess = true }; - typedef typename internal::TensorBlock - TensorBlock; - typedef typename internal::TensorBlockReader - TensorBlockReader; - //===- Tensor block evaluation strategy (see TensorBlock.h) -------------===// typedef internal::TensorBlockDescriptor TensorBlockDesc; typedef internal::TensorBlockScratchAllocator TensorBlockScratch; @@ -348,11 +323,6 @@ struct TensorEvaluator EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void getResourceRequirements( std::vector*) const {} - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void block(TensorBlock* block) const { - assert(m_data != NULL); - TensorBlockReader::Run(block, m_data); - } - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorBlockV2 blockV2(TensorBlockDesc& desc, TensorBlockScratch& scratch, bool /*root_of_expr_ast*/ = false) const { @@ -404,7 +374,6 @@ struct TensorEvaluator, Device> && (PacketType::size >1) #endif , - BlockAccess = false, BlockAccessV2 = false, PreferBlockAccess = false, Layout = TensorEvaluator::Layout, @@ -475,7 +444,6 @@ struct TensorEvaluator, Device> IsAligned = TensorEvaluator::IsAligned, PacketAccess = TensorEvaluator::PacketAccess & internal::functor_traits::PacketAccess, - BlockAccess = TensorEvaluator::BlockAccess, BlockAccessV2 = TensorEvaluator::BlockAccessV2, PreferBlockAccess = TensorEvaluator::PreferBlockAccess, Layout = TensorEvaluator::Layout, @@ -554,24 +522,6 @@ struct TensorEvaluator, Device> m_argImpl.getResourceRequirements(resources); } - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void block( - TensorBlock* output_block) const { - if (NumDims <= 0) { - output_block->data()[0] = coeff(0); - return; - } - internal::TensorBlockView arg_block(m_device, m_argImpl, - *output_block); - internal::TensorBlockCwiseUnaryIO::Run(m_functor, - output_block->block_sizes(), - output_block - ->block_strides(), - output_block->data(), - arg_block.block_strides(), - arg_block.data()); - } - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorBlockV2 blockV2(TensorBlockDesc& desc, TensorBlockScratch& scratch, bool /*root_of_expr_ast*/ = false) const { @@ -608,8 +558,6 @@ struct TensorEvaluator::PacketAccess & TensorEvaluator::PacketAccess & internal::functor_traits::PacketAccess, - BlockAccess = TensorEvaluator::BlockAccess & - TensorEvaluator::BlockAccess, BlockAccessV2 = TensorEvaluator::BlockAccessV2 & TensorEvaluator::BlockAccessV2, PreferBlockAccess = TensorEvaluator::PreferBlockAccess | @@ -713,24 +661,6 @@ struct TensorEvaluatordata()[0] = coeff(Index(0)); - return; - } - internal::TensorBlockView left_block( - m_device, m_leftImpl, *output_block); - internal::TensorBlockView right_block( - m_device, m_rightImpl, *output_block); - internal::TensorBlockCwiseBinaryIO< - BinaryOp, Index, typename internal::remove_const::type, NumDims, - Layout>::Run(m_functor, output_block->block_sizes(), - output_block->block_strides(), output_block->data(), - left_block.block_strides(), left_block.data(), - right_block.block_strides(), right_block.data()); - } - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorBlockV2 blockV2(TensorBlockDesc& desc, TensorBlockScratch& scratch, bool /*root_of_expr_ast*/ = false) const { @@ -768,7 +698,6 @@ struct TensorEvaluator::PacketAccess && TensorEvaluator::PacketAccess && internal::functor_traits::PacketAccess, - BlockAccess = false, BlockAccessV2 = false, PreferBlockAccess = TensorEvaluator::PreferBlockAccess || TensorEvaluator::PreferBlockAccess || @@ -887,7 +816,6 @@ struct TensorEvaluator PacketAccess = TensorEvaluator::PacketAccess & TensorEvaluator::PacketAccess & PacketType::HasBlend, - BlockAccess = false, BlockAccessV2 = TensorEvaluator::BlockAccessV2 && TensorEvaluator::BlockAccessV2 && TensorEvaluator::BlockAccessV2, -- cgit v1.2.3