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/TensorConversion.h | |
| parent | dbca11e8805ec07660d8f966a1884ad0be302f15 (diff) | |
Remove V2 suffix from TensorBlock
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h b/unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h index f9f90ec02..cdbafbbb1 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h @@ -302,7 +302,7 @@ struct TensorEvaluator<const TensorConversionOp<TargetType, ArgType>, Device> TensorEvaluator<ArgType, Device>::PacketAccess & internal::type_casting_traits<SrcType, TargetType>::VectorizedCast, #endif - BlockAccessV2 = TensorEvaluator<ArgType, Device>::BlockAccessV2, + BlockAccess = TensorEvaluator<ArgType, Device>::BlockAccess, PreferBlockAccess = TensorEvaluator<ArgType, Device>::PreferBlockAccess, Layout = TensorEvaluator<ArgType, Device>::Layout, RawAccess = false @@ -314,7 +314,7 @@ struct TensorEvaluator<const TensorConversionOp<TargetType, 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; struct TensorConversionOpBlockFactory { @@ -331,7 +331,7 @@ struct TensorEvaluator<const TensorConversionOp<TargetType, ArgType>, Device> typedef internal::TensorUnaryExprBlock<TensorConversionOpBlockFactory, ArgTensorBlock> - TensorBlockV2; + TensorBlock; //===--------------------------------------------------------------------===// EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorEvaluator(const XprType& op, const Device& device) @@ -398,14 +398,14 @@ struct TensorEvaluator<const TensorConversionOp<TargetType, ArgType>, Device> } EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE - internal::TensorBlockV2ResourceRequirements getResourceRequirements() const { + internal::TensorBlockResourceRequirements getResourceRequirements() const { return m_impl.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_impl.blockV2(desc, scratch), + return TensorBlock(m_impl.block(desc, scratch), TensorConversionOpBlockFactory()); } |