PaddlePaddle
diff --git a/‎paddle/fluid/eager/auto_code_generator/eager_generator.cc
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎paddle/fluid/eager/auto_code_generator/eager_generator.cc
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎paddle/fluid/eager/autograd_meta.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/eager/autograd_meta.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/imperative/basic_engine.cc
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎paddle/fluid/imperative/basic_engine.cc
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎paddle/fluid/imperative/dygraph_grad_maker.h
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions b/‎paddle/fluid/imperative/dygraph_grad_maker.h
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/‎paddle/fluid/imperative/gradient_accumulator.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/imperative/gradient_accumulator.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/fluid/imperative/gradient_accumulator.h
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/imperative/gradient_accumulator.h
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/fluid/imperative/layer.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/imperative/layer.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/imperative/layer.h
Copy file name to clipboard
+11-11Lines changed: 11 additions & 11 deletions b/‎paddle/fluid/imperative/layer.h
Copy file name to clipboard
+11-11Lines changed: 11 additions & 11 deletions
diff --git a/‎paddle/fluid/imperative/partial_grad_engine.cc
Copy file name to clipboard
+10-10Lines changed: 10 additions & 10 deletions b/‎paddle/fluid/imperative/partial_grad_engine.cc
Copy file name to clipboard
+10-10Lines changed: 10 additions & 10 deletions
diff --git a/‎paddle/fluid/imperative/reducer.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/imperative/reducer.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
@@ -829,7 +829,7 @@ static bool CollectGradInformationFromOpInfo(
     for (size_t i = 0; i < NUM_CREATED_DUP_INPUTS; i++) {
       ins[in_name].emplace_back(std::make_shared<paddle::imperative::VarBase>(
           "auto_" + in_name + "_" + std::to_string(i)));
-      ins[in_name][i]->SetOverridedStopGradient(false);
+      ins[in_name][i]->SetOverriddenStopGradient(false);
       ins[in_name][i]->MutableVar()->GetMutable<phi::DenseTensor>();
     }
   } else {
@@ -853,7 +853,7 @@ static bool CollectGradInformationFromOpInfo(
 
       ins[in_name] = {
           std::make_shared<paddle::imperative::VarBase>("auto_" + in_name)};
-      ins[in_name][0]->SetOverridedStopGradient(false);
+      ins[in_name][0]->SetOverriddenStopGradient(false);
       ins[in_name][0]->MutableVar()->GetMutable<phi::DenseTensor>();
     }
   }
@@ -871,7 +871,7 @@ static bool CollectGradInformationFromOpInfo(
     // however, simply identifying the slot name order would be enough
     outs[out_name] = {
         std::make_shared<paddle::imperative::VarBase>("auto_" + out_name)};
-    outs[out_name][0]->SetOverridedStopGradient(false);
+    outs[out_name][0]->SetOverriddenStopGradient(false);
     outs[out_name][0]->MutableVar()->GetMutable<phi::DenseTensor>();
   }
   VLOG(6) << "Prepared Forward Outs Map, size = " << outs.size();
 
@@ -43,7 +43,7 @@ using AbstractAutogradMeta = paddle::AbstractAutogradMeta;
  * Hooks are some computation logic which only attached with backward operation,
  * it registered by user and run before accumulator.
  *
- * 4. overrided_stop_gradient_
+ * 4. overridden_stop_gradient_
  * This member is used to finish some auto-prune related work, which indicate
  * user set stop_gradient should override the result indicated by framework.
  * All non-parameter tensor's stop_gradient properties should be true. We will
 
@@ -87,7 +87,7 @@ void BasicEngine::Init(
       var->GradVarBase()->SetGraphIsFreed(true);
     }
 
