Merge branch 'refactor_dygraph_v1' of https://github.com/JiabinYang/P…

…addle into api_code_gene
PaddlePaddle · Nov 2, 2021 · 5f8cd21 · 5f8cd21 · paddle-bot-old · Nov 2, 2021
2 parents 6072d3a + 0483d22
commit 5f8cd21
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/paddle/fluid/eager/autocodegen/eager_generator.cc b/paddle/fluid/eager/autocodegen/eager_generator.cc
@@ -852,11 +852,18 @@ static std::pair<std::string, std::string> GenerateForwardFunctionContents(
       std::string arg_str =
           paddle::string::Sprintf(FWD_NUM_ARG_TEMPLATE, outnum);
       dygraph_function_args_str += arg_str;
+      const char* FWD_OUTS_CONTENT_TEMPLATE =
+          "{ \"%s\", egr::ConstructDuplicableOutput(%s) },";
+      outs_contents_str += paddle::string::Sprintf(FWD_OUTS_CONTENT_TEMPLATE,
+                                                   output_name, outnum);
+    } else {
+      const char* FWD_OUTS_CONTENT_TEMPLATE =
+          "{ \"%s\", "
+          "{std::make_shared<egr::EagerTensor>(egr::Controller::Instance()."
+          "GenerateUniqueName())}},";
+      outs_contents_str += paddle::string::Sprintf(FWD_OUTS_CONTENT_TEMPLATE,
+                                                   output_name, outnum);
     }
-    const char* FWD_OUTS_CONTENT_TEMPLATE =
-        "{ \"%s\", egr::ConstructDuplicableOutput(%s) },";
-    outs_contents_str +=
-        paddle::string::Sprintf(FWD_OUTS_CONTENT_TEMPLATE, output_name, outnum);
   }
   if (outs_contents_str.size() > 0)
     outs_contents_str.pop_back();  // Remove trailing ","

diff --git a/paddle/fluid/eager/utils.cc b/paddle/fluid/eager/utils.cc
@@ -25,9 +25,9 @@ std::vector<std::shared_ptr<egr::EagerTensor>> SyncToVars(
     const egr::EagerTensor& tensor) {
   // TODO(jiabin): No const cast here. We should call SyncToVar in Python_C
   // wrapper
-  auto egr_tensor = std::make_shared<EagerTensor>(tensor);
-  egr_tensor->SyncToVar(paddle::framework::proto::VarType_Type_LOD_TENSOR);
-  return {egr_tensor};
+  const_cast<EagerTensor*>(&tensor)->SyncToVar(
+      paddle::framework::proto::VarType_Type_LOD_TENSOR);
+  return {std::make_shared<EagerTensor>(tensor)};
 }
 
 std::vector<std::shared_ptr<egr::EagerTensor>> SyncToVars(
@@ -38,8 +38,9 @@ std::vector<std::shared_ptr<egr::EagerTensor>> SyncToVars(
   size_t num = tensors.size();
   res.reserve(num);
   for (size_t i = 0; i < num; i++) {
+    const_cast<EagerTensor*>(&(tensors[i]))
+        ->SyncToVar(paddle::framework::proto::VarType_Type_LOD_TENSOR);
     res.emplace_back(new EagerTensor(tensors[i]));
-    res.back()->SyncToVar(paddle::framework::proto::VarType_Type_LOD_TENSOR);
   }
   return res;
 }
@@ -49,9 +50,8 @@ std::vector<std::shared_ptr<egr::EagerTensor>> SyncToTensors(
     const egr::EagerTensor& tensor) {
   // TODO(jiabin): No const cast here. We should call SyncToTensor in Python_C
   // wrapper
-  auto egr_tensor = std::make_shared<EagerTensor>(tensor);
-  egr_tensor->SyncToTensor();
-  return {egr_tensor};
+  const_cast<EagerTensor*>(&tensor)->SyncToTensor();
+  return {std::make_shared<EagerTensor>(tensor)};
 }
 
 std::vector<std::shared_ptr<egr::EagerTensor>> SyncToTensors(
@@ -62,8 +62,8 @@ std::vector<std::shared_ptr<egr::EagerTensor>> SyncToTensors(
   size_t num = tensors.size();
   res.reserve(num);
   for (size_t i = 0; i < num; i++) {
+    const_cast<EagerTensor*>(&(tensors[i]))->SyncToTensor();
     res.emplace_back(new EagerTensor(tensors[i]));
-    res.back()->SyncToTensor();
   }
   return res;
 }

diff --git a/paddle/fluid/pybind/eager.cc b/paddle/fluid/pybind/eager.cc
@@ -47,7 +47,7 @@ PyObject* eagertensor_new(PyTypeObject* type, PyObject* args,
 }
 
 static void eagertensor_dealloc(EagerTensorObject* self) {
-  // TODO(wanghuancoder): Call destructor here.
+  self->eagertensor.~EagerTensor();
   Py_TYPE(self)->tp_free(reinterpret_cast<PyObject*>(self));
 }
 

diff --git a/paddle/fluid/pybind/eager_utils.cc b/paddle/fluid/pybind/eager_utils.cc
@@ -158,6 +158,7 @@ PyObject* ToPyObject(const egr::EagerTensor& value) {
   PyObject* obj = pEagerTensorType->tp_alloc(pEagerTensorType, 0);
   if (obj) {
     auto v = reinterpret_cast<EagerTensorObject*>(obj);
+    new (&(v->eagertensor)) egr::EagerTensor();
     v->eagertensor = value;
   } else {
     PADDLE_THROW(platform::errors::Fatal(
@@ -223,6 +224,7 @@ PyObject* ToPyObject(const std::vector<egr::EagerTensor>& value) {
     PyObject* obj = pEagerTensorType->tp_alloc(pEagerTensorType, 0);
     if (obj) {
       auto v = reinterpret_cast<EagerTensorObject*>(obj);
+      new (&(v->eagertensor)) egr::EagerTensor();
       v->eagertensor = value[i];
     } else {
       PADDLE_THROW(platform::errors::Fatal(