Merge branch 'paddle_grad_bug_fix_v2' of https://github.com/jim19930609/Paddle into add_double_grad_yamls_v1

Author: jim19930609

paddle/fluid/eager/auto_code_generator/eager_generator.cc

@@ -2484,7 +2484,8 @@ static std::string GenerateGradNodeHeaderContents(
  " std::string name() override { return \" GradNode%s \"; } \n "
  "\n"
  "std::shared_ptr<GradNodeBase> Copy() const override {{\n "
- " auto copied_node = std::make_shared<GradNode%s>(*this);\n "
+ " auto copied_node = std::shared_ptr<GradNode%s>(new "
+ "GradNode%s(*this));\n "
  " return copied_node;\n "
  "}}\n "
  "\n"
@@ -2601,7 +2602,7 @@ static std::string GenerateGradNodeHeaderContents(
 
  std::string grad_node_str = paddle::string::Sprintf(
  GRAD_NODE_TEMPLATE, op_type, op_type, op_type, op_type, op_type, op_type,
- op_type, clear_tensor_wrappers_str, op_type, op_type,
+ op_type, clear_tensor_wrappers_str, op_type, op_type, op_type,
  set_tensor_wrappers_str, set_attr_map_str, tensor_wrapper_members_str,
  attr_members_str);
 

paddle/fluid/eager/auto_code_generator/final_state_generator/eager_gen.py

@@ -128,7 +128,8 @@ class {} : public egr::GradNodeBase {{
  }}
 
  std::shared_ptr<GradNodeBase> Copy() const override {{
- auto copied_node = std::make_shared<{}>(*this);
+ auto copied_node = std::shared_ptr<{}>(new {}(*this));
+ 
  return copied_node;
  }}
  
@@ -1241,8 +1242,9 @@ def GenerateNodeDeclaration(self):
  self.node_declaration_str = NODE_DECLARATION_TEMPLATE.format(
  grad_node_name, grad_node_name, grad_node_name, grad_node_name,
  grad_node_name, clear_tensor_wrapper_str, grad_node_name,
- set_tensor_wrapper_methods_str, set_attribute_methods_str,
- tensor_wrapper_members_str, attribute_members_str)
+ grad_node_name, set_tensor_wrapper_methods_str,
+ set_attribute_methods_str, tensor_wrapper_members_str,
+ attribute_members_str)
 
  logging.info(f"Generated Node Declaration: {self.node_declaration_str}")
 

paddle/fluid/eager/custom_operator/custom_operator_node.h

@@ -69,7 +69,8 @@ class RunCustomOpNode : public GradNodeBase {
  void SetAttrs(const std::vector<paddle::any>& attr) { attrs_ = attr; }
 
  std::shared_ptr<GradNodeBase> Copy() const override {
- auto copied_node = std::make_shared<RunCustomOpNode>(*this);
+ auto copied_node =
+ std::shared_ptr<RunCustomOpNode>(new RunCustomOpNode(*this));
  return copied_node;
  }
 

paddle/fluid/eager/pylayer/py_layer_node.h

@@ -68,7 +68,8 @@ class GradNodePyLayer : public GradNodeBase {
  }
 
  std::shared_ptr<GradNodeBase> Copy() const override {
- auto copied_node = std::make_shared<GradNodePyLayer>(*this);
+ auto copied_node =
+ std::shared_ptr<GradNodePyLayer>(new GradNodePyLayer(*this));
  return copied_node;
  }
 

paddle/fluid/eager/tests/data_structure_tests/grad_node_test.h

@@ -53,7 +53,7 @@ class GradTestNode : public egr::GradNodeBase {
 
  std::shared_ptr<GradNodeBase> Copy() const override {
  {
- auto copied_node = std::make_shared<GradTestNode>(*this);
+ auto copied_node = std::shared_ptr<GradTestNode>(new GradTestNode(*this));
  return copied_node;
  }
  }

paddle/fluid/eager/to_static/run_program_op_node.h

@@ -465,7 +465,8 @@ class GradNodeRunProgram : public egr::GradNodeBase {
  }
 
  std::shared_ptr<GradNodeBase> Copy() const override {
- auto copied_node = std::make_shared<GradNodeRunProgram>(*this);
+ auto copied_node =
+ std::shared_ptr<GradNodeRunProgram>(new GradNodeRunProgram(*this));
  return copied_node;
  }
 

python/paddle/fluid/tests/unittests/test_imperative_double_grad.py

@@ -650,7 +650,7 @@ def test_matmul(self):
  grad_out = paddle.to_tensor(
  np.ones([3, 3]), stop_gradient=False, dtype='float32')
 
- out = _C_ops.final_state_matmul(x, y, False, False)
+ out = paddle.matmul(x, y, False, False)
  new_x_g, new_y_g = paddle.grad(
  [out], [x, y], [grad_out], retain_graph=True, create_graph=True)
  new_x_g.backward()