-    if (init_node == nullptr || var->OverridedStopGradient()) {
+    if (init_node == nullptr || var->OverriddenStopGradient()) {
       VLOG(3) << "Skip auto grad since there is no grad op for var or loss is "
                  "stop_gradient=True: "
               << var->Name();
@@ -106,7 +106,7 @@ void BasicEngine::Init(
         var->GradVarBase()->MutableVar()->GetMutable<phi::DenseTensor>();
     VLOG(6) << "init loss grad:" << var->GradVarBase()->Name()
             << " as stop_gradient false";
-    var->GradVarBase()->InnerSetOverridedStopGradient(false);
+    var->GradVarBase()->InnerSetOverriddenStopGradient(false);
     auto* dev_ctx =
         platform::DeviceContextPool::Instance().Get(fwd_var.place());
     if (grad_tensor == nullptr) {
@@ -508,7 +508,7 @@ void BasicEngine::Execute() {
             }
           }
 
-          if (var->OverridedStopGradient() || iter->second->RefCnt() > 1) {
+          if (var->OverriddenStopGradient() || iter->second->RefCnt() > 1) {
             auto tmp_var = std::make_shared<VariableWrapper>(var->Name());
             tmp_var->SetType(var->Type());
             tmp_var->SetForwardDataType(var->ForwardDataType());
 
@@ -238,7 +238,7 @@ class TracedGradOp {
     if (kRole == TracedVarRole::kBackward) {
       for (auto& var : vars) {
         VLOG(6) << "SetInput var name: " << var->Name();
-        if (var && !var->OverridedStopGradient()) {
+        if (var && !var->OverriddenStopGradient()) {
           var->SetGraphIsFreed(false);
           auto dirty_grad_node = var->GradNode();
           if (dirty_grad_node) {
@@ -265,11 +265,11 @@ class TracedGradOp {
     }
 
     if (kRole == TracedVarRole::kBackward) {
-      if (vars.size() == 1 && vars.front()->OverridedStopGradient()) {
+      if (vars.size() == 1 && vars.front()->OverriddenStopGradient()) {
         return;
       } else {
         for (auto& var : vars) {
-          if (var && !var->OverridedStopGradient() && var->GradNode()) {
+          if (var && !var->OverriddenStopGradient() && var->GradNode()) {
             VLOG(6) << "SetOutput var name: " << var->Name();
             if (map_dirty_grad_node_.find(var) != map_dirty_grad_node_.end()) {
               // Because inplace var isn't a leaf var, it should have
@@ -334,7 +334,7 @@ class TracedGradOp {
     bool has_valid = false;
     for (auto& var : vars) {
       if (UNLIKELY(!var || (kRole == TracedVarRole::kBackward &&
-                            var->OverridedStopGradient()))) {
+                            var->OverriddenStopGradient()))) {
         result.emplace_back();
       } else {
         auto var_wrapper = SnapshotVarWrapper(var->SharedVar());
 
@@ -657,7 +657,7 @@ void EagerGradientAccumulator::SumGrad(std::shared_ptr<VariableWrapper> var,
 
   auto* dst_var = Var();
   platform::Place place = GetPlaceOfVar(var);
-  if (!dst_var->OverridedStopGradient()) {
+  if (!dst_var->OverriddenStopGradient()) {
     if (CurCnt() == 0) {
       MoveOrCopyVar(dst_var->MutableVar(), var->MutableVar(), unchange_input);
     } else {
@@ -704,7 +704,7 @@ void SortedGradientAccumulator::SumGrad(std::shared_ptr<VariableWrapper> var,
                                         bool unchange_input) {
   auto* dst_var = Var();
   platform::Place place = GetPlaceOfVar(var);
-  if (!dst_var->OverridedStopGradient()) {
+  if (!dst_var->OverriddenStopGradient()) {
     if (ref_cnt_ == 1) {
       MoveOrCopyVar(dst_var->MutableVar(),
                     var->MutableVar(),
 
@@ -48,8 +48,8 @@ class GradientAccumulator {
       inner_var_->SetType(var->Type());
       inner_var_->SetDataType(var->DataType());
       inner_var_->SetForwardDataType(var->ForwardDataType());
-      inner_var_->InnerSetOverridedStopGradient(
-          var->InnerOverridedStopGradient());
+      inner_var_->InnerSetOverriddenStopGradient(
+          var->InnerOverriddenStopGradient());
       VLOG(6) << " Create inner grad var for (" << var->Name()
               << ") to store result of this Graph";
     }
 
@@ -363,7 +363,7 @@ void VarBase::CopyFrom(const VarBase& src, const bool blocking) {
     SetDataType(src.DataType());
     SetType(src.Type());
     SetPersistable(src.Persistable());
-    InnerSetOverridedStopGradient(src.OverridedStopGradient());
+    InnerSetOverriddenStopGradient(src.OverriddenStopGradient());
   }
 
   platform::Place place = src.Place();
 
@@ -125,7 +125,7 @@ class VarBase {
       }
       // NOTE(zhiqiu): we should keep grad_var_'s stop_gradient property
       // same as fwd varbase
-      grad_var_->SetOverridedStopGradient(var_->InnerOverridedStopGradient());
+      grad_var_->SetOverriddenStopGradient(var_->InnerOverriddenStopGradient());
     }
     return grad_var_;
   }
@@ -146,26 +146,26 @@ class VarBase {
 
   bool IsLeaf() const { return var_->IsLeaf(); }
 
-  void SetOverridedStopGradient(bool stop_gradient) {
-    var_->SetOverridedStopGradient(stop_gradient);
+  void SetOverriddenStopGradient(bool stop_gradient) {
+    var_->SetOverriddenStopGradient(stop_gradient);
     if (grad_var_) {
-      grad_var_->SetOverridedStopGradient(stop_gradient);
+      grad_var_->SetOverriddenStopGradient(stop_gradient);
     }
   }
 
-  bool OverridedStopGradient() const { return var_->OverridedStopGradient(); }
+  bool OverriddenStopGradient() const { return var_->OverriddenStopGradient(); }
 
-  void InnerSetOverridedStopGradient(bool stop_gradient) {
-    if (InnerOverridedStopGradient() == -1) {
-      var_->InnerSetOverridedStopGradient(stop_gradient);
+  void InnerSetOverriddenStopGradient(bool stop_gradient) {
+    if (InnerOverriddenStopGradient() == -1) {
+      var_->InnerSetOverriddenStopGradient(stop_gradient);
       if (grad_var_) {
-        grad_var_->InnerSetOverridedStopGradient(stop_gradient);
+        grad_var_->InnerSetOverriddenStopGradient(stop_gradient);
       }
     }
   }
 
-  int InnerOverridedStopGradient() const {
-    return var_->InnerOverridedStopGradient();
+  int InnerOverriddenStopGradient() const {
+    return var_->InnerOverriddenStopGradient();
   }
 
   void SetPersistable(bool persistable) { var_->SetPersistable(persistable); }
 
@@ -87,7 +87,7 @@ static void GetGraphInfoBetweenTargets(
     PADDLE_ENFORCE_NOT_NULL(
         output_target,
         platform::errors::NotFound("output_target must not be nullptr"));
-    if (output_target->OverridedStopGradient() ||
+    if (output_target->OverriddenStopGradient() ||
         output_target->GradVarBase() == nullptr ||
         output_target->GradVarBase()->GradNode() == nullptr) {
       VLOG(10) << output_target->Name()
@@ -365,7 +365,7 @@ class GradientAccumulationInfo {
     if (total_ref_cnt_ > 1) {
       if (!grad_var_) {
         grad_var_ = std::make_shared<VarBase>(true, mapped_grad_var_->Name());
-        grad_var_->SetOverridedStopGradient(false);
+        grad_var_->SetOverriddenStopGradient(false);
         if (sort_gradient_) {
           accumulator_ = std::make_unique<SortedGradientAccumulator>(
               grad_var_->SharedVar().get());
@@ -685,7 +685,7 @@ PartialGradTask::PartialGradTask(
                             platform::errors::PermissionDenied(
                                 "Variable inside outputs should not be null"));
     PADDLE_ENFORCE_EQ(
-        output->GradVarBase() && !output->OverridedStopGradient(),
+        output->GradVarBase() && !output->OverriddenStopGradient(),
         true,
         platform::errors::PermissionDenied(
             "Variable %s inside outputs has no gradient", output->Name()));
@@ -709,7 +709,7 @@ PartialGradTask::PartialGradTask(
                             platform::errors::PermissionDenied(
                                 "Variable inside inputs should not be null"));
     PADDLE_ENFORCE_EQ(
-        input->GradVarBase() && !input->OverridedStopGradient(),
+        input->GradVarBase() && !input->OverriddenStopGradient(),
         true,
         platform::errors::PermissionDenied(
             "Variable %s inside inputs has no gradient", input->Name()));
@@ -809,7 +809,7 @@ PartialGradTask::PartialGradTask(
                         platform::errors::PermissionDenied(
                             "grad_outputs contain var inside no_grad_set"));
 
-      if (out_grad_var->OverridedStopGradient()) {
+      if (out_grad_var->OverriddenStopGradient()) {
         VLOG(10) << "Grad var " << out_grad_var->Name()
                  << " should reset stop gradient";
         reset_stop_gradient_vars_.emplace_back(out_grad_var);
@@ -818,7 +818,7 @@ PartialGradTask::PartialGradTask(
       unchange_input = true;
     }
 
-    out_grad_var->SetOverridedStopGradient(false);
+    out_grad_var->SetOverriddenStopGradient(false);
     auto grad_accumulator_iter = grad_accumulators_.find(mapped_out_grad_var);
     if (grad_accumulator_iter == grad_accumulators_.end()) {
       ready_grad_vars_.Set(mapped_out_grad_var,
@@ -946,7 +946,7 @@ void PartialGradTask::RunEachOp(OpBase *op) {
                                 grad_var.get()));
 
           auto new_grad_var = std::make_shared<VarBase>(true, grad_var->Name());
-          new_grad_var->SetOverridedStopGradient(false);
+          new_grad_var->SetOverriddenStopGradient(false);
           new_grad_var->SetForwardDataType(grad_var->ForwardDataType());
           if (new_grad_var_iter->second->TotalRefCnt() > 1) {
             grads_to_accumulate_.emplace_back(new_grad_var_iter->second.get(),
@@ -1013,7 +1013,7 @@ void PartialGradTask::RunEachOp(OpBase *op) {
     if (!partial_grad_grads.empty()) {
       auto sum_grad_var_grad =
           accumulator_info->GradVarBase()->MutableGradVarBase();
-      sum_grad_var_grad->SetOverridedStopGradient(false);
+      sum_grad_var_grad->SetOverriddenStopGradient(false);
 
       auto assign_node = std::make_shared<GradOpNode>();
       sum_grad_var_grad->SetGradNode(assign_node);
@@ -1101,7 +1101,7 @@ std::vector<std::shared_ptr<VarBase>> PartialGradTask::CreateResult() {
     auto iter = input_target_grads_.find(original_grad_var);
     if (iter != input_target_grads_.end()) {
       auto ready_var = ready_grad_vars_.GetTarget(original_grad_var);
-      ready_var->SetOverridedStopGradient(!create_graph_);
+      ready_var->SetOverriddenStopGradient(!create_graph_);
       result.emplace_back(std::move(ready_var));
     } else {  // return None if it does not appear in the graph
       PADDLE_ENFORCE_EQ(allow_unused_,
@@ -1118,7 +1118,7 @@ std::vector<std::shared_ptr<VarBase>> PartialGradTask::CreateResult() {
   for (auto &weak_var : reset_stop_gradient_vars_) {
     if (auto var = weak_var.lock()) {
       VLOG(10) << "Reset " << var->Name() << " stop gradient";
-      var->SetOverridedStopGradient(!var->OverridedStopGradient());
+      var->SetOverriddenStopGradient(!var->OverriddenStopGradient());
     }
   }
 
 
@@ -515,7 +515,7 @@ void Reducer::TraverseBackwardGraph(
 
   for (const auto &output : outputs) {
     const auto &grad_node = output->GradVarBase()->GradNode();
-    if (grad_node == nullptr || output->OverridedStopGradient()) {
+    if (grad_node == nullptr || output->OverriddenStopGradient()) {
       VLOG(3) << "Skip auto grad since there is no grad op or output is "
                  "stop_gradient=True: "
               << output->Name();
@@ -540,7 +540,7 @@ void Reducer::TraverseBackwardGraph(
           continue;
         }
         for (auto &var : pair.second) {
-          if (!var || var->OverridedStopGradient()) {
+          if (!var || var->OverriddenStopGradient()) {
             continue;
           } else {
             var_visited.insert(var.get());
Original file line number	Diff line number	Diff line change
`@@ -829,7 +829,7 @@ static bool CollectGradInformationFromOpInfo(`
`829`	`829`	`for (size_t i = 0; i < NUM_CREATED_DUP_INPUTS; i++) {`
`830`	`830`	`ins[in_name].emplace_back(std::make_shared<paddle::imperative::VarBase>(`
`831`	`831`	`"auto_" + in_name + "_" + std::to_string(i)));`
`832`		`- ins[in_name][i]->SetOverridedStopGradient(false);`
	`832`	`+ ins[in_name][i]->SetOverriddenStopGradient(false);`
`833`	`833`	`ins[in_name][i]->MutableVar()->GetMutable<phi::DenseTensor>();`
`834`	`834`	`}`
`835`	`835`	`} else {`
`@@ -853,7 +853,7 @@ static bool CollectGradInformationFromOpInfo(`
`853`	`853`
`854`	`854`	`ins[in_name] = {`
`855`	`855`	`std::make_shared<paddle::imperative::VarBase>("auto_" + in_name)};`
`856`		`- ins[in_name][0]->SetOverridedStopGradient(false);`
	`856`	`+ ins[in_name][0]->SetOverriddenStopGradient(false);`
`857`	`857`	`ins[in_name][0]->MutableVar()->GetMutable<phi::DenseTensor>();`
`858`	`858`	`}`
`859`	`859`	`}`
`@@ -871,7 +871,7 @@ static bool CollectGradInformationFromOpInfo(`
`871`	`871`	`// however, simply identifying the slot name order would be enough`
`872`	`872`	`outs[out_name] = {`
`873`	`873`	`std::make_shared<paddle::imperative::VarBase>("auto_" + out_name)};`
`874`		`- outs[out_name][0]->SetOverridedStopGradient(false);`
	`874`	`+ outs[out_name][0]->SetOverriddenStopGradient(false);`
`875`	`875`	`outs[out_name][0]->MutableVar()->GetMutable<phi::DenseTensor>();`
`876`	`876`	`}`
`877`	`877`	`VLOG(6) << "Prepared Forward Outs Map, size = " << outs.size();`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ using AbstractAutogradMeta = paddle::AbstractAutogradMeta;`
`43`	`43`	`* Hooks are some computation logic which only attached with backward operation,`
`44`	`44`	`* it registered by user and run before accumulator.`
`45`	`45`	`*`
`46`		`- * 4. overrided_stop_gradient_`
	`46`	`+ * 4. overridden_stop_gradient_`
`47`	`47`	`* This member is used to finish some auto-prune related work, which indicate`
`48`	`48`	`* user set stop_gradient should override the result indicated by framework.`
`49`	`49`	`* All non-parameter tensor's stop_gradient properties should be true. We will`
Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ void VarBase::CopyFrom(const VarBase& src, const bool blocking) {`
`363`	`363`	`SetDataType(src.DataType());`
`364`	`364`	`SetType(src.Type());`
`365`	`365`	`SetPersistable(src.Persistable());`
`366`		`- InnerSetOverridedStopGradient(src.OverridedStopGradient());`
	`366`	`+ InnerSetOverriddenStopGradient(src.OverriddenStopGradient());`
`367`	`367`	`}`
`368`	`368`
`369`	`369`	`platform::Place place = src.Place();`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ class VarBase {`
`125`	`125`	`}`
`126`	`126`	`// NOTE(zhiqiu): we should keep grad_var_'s stop_gradient property`
`127`	`127`	`// same as fwd varbase`
`128`		`- grad_var_->SetOverridedStopGradient(var_->InnerOverridedStopGradient());`
	`128`	`+ grad_var_->SetOverriddenStopGradient(var_->InnerOverriddenStopGradient());`
`129`	`129`	`}`
`130`	`130`	`return grad_var_;`
`131`	`131`	`}`
`@@ -146,26 +146,26 @@ class VarBase {`
`146`	`146`
`147`	`147`	`bool IsLeaf() const { return var_->IsLeaf(); }`
`148`	`148`
`149`		`- void SetOverridedStopGradient(bool stop_gradient) {`
`150`		`- var_->SetOverridedStopGradient(stop_gradient);`
	`149`	`+ void SetOverriddenStopGradient(bool stop_gradient) {`
	`150`	`+ var_->SetOverriddenStopGradient(stop_gradient);`
`151`	`151`	`if (grad_var_) {`
`152`		`- grad_var_->SetOverridedStopGradient(stop_gradient);`
	`152`	`+ grad_var_->SetOverriddenStopGradient(stop_gradient);`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`
`156`		`- bool OverridedStopGradient() const { return var_->OverridedStopGradient(); }`
	`156`	`+ bool OverriddenStopGradient() const { return var_->OverriddenStopGradient(); }`
`157`	`157`
`158`		`- void InnerSetOverridedStopGradient(bool stop_gradient) {`
`159`		`- if (InnerOverridedStopGradient() == -1) {`
`160`		`- var_->InnerSetOverridedStopGradient(stop_gradient);`
	`158`	`+ void InnerSetOverriddenStopGradient(bool stop_gradient) {`
	`159`	`+ if (InnerOverriddenStopGradient() == -1) {`
	`160`	`+ var_->InnerSetOverriddenStopGradient(stop_gradient);`
`161`	`161`	`if (grad_var_) {`
`162`		`- grad_var_->InnerSetOverridedStopGradient(stop_gradient);`
	`162`	`+ grad_var_->InnerSetOverriddenStopGradient(stop_gradient);`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`
`167`		`- int InnerOverridedStopGradient() const {`
`168`		`- return var_->InnerOverridedStopGradient();`
	`167`	`+ int InnerOverriddenStopGradient() const {`
	`168`	`+ return var_->InnerOverriddenStopGradient();`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`void SetPersistable(bool persistable) { var_->SetPersistable(persistable); }`