remove tensor meta utils

Author: chenwhql

paddle/fluid/framework/operator.cc

@@ -1867,7 +1867,7 @@ void OperatorWithKernel::BuildPtenKernelContext(
             std::move(pten::Scalar(BOOST_GET_CONST(float, attr))));
       } else if (std::type_index(attr.type()) ==
                  std::type_index(typeid(std::string))) {
-        op_kernel_ctx.EmplaceBackAttr(
+        pt_kernel_context_->EmplaceBackAttr(
             std::move(pten::Scalar(BOOST_GET_CONST(std::string, attr))));
       } else {
         PADDLE_THROW(platform::errors::Unimplemented(

paddle/fluid/imperative/prepared_operator.cc

@@ -356,7 +356,7 @@ static void BuildDygraphPtenKernelContext(
             std::move(pten::Scalar(BOOST_GET_CONST(float, attr))));
       } else if (std::type_index(attr.type()) ==
                  std::type_index(typeid(std::string))) {
-        op_kernel_ctx.EmplaceBackAttr(
+        kernel_ctx->EmplaceBackAttr(
             std::move(pten::Scalar(BOOST_GET_CONST(std::string, attr))));
       } else {
         PADDLE_THROW(platform::errors::Unimplemented(

paddle/pten/api/lib/creation.cc

@@ -38,7 +38,7 @@ Tensor full(const std::vector<int64_t>& shape,
 
   // 2. Get Device Context
   auto* dev_ctx = GetDeviceContextByBackend(kernel_key.backend());
-  auto kernel_context = pten::KernelContext(*dev_ctx);
+  auto kernel_context = pten::KernelContext(dev_ctx);
 
   // 3. Auto data transform
   kernel_context.EmplaceBackAttr(value);

paddle/pten/api/lib/utils/tensor_utils.cc

@@ -133,11 +133,12 @@ void MovesStorage(pten::DenseTensor* src, paddle::framework::LoDTensor* dst) {
 void ReMakePtenDenseTensor(const paddle::framework::Tensor& src,
                            pten::DenseTensor* dst) {
   auto* meta = pten::CompatibleDenseTensorUtils::GetMutableMeta(dst);
-  pten::CompatibleDenseTensorMetaUtils::SetDDim(meta, src.dims());
-  pten::CompatibleDenseTensorMetaUtils::SetDataType(
-      meta, pten::TransToPtenDataType(src.type()));
-  pten::CompatibleDenseTensorMetaUtils::SetDataLayout(
-      meta, pten::TransToPtenDataLayout(src.layout()));
+  meta->dims = src.dims();
+  // Since the type of DenseTensorMeta is const, const_cast must be used
+  const_cast<DataType&>(meta->type) = pten::TransToPtenDataType(src.type());
+  // Since the type of DenseTensorMeta is const, const_cast must be used
+  const_cast<DataLayout&>(meta->layout) =
+      pten::TransToPtenDataLayout(src.layout());
   auto* shared_storage = static_cast<SharedStorage*>(
       pten::CompatibleDenseTensorUtils::UnsafeGetMutableStorage(dst));
   PADDLE_ENFORCE_NOT_NULL(
@@ -150,12 +151,13 @@ void ReMakePtenDenseTensor(const paddle::framework::Tensor& src,
 void ReMakePtenDenseTensor(const paddle::framework::LoDTensor& src,
                            pten::DenseTensor* dst) {
   auto* meta = pten::CompatibleDenseTensorUtils::GetMutableMeta(dst);
-  pten::CompatibleDenseTensorMetaUtils::SetDDim(meta, src.dims());
-  pten::CompatibleDenseTensorMetaUtils::SetDataType(
-      meta, pten::TransToPtenDataType(src.type()));
-  pten::CompatibleDenseTensorMetaUtils::SetDataLayout(
-      meta, pten::TransToPtenDataLayout(src.layout()));
-  pten::CompatibleDenseTensorMetaUtils::SetLoD(meta, src.lod());
+  meta->dims = src.dims();
+  // Since the type of DenseTensorMeta is const, const_cast must be used
+  const_cast<DataType&>(meta->type) = pten::TransToPtenDataType(src.type());
+  // Since the type of DenseTensorMeta is const, const_cast must be used
+  const_cast<DataLayout&>(meta->layout) =
+      pten::TransToPtenDataLayout(src.layout());
+  SetLoD(&(meta->lod), src.lod());
   auto* shared_storage = static_cast<SharedStorage*>(
       pten::CompatibleDenseTensorUtils::UnsafeGetMutableStorage(dst));
   PADDLE_ENFORCE_NOT_NULL(

paddle/pten/core/compat_utils.h

@@ -47,30 +47,4 @@ class CompatibleDenseTensorUtils {
   }
 };
 
-class CompatibleDenseTensorMetaUtils {
- public:
-  static void SetDDim(DenseTensorMeta* meta, const DDim& dims) {
-    meta->dims = dims;
-  }
-
-  static void SetDataType(DenseTensorMeta* meta, DataType type) {
-    // Since the type of DenseTensorMeta is const, const_cast must be used
-    const_cast<DataType&>(meta->type) = type;
-  }
-
-  static void SetDataLayout(DenseTensorMeta* meta, DataLayout layout) {
-    // Since the type of DenseTensorMeta is const, const_cast must be used
-    const_cast<DataLayout&>(meta->layout) = layout;
-  }
-
-  template <typename SrcLoD>
-  static void SetLoD(DenseTensorMeta* meta, const SrcLoD& lod) {
-    meta->lod.reserve(lod.size());
-    meta->lod.clear();
-    for (auto&& v : lod) {
-      meta->lod.emplace_back(v);
-    }
-  }
-};
-
 }  // namespace pten

paddle/pten/core/tensor_meta.h

@@ -31,8 +31,6 @@ namespace pten {
 using DDim = paddle::framework::DDim;
 using LoD = std::vector<std::vector<size_t>>;
 
-class CompatibleDenseTensorMetaUtils;
-
 /// \brief The meta data of dense tensor. Take the structure type
 /// and use all default operations.
 ///
@@ -48,8 +46,6 @@ struct DenseTensorMeta {
                   DataLayout layout,
                   const std::vector<std::vector<size_t>>& lod);
 
-  friend class CompatibleDenseTensorMetaUtils;
-
   /// \brief Test whether the metadata is valid. Does not throw exceptions.
   /// \return Whether the metadata is valid.
   bool valid() const noexcept;