From ce9d2a9ec4daa8e0809eac7f44d731ed8189dc66 Mon Sep 17 00:00:00 2001
From: Feiyu Chan <chenfeiyu@baidu.com>
Date: Fri, 5 Aug 2022 21:47:48 +0800
Subject: [PATCH] fix 5 operator makers with typos which pass string literal to
 argument 'generated', remove generated as parameter of AddAttr (#44935)

---
 paddle/fluid/framework/op_proto_maker.h                       | 4 +---
 .../fluid/operators/detection/distribute_fpn_proposals_op.cc  | 2 +-
 paddle/fluid/operators/detection/generate_proposals_v2_op.cc  | 2 +-
 paddle/fluid/operators/detection/matrix_nms_op.cc             | 2 +-
 paddle/fluid/operators/graph_sample_neighbors_op.cc           | 2 +-
 paddle/fluid/operators/tdm_child_op.cc                        | 2 +-
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/paddle/fluid/framework/op_proto_maker.h b/paddle/fluid/framework/op_proto_maker.h
index 51aeed2e5d7..9cea78c92c6 100644
--- a/paddle/fluid/framework/op_proto_maker.h
+++ b/paddle/fluid/framework/op_proto_maker.h
@@ -96,12 +96,10 @@ class OpProtoAndCheckerMaker {
 
   template <typename T>
   TypedAttrChecker<T> &AddAttr(const std::string &name,
-                               const std::string &comment,
-                               bool generated = false) {
+                               const std::string &comment) {
     auto *attr = proto_->add_attrs();
     attr->set_name(name);
     attr->set_comment(comment);
-    attr->set_generated(generated);
     attr->set_type(AttrTypeID<T>());
     return op_checker_->AddAttrChecker<T>(name, attr);
   }
diff --git a/paddle/fluid/operators/detection/distribute_fpn_proposals_op.cc b/paddle/fluid/operators/detection/distribute_fpn_proposals_op.cc
index 26db517690e..ec8d8a71008 100644
--- a/paddle/fluid/operators/detection/distribute_fpn_proposals_op.cc
+++ b/paddle/fluid/operators/detection/distribute_fpn_proposals_op.cc
@@ -109,7 +109,7 @@ class DistributeFpnProposalsOpMaker : public framework::OpProtoAndCheckerMaker {
                  "The referring scale of FPN layer with"
                  " specified level");
     AddAttr<bool>("pixel_offset",
-                  "(bool, default True),",
+                  "(bool, default True),"
                   "If true, im_shape pixel offset is 1.")
         .SetDefault(true);
     AddComment(R"DOC(
diff --git a/paddle/fluid/operators/detection/generate_proposals_v2_op.cc b/paddle/fluid/operators/detection/generate_proposals_v2_op.cc
index e3b9219f249..eeda4c819e1 100644
--- a/paddle/fluid/operators/detection/generate_proposals_v2_op.cc
+++ b/paddle/fluid/operators/detection/generate_proposals_v2_op.cc
@@ -82,7 +82,7 @@ class GenerateProposalsV2OpMaker : public framework::OpProtoAndCheckerMaker {
                    "than this min_size.");
     AddAttr<float>("eta", "The parameter for adaptive NMS.");
     AddAttr<bool>("pixel_offset",
-                  "(bool, default True),",
+                  "(bool, default True),"
                   "If true, im_shape pixel offset is 1.")
         .SetDefault(true);
     AddComment(R"DOC(
diff --git a/paddle/fluid/operators/detection/matrix_nms_op.cc b/paddle/fluid/operators/detection/matrix_nms_op.cc
index 12fb9cb7dbc..1c0d19d9d59 100644
--- a/paddle/fluid/operators/detection/matrix_nms_op.cc
+++ b/paddle/fluid/operators/detection/matrix_nms_op.cc
@@ -85,7 +85,7 @@ class MatrixNMSOpMaker : public framework::OpProtoAndCheckerMaker {
         .SetDefault(false);
     AddAttr<float>("gaussian_sigma",
                    "(float) "
-                   "Sigma for Gaussian decreasing function, only takes effect ",
+                   "Sigma for Gaussian decreasing function, only takes effect "
                    "when 'use_gaussian' is enabled.")
         .SetDefault(2.);
     AddOutput("Out",
diff --git a/paddle/fluid/operators/graph_sample_neighbors_op.cc b/paddle/fluid/operators/graph_sample_neighbors_op.cc
index b44a2823732..14f17f77dcb 100644
--- a/paddle/fluid/operators/graph_sample_neighbors_op.cc
+++ b/paddle/fluid/operators/graph_sample_neighbors_op.cc
@@ -50,7 +50,7 @@ class GraphSampleNeighborsOpMaker : public framework::OpProtoAndCheckerMaker {
     AddOutput("Out_Eids", "The eids of the sample edges");
     AddAttr<int>(
         "sample_size",
-        "The sample size of graph sample neighbors method. ",
+        "The sample size of graph sample neighbors method. "
         "Set default value as -1, means return all neighbors of nodes.")
         .SetDefault(-1);
     AddAttr<bool>("return_eids",
diff --git a/paddle/fluid/operators/tdm_child_op.cc b/paddle/fluid/operators/tdm_child_op.cc
index 2dab74838a0..1e98035039f 100644
--- a/paddle/fluid/operators/tdm_child_op.cc
+++ b/paddle/fluid/operators/tdm_child_op.cc
@@ -34,7 +34,7 @@ class TDMChildOpMaker : public framework::OpProtoAndCheckerMaker {
         "information in the following format: item_id(shape=1), "
         "layer_id(shape=1), parent_id(shape=1), child_id(shape=child_nums)");
     AddAttr<int>("child_nums",
-                 "child_nums(int)",
+                 "child_nums(int)"
                  "The child nums of one node, if the node hasn't enough child, "
                  "it should padding 0 until child nums equal to child_nums");
     AddOutput("Child",
-- 
GitLab