optimize paddle::Tensor in fluid/prim

Author: co63oc

paddle/fluid/prim/api/manual_prim/static_prim_api.cc

@@ -108,7 +108,7 @@ Tensor full<DescTensor>(const IntArray& shape,
 
 template <>
 Tensor cast<DescTensor>(const Tensor& x, DataType dtype) {
-  Tensor out = empty<DescTensor>({}, DataType::FLOAT32, paddle::Place());
+  Tensor out = empty<DescTensor>({}, DataType::FLOAT32, Place());
   framework::BlockDesc* block = StaticCompositeContext::Instance().GetBlock();
   framework::OpDesc* op = block->AppendOp();
   op->SetType("cast");
@@ -137,7 +137,7 @@ Tensor slice<DescTensor>(const Tensor& input,
   op->SetInput(
       "Input",
       {std::static_pointer_cast<prim::DescTensor>(input.impl())->Name()});
-  auto out = empty<DescTensor>({}, phi::DataType::FLOAT32, paddle::Place());
+  auto out = empty<DescTensor>({}, phi::DataType::FLOAT32, Place());
   op->SetOutput(
       "Out", {std::static_pointer_cast<prim::DescTensor>(out.impl())->Name()});
   op->SetAttr("axes", unsafe_vector_cast<int64_t, int>(axes));

paddle/fluid/prim/api/manual_prim/utils/eager_utils.cc

@@ -21,31 +21,31 @@ namespace paddle::prim {
 template <>
 Tensor empty<Tensor>(const paddle::experimental::IntArray& shape,
                      phi::DataType dtype,
-                     const paddle::Place& place) {
+                     const Place& place) {
   if (dtype == phi::DataType::UNDEFINED) {
     dtype = phi::DataType::FLOAT32;
   }
   return empty_ad_func(shape, dtype, place);
 }
 
 template <>
-Tensor empty_like<Tensor>(const paddle::Tensor& x,
+Tensor empty_like<Tensor>(const Tensor& x,
                           phi::DataType dtype,
-                          const paddle::Place& place) {
+                          const Place& place) {
   if (dtype == phi::DataType::UNDEFINED) {
     dtype = phi::DataType::FLOAT32;
   }
   return empty_like_ad_func(x, dtype, place);
 }
 
 template <>
-void set_output<Tensor>(const paddle::Tensor& x_tmp, paddle::Tensor* x) {
+void set_output<Tensor>(const Tensor& x_tmp, Tensor* x) {
   x->set_impl(x_tmp.impl());
   x->set_autograd_meta(x_tmp.mutable_autograd_meta());
 }
 
 template <>
-void by_pass<Tensor>(const paddle::Tensor& x, Tensor* out) {
+void by_pass<Tensor>(const Tensor& x, Tensor* out) {
   set_output<Tensor>(x, out);
 }
 

paddle/fluid/prim/api/manual_prim/utils/static_utils.cc

@@ -24,11 +24,11 @@
 #include "paddle/phi/api/include/tensor.h"
 #include "paddle/phi/core/utils/data_type.h"
 namespace paddle::prim {
-using Tensor = paddle::Tensor;
+using Tensor = Tensor;
 template <>
 TEST_API Tensor empty<DescTensor>(const paddle::experimental::IntArray& shape,
                                   phi::DataType dtype,
-                                  const paddle::Place& place) {
+                                  const Place& place) {
   framework::VarDesc* new_var =
       StaticCompositeContext::Instance().GetBlock()->Var(
           StaticCompositeContext::Instance().GenerateUniqueName());
@@ -41,24 +41,24 @@ TEST_API Tensor empty<DescTensor>(const paddle::experimental::IntArray& shape,
 template <>
 Tensor empty_like<DescTensor>(const Tensor& x,
                               phi::DataType dtype,
-                              const paddle::Place& place) {
+                              const Place& place) {
   return empty<prim::DescTensor>(
-      paddle::experimental::IntArray(x.shape()), x.dtype(), paddle::Place());
+      paddle::experimental::IntArray(x.shape()), x.dtype(), Place());
 }
 
 template <>
-void set_output<DescTensor>(const paddle::Tensor& x_tmp, paddle::Tensor* x) {
+void set_output<DescTensor>(const Tensor& x_tmp, Tensor* x) {
   x->set_impl(x_tmp.impl());
 }
 
 template <>
-void by_pass<DescTensor>(const paddle::Tensor& x, paddle::Tensor* real_out) {
+void by_pass<DescTensor>(const Tensor& x, Tensor* real_out) {
   framework::BlockDesc* block = StaticCompositeContext::Instance().GetBlock();
   framework::OpDesc* op = block->AppendOp();
   op->SetType("assign");
   op->SetInput("X",
                {std::static_pointer_cast<prim::DescTensor>(x.impl())->Name()});
-  auto out = empty<DescTensor>({}, x.dtype(), paddle::Place());
+  auto out = empty<DescTensor>({}, x.dtype(), Place());
   op->SetOutput(
       "Out", {std::static_pointer_cast<prim::DescTensor>(out.impl())->Name()});
   op->CheckAttrs();