refine, test=develop

Author: wanghuancoder

paddle/fluid/framework/attribute.h

@@ -423,7 +423,7 @@ class OpAttrChecker {
     }
   }
 
-  AttributeMap GetAttrsDefaultValuesMap() const {
+  AttributeMap GetDefaultAttrsMap() const {
     AttributeMap default_values_map;
     for (const auto& checker : attr_checkers_) {
       checker(&default_values_map, true, false);

paddle/fluid/framework/grad_op_desc_maker.h

@@ -241,7 +241,7 @@ class SingleGradOpMaker<imperative::OpBase>
     {
       imperative::TracedGradOp traced_grad_op(node);
       try {
-        traced_grad_op.SetAttrDefaultMap(this->DefaultAttrsMap());
+        traced_grad_op.SetDefaultAttrsMap(this->DefaultAttrsMap());
         this->Apply(&traced_grad_op);
       } catch (platform::EnforceNotMet& exception) {
         framework::AppendErrorOpHint(traced_grad_op.Type(), &exception);

paddle/fluid/framework/ir/op_compat_sensible_pass.cc

@@ -61,7 +61,7 @@ AttrCompat& AttrCompat::IsLeftDefault() {
     return *this;
   }
   const OpInfo& op_info = OpInfoMap::Instance().Get(op_name);
-  const AttributeMap attrs = op_info.Checker()->GetAttrsDefaultValuesMap();
+  const AttributeMap attrs = op_info.Checker()->GetDefaultAttrsMap();
   if (attrs.find(attr_name_) == attrs.end()) {
     LOG(WARNING) << "Op (" << op_name << ") has no default attr:" << attr_name_;
     conditions_.emplace_back([](const Attribute& attr) { return false; });

paddle/fluid/framework/type_defs.h

@@ -71,7 +71,7 @@ using DygraphGradOpMakerFN =
         const imperative::NameVarBaseMap& /*var_base_map_in*/,
         const imperative::NameVarBaseMap& /*var_base_map_out*/,
         const framework::AttributeMap& /*attributes*/,
-        const framework::AttributeMap& /*attributes default*/,
+        const framework::AttributeMap& /*default attributes*/,
         const std::map<std::string, std::string>& /*inplace_map*/)>;
 
 using InferVarTypeFN =

paddle/fluid/imperative/dygraph_grad_maker.h

@@ -295,8 +295,8 @@ class TracedGradOp {
     return op_->SetAttrMap(attrs);
   }
 
-  void SetAttrDefaultMap(const framework::AttributeMap& attrs) {
-    return op_->SetAttrDefaultMap(attrs);
+  void SetDefaultAttrsMap(const framework::AttributeMap& attrs) {
+    return op_->SetDefaultAttrsMap(attrs);
   }
 
   void SetAttr(const std::string& name, const framework::Attribute& v) {

paddle/fluid/imperative/infer_shape_context.h

@@ -35,12 +35,12 @@ class DygraphInferShapeContext : public framework::InferShapeContext {
   DygraphInferShapeContext(const NameVarMap<VarType>* in,
                            const NameVarMap<VarType>* out,
                            const framework::AttributeMap* attr,
-                           const framework::AttributeMap* attr_default,
+                           const framework::AttributeMap* default_attr,
                            const std::string op_type)
       : var_base_map_in_(in),
         var_base_map_out_(out),
         attrs_(attr),
-        default_attrs_(attr_default),
+        default_attrs_(default_attr),
         op_type_(op_type) {}
 
   bool HasInput(const std::string& name) const override {

paddle/fluid/imperative/infer_var_type_context.h

@@ -33,12 +33,12 @@ class RuntimeInferVarTypeContext : public framework::InferVarTypeContext {
   RuntimeInferVarTypeContext(const NameVarMap<VarType>& inputs,
                              const NameVarMap<VarType>& outputs,
                              const framework::AttributeMap& attrs_map,
-                             const framework::AttributeMap& attrs_map_default)
+                             const framework::AttributeMap& default_attrs_map)
       : InferVarTypeContext(nullptr, nullptr),
         inputs_(inputs),
         outputs_(outputs),
         attrs_(attrs_map),
-        default_attrs_(attrs_map_default) {}
+        default_attrs_(default_attrs_map) {}
 
   virtual ~RuntimeInferVarTypeContext() {}
 

paddle/fluid/imperative/op_base.h

@@ -103,7 +103,7 @@ class OpBase {
 
   void SetAttrMap(const framework::AttributeMap& attrs) { attrs_ = attrs; }
 
-  void SetAttrDefaultMap(const framework::AttributeMap& default_attrs) {
+  void SetDefaultAttrsMap(const framework::AttributeMap& default_attrs) {
     default_attrs_ = &default_attrs;
   }
 

paddle/fluid/imperative/tests/test_layer.cc

@@ -46,9 +46,9 @@ class TestRuntimeInferVarTypeContext
   TestRuntimeInferVarTypeContext(
       const NameVarMap<VarType>& inputs, const NameVarMap<VarType>& outputs,
       const framework::AttributeMap& attrs_map,
-      const framework::AttributeMap& attrs_map_default)
+      const framework::AttributeMap& default_attrs_map)
       : RuntimeInferVarTypeContext<VarType>(inputs, outputs, attrs_map,
-                                            attrs_map_default) {}
+                                            default_attrs_map) {}
 
   bool HasVar(const std::string& name) const {
     return RuntimeInferVarTypeContext<VarType>::HasVar(name);

paddle/fluid/pybind/pybind.cc

@@ -1308,7 +1308,7 @@ All parameter, weight, gradient are variables in Paddle.
           if (info != nullptr) {
             if (info->HasOpProtoAndChecker()) {
               auto op_checker = info->Checker();
-              res = op_checker->GetAttrsDefaultValuesMap();
+              res = op_checker->GetDefaultAttrsMap();
             }
           }
           return res;