diff options
author | Eugene Zhulenev <ezhulenev@google.com> | 2019-12-10 15:40:23 -0800 |
---|---|---|
committer | Eugene Zhulenev <ezhulenev@google.com> | 2019-12-10 15:40:23 -0800 |
commit | 1c879eb010df8e53e5ac016ee5d155db2c721c2b (patch) | |
tree | 2e2d9830a59f2a61ca8c13a1c5b77b362870fb34 /unsupported/Eigen/CXX11/src/Tensor/TensorEvaluator.h | |
parent | dbca11e8805ec07660d8f966a1884ad0be302f15 (diff) |
Remove V2 suffix from TensorBlock
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorEvaluator.h')
-rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorEvaluator.h | 110 |
1 files changed, 55 insertions, 55 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorEvaluator.h b/unsupported/Eigen/CXX11/src/Tensor/TensorEvaluator.h index 613a8347d..146cc325e 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorEvaluator.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorEvaluator.h @@ -45,7 +45,7 @@ struct TensorEvaluator enum { IsAligned = Derived::IsAligned, PacketAccess = (PacketType<CoeffReturnType, Device>::size > 1), - BlockAccessV2 = internal::is_arithmetic<typename internal::remove_const<Scalar>::type>::value, + BlockAccess = internal::is_arithmetic<typename internal::remove_const<Scalar>::type>::value, PreferBlockAccess = false, Layout = Derived::Layout, CoordAccess = NumCoords > 0, @@ -60,7 +60,7 @@ struct TensorEvaluator typedef typename internal::TensorMaterializedBlock<ScalarNoConst, NumCoords, Layout, Index> - TensorBlockV2; + TensorBlock; //===--------------------------------------------------------------------===// EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorEvaluator(const Derived& m, const Device& device) @@ -150,23 +150,23 @@ struct TensorEvaluator } EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE - internal::TensorBlockV2ResourceRequirements getResourceRequirements() const { - return internal::TensorBlockV2ResourceRequirements::any(); + internal::TensorBlockResourceRequirements getResourceRequirements() const { + return internal::TensorBlockResourceRequirements::any(); } - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorBlockV2 - blockV2(TensorBlockDesc& desc, TensorBlockScratch& scratch, + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorBlock + block(TensorBlockDesc& desc, TensorBlockScratch& scratch, bool /*root_of_expr_ast*/ = false) const { assert(m_data != NULL); - return TensorBlockV2::materialize(m_data, m_dims, desc, scratch); + return TensorBlock::materialize(m_data, m_dims, desc, scratch); } - template<typename TensorBlockV2> - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void writeBlockV2( - const TensorBlockDesc& desc, const TensorBlockV2& block) { + template<typename TensorBlock> + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void writeBlock( + const TensorBlockDesc& desc, const TensorBlock& block) { assert(m_data != NULL); - typedef typename TensorBlockV2::XprType TensorBlockExpr; + typedef typename TensorBlock::XprType TensorBlockExpr; typedef internal::TensorBlockAssignment<Scalar, NumCoords, TensorBlockExpr, Index> TensorBlockAssign; @@ -246,7 +246,7 @@ struct TensorEvaluator<const Derived, Device> enum { IsAligned = Derived::IsAligned, PacketAccess = (PacketType<CoeffReturnType, Device>::size > 1), - BlockAccessV2 = internal::is_arithmetic<ScalarNoConst>::value, + BlockAccess = internal::is_arithmetic<ScalarNoConst>::value, PreferBlockAccess = false, Layout = Derived::Layout, CoordAccess = NumCoords > 0, @@ -259,7 +259,7 @@ struct TensorEvaluator<const Derived, Device> typedef typename internal::TensorMaterializedBlock<ScalarNoConst, NumCoords, Layout, Index> - TensorBlockV2; + TensorBlock; //===--------------------------------------------------------------------===// EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorEvaluator(const Derived& m, const Device& device) @@ -323,15 +323,15 @@ struct TensorEvaluator<const Derived, Device> } EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE - internal::TensorBlockV2ResourceRequirements getResourceRequirements() const { - return internal::TensorBlockV2ResourceRequirements::any(); + internal::TensorBlockResourceRequirements getResourceRequirements() const { + return internal::TensorBlockResourceRequirements::any(); } - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorBlockV2 - blockV2(TensorBlockDesc& desc, TensorBlockScratch& scratch, + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorBlock + block(TensorBlockDesc& desc, TensorBlockScratch& scratch, bool /*root_of_expr_ast*/ = false) const { assert(m_data != NULL); - return TensorBlockV2::materialize(m_data, m_dims, desc, scratch); + return TensorBlock::materialize(m_data, m_dims, desc, scratch); } EIGEN_DEVICE_FUNC EvaluatorPointerType data() const { return m_data; } @@ -378,7 +378,7 @@ struct TensorEvaluator<const TensorCwiseNullaryOp<NullaryOp, ArgType>, Device> && (PacketType<CoeffReturnType, Device>::size >1) #endif , - BlockAccessV2 = false, + BlockAccess = false, PreferBlockAccess = false, Layout = TensorEvaluator<ArgType, Device>::Layout, CoordAccess = false, // to be implemented @@ -386,7 +386,7 @@ struct TensorEvaluator<const TensorCwiseNullaryOp<NullaryOp, ArgType>, Device> }; //===- Tensor block evaluation strategy (see TensorBlock.h) -------------===// - typedef internal::TensorBlockNotImplemented TensorBlockV2; + typedef internal::TensorBlockNotImplemented TensorBlock; //===--------------------------------------------------------------------===// EIGEN_DEVICE_FUNC const Dimensions& dimensions() const { return m_argImpl.dimensions(); } @@ -448,7 +448,7 @@ struct TensorEvaluator<const TensorCwiseUnaryOp<UnaryOp, ArgType>, Device> IsAligned = TensorEvaluator<ArgType, Device>::IsAligned, PacketAccess = TensorEvaluator<ArgType, Device>::PacketAccess & internal::functor_traits<UnaryOp>::PacketAccess, - BlockAccessV2 = TensorEvaluator<ArgType, Device>::BlockAccessV2, + BlockAccess = TensorEvaluator<ArgType, Device>::BlockAccess, PreferBlockAccess = TensorEvaluator<ArgType, Device>::PreferBlockAccess, Layout = TensorEvaluator<ArgType, Device>::Layout, CoordAccess = false, // to be implemented @@ -476,11 +476,11 @@ struct TensorEvaluator<const TensorCwiseUnaryOp<UnaryOp, ArgType>, Device> typedef internal::TensorBlockDescriptor<NumDims, Index> TensorBlockDesc; typedef internal::TensorBlockScratchAllocator<Device> TensorBlockScratch; - typedef typename TensorEvaluator<const ArgType, Device>::TensorBlockV2 + typedef typename TensorEvaluator<const ArgType, Device>::TensorBlock ArgTensorBlock; typedef internal::TensorCwiseUnaryBlock<UnaryOp, ArgTensorBlock> - TensorBlockV2; + TensorBlock; //===--------------------------------------------------------------------===// EIGEN_DEVICE_FUNC const Dimensions& dimensions() const { return m_argImpl.dimensions(); } @@ -520,14 +520,14 @@ struct TensorEvaluator<const TensorCwiseUnaryOp<UnaryOp, ArgType>, Device> } EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE - internal::TensorBlockV2ResourceRequirements getResourceRequirements() const { + internal::TensorBlockResourceRequirements getResourceRequirements() const { return m_argImpl.getResourceRequirements(); } - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorBlockV2 - blockV2(TensorBlockDesc& desc, TensorBlockScratch& scratch, + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorBlock + block(TensorBlockDesc& desc, TensorBlockScratch& scratch, bool /*root_of_expr_ast*/ = false) const { - return TensorBlockV2(m_argImpl.blockV2(desc, scratch), m_functor); + return TensorBlock(m_argImpl.block(desc, scratch), m_functor); } EIGEN_DEVICE_FUNC EvaluatorPointerType data() const { return NULL; } @@ -560,8 +560,8 @@ struct TensorEvaluator<const TensorCwiseBinaryOp<BinaryOp, LeftArgType, RightArg PacketAccess = TensorEvaluator<LeftArgType, Device>::PacketAccess & TensorEvaluator<RightArgType, Device>::PacketAccess & internal::functor_traits<BinaryOp>::PacketAccess, - BlockAccessV2 = TensorEvaluator<LeftArgType, Device>::BlockAccessV2 & - TensorEvaluator<RightArgType, Device>::BlockAccessV2, + BlockAccess = TensorEvaluator<LeftArgType, Device>::BlockAccess & + TensorEvaluator<RightArgType, Device>::BlockAccess, PreferBlockAccess = TensorEvaluator<LeftArgType, Device>::PreferBlockAccess | TensorEvaluator<RightArgType, Device>::PreferBlockAccess, Layout = TensorEvaluator<LeftArgType, Device>::Layout, @@ -595,14 +595,14 @@ struct TensorEvaluator<const TensorCwiseBinaryOp<BinaryOp, LeftArgType, RightArg typedef internal::TensorBlockDescriptor<NumDims, Index> TensorBlockDesc; typedef internal::TensorBlockScratchAllocator<Device> TensorBlockScratch; - typedef typename TensorEvaluator<const LeftArgType, Device>::TensorBlockV2 + typedef typename TensorEvaluator<const LeftArgType, Device>::TensorBlock LeftTensorBlock; - typedef typename TensorEvaluator<const RightArgType, Device>::TensorBlockV2 + typedef typename TensorEvaluator<const RightArgType, Device>::TensorBlock RightTensorBlock; typedef internal::TensorCwiseBinaryBlock<BinaryOp, LeftTensorBlock, RightTensorBlock> - TensorBlockV2; + TensorBlock; //===--------------------------------------------------------------------===// EIGEN_DEVICE_FUNC const Dimensions& dimensions() const @@ -653,18 +653,18 @@ struct TensorEvaluator<const TensorCwiseBinaryOp<BinaryOp, LeftArgType, RightArg } EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE - internal::TensorBlockV2ResourceRequirements getResourceRequirements() const { - return internal::TensorBlockV2ResourceRequirements::merge( + internal::TensorBlockResourceRequirements getResourceRequirements() const { + return internal::TensorBlockResourceRequirements::merge( m_leftImpl.getResourceRequirements(), m_rightImpl.getResourceRequirements()); } - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorBlockV2 - blockV2(TensorBlockDesc& desc, TensorBlockScratch& scratch, + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorBlock + block(TensorBlockDesc& desc, TensorBlockScratch& scratch, bool /*root_of_expr_ast*/ = false) const { desc.DropDestinationBuffer(); - return TensorBlockV2(m_leftImpl.blockV2(desc, scratch), - m_rightImpl.blockV2(desc, scratch), m_functor); + return TensorBlock(m_leftImpl.block(desc, scratch), + m_rightImpl.block(desc, scratch), m_functor); } EIGEN_DEVICE_FUNC EvaluatorPointerType data() const { return NULL; } @@ -696,7 +696,7 @@ struct TensorEvaluator<const TensorCwiseTernaryOp<TernaryOp, Arg1Type, Arg2Type, TensorEvaluator<Arg2Type, Device>::PacketAccess && TensorEvaluator<Arg3Type, Device>::PacketAccess && internal::functor_traits<TernaryOp>::PacketAccess, - BlockAccessV2 = false, + BlockAccess = false, PreferBlockAccess = TensorEvaluator<Arg1Type, Device>::PreferBlockAccess || TensorEvaluator<Arg2Type, Device>::PreferBlockAccess || TensorEvaluator<Arg3Type, Device>::PreferBlockAccess, @@ -739,7 +739,7 @@ struct TensorEvaluator<const TensorCwiseTernaryOp<TernaryOp, Arg1Type, Arg2Type, typedef typename Storage::Type EvaluatorPointerType; //===- Tensor block evaluation strategy (see TensorBlock.h) -------------===// - typedef internal::TensorBlockNotImplemented TensorBlockV2; + typedef internal::TensorBlockNotImplemented TensorBlock; //===--------------------------------------------------------------------===// EIGEN_DEVICE_FUNC const Dimensions& dimensions() const @@ -814,9 +814,9 @@ struct TensorEvaluator<const TensorSelectOp<IfArgType, ThenArgType, ElseArgType> PacketAccess = TensorEvaluator<ThenArgType, Device>::PacketAccess & TensorEvaluator<ElseArgType, Device>::PacketAccess & PacketType<Scalar, Device>::HasBlend, - BlockAccessV2 = TensorEvaluator<IfArgType, Device>::BlockAccessV2 && - TensorEvaluator<ThenArgType, Device>::BlockAccessV2 && - TensorEvaluator<ElseArgType, Device>::BlockAccessV2, + BlockAccess = TensorEvaluator<IfArgType, Device>::BlockAccess && + TensorEvaluator<ThenArgType, Device>::BlockAccess && + TensorEvaluator<ElseArgType, Device>::BlockAccess, PreferBlockAccess = TensorEvaluator<IfArgType, Device>::PreferBlockAccess || TensorEvaluator<ThenArgType, Device>::PreferBlockAccess || TensorEvaluator<ElseArgType, Device>::PreferBlockAccess, @@ -850,11 +850,11 @@ struct TensorEvaluator<const TensorSelectOp<IfArgType, ThenArgType, ElseArgType> typedef internal::TensorBlockDescriptor<NumDims, Index> TensorBlockDesc; typedef internal::TensorBlockScratchAllocator<Device> TensorBlockScratch; - typedef typename TensorEvaluator<const IfArgType, Device>::TensorBlockV2 + typedef typename TensorEvaluator<const IfArgType, Device>::TensorBlock IfArgTensorBlock; - typedef typename TensorEvaluator<const ThenArgType, Device>::TensorBlockV2 + typedef typename TensorEvaluator<const ThenArgType, Device>::TensorBlock ThenArgTensorBlock; - typedef typename TensorEvaluator<const ElseArgType, Device>::TensorBlockV2 + typedef typename TensorEvaluator<const ElseArgType, Device>::TensorBlock ElseArgTensorBlock; struct TensorSelectOpBlockFactory { @@ -873,7 +873,7 @@ struct TensorEvaluator<const TensorSelectOp<IfArgType, ThenArgType, ElseArgType> typedef internal::TensorTernaryExprBlock<TensorSelectOpBlockFactory, IfArgTensorBlock, ThenArgTensorBlock, ElseArgTensorBlock> - TensorBlockV2; + TensorBlock; //===--------------------------------------------------------------------===// EIGEN_DEVICE_FUNC const Dimensions& dimensions() const @@ -933,24 +933,24 @@ struct TensorEvaluator<const TensorSelectOp<IfArgType, ThenArgType, ElseArgType> } EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE - internal::TensorBlockV2ResourceRequirements getResourceRequirements() const { - return internal::TensorBlockV2ResourceRequirements::merge( + internal::TensorBlockResourceRequirements getResourceRequirements() const { + return internal::TensorBlockResourceRequirements::merge( m_condImpl.getResourceRequirements(), - internal::TensorBlockV2ResourceRequirements::merge( + internal::TensorBlockResourceRequirements::merge( m_thenImpl.getResourceRequirements(), m_elseImpl.getResourceRequirements())); } - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorBlockV2 - blockV2(TensorBlockDesc& desc, TensorBlockScratch& scratch, + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorBlock + block(TensorBlockDesc& desc, TensorBlockScratch& scratch, bool /*root_of_expr_ast*/ = false) const { // It's unsafe to pass destination buffer to underlying expressions, because // output might be aliased with one of the inputs. desc.DropDestinationBuffer(); - return TensorBlockV2( - m_condImpl.blockV2(desc, scratch), m_thenImpl.blockV2(desc, scratch), - m_elseImpl.blockV2(desc, scratch), TensorSelectOpBlockFactory()); + return TensorBlock( + m_condImpl.block(desc, scratch), m_thenImpl.block(desc, scratch), + m_elseImpl.block(desc, scratch), TensorSelectOpBlockFactory()); } EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE EvaluatorPointerType data() const { return NULL; } |