support dynamic created attr (PaddlePaddle#40)

YuanRisheng · web-flow · commit 16d595c8fb73 · 2022-10-21T04:57:32.000-05:00
diff --git a/paddle/fluid/framework/op_desc.cc b/paddle/fluid/framework/op_desc.cc
@@ -495,11 +495,17 @@ OpDesc::OpDesc(const proto::OpDesc &desc, BlockDesc *block)
         attr_type != proto::AttrType::BLOCKS &&
         attr_type != proto::AttrType::VAR &&
         attr_type != proto::AttrType::VARS) {
-      auto iter = runtime_attrs_.find(attr_name);
-      if (iter == runtime_attrs_.end()) {
-        attrs_[attr_name] = GetAttrValue(attr);
+      auto default_attr_iter = runtime_attrs_.find(attr_name);
+      const auto &extra_dynamic_attr_map =
+          operators::ExtraInfoUtils::Instance().GetExtraDynamicAttrsMap(Type());
+      auto dynamic_attr_iter = extra_dynamic_attr_map.find(attr_name);
+
+      if (default_attr_iter != runtime_attrs_.end()) {
+        default_attr_iter->second = GetAttrValue(attr);
+      } else if (dynamic_attr_iter != extra_dynamic_attr_map.end()) {
+        runtime_attrs_[attr_name] = GetAttrValue(attr);
       } else {
-        iter->second = GetAttrValue(attr);
+        attrs_[attr_name] = GetAttrValue(attr);
       }
     }
   }
@@ -665,8 +671,13 @@ void OpDesc::SetAttr(const std::string &name, const Attribute &v) {
 
   const auto &extra_attr_map =
       operators::ExtraInfoUtils::Instance().GetExtraAttrsMap(Type());
+  const auto &extra_dynamic_attr_map =
+      operators::ExtraInfoUtils::Instance().GetExtraDynamicAttrsMap(Type());
   auto extra_attr_iter = extra_attr_map.find(name);
-  if (extra_attr_iter != extra_attr_map.end()) {
+  auto extra_dynamic_attr_iter = extra_dynamic_attr_map.find(name);
+  // auto pass_attr_iter = operators::extra_attr_properties.find(name);
+  if (extra_attr_iter != extra_attr_map.end() ||
+      extra_dynamic_attr_iter != extra_dynamic_attr_map.end()) {
     is_runtime_attr = true;
     attrs_ptr = &(this->runtime_attrs_);
   }
diff --git a/paddle/fluid/operators/ops_extra_info.h b/paddle/fluid/operators/ops_extra_info.h
@@ -90,6 +90,7 @@ const std::unordered_map<std::string, ExtraAttrPropertySet>
         // ONEDNN dedicated attributes
         {"Activation_scale", ExtraAttrProperty::ONEDNN},
         {"Bias", ExtraAttrProperty::ONEDNN},
+        {"Bias_scales", ExtraAttrProperty::ONEDNN},
         {"data_format", ExtraAttrProperty::ONEDNN},
         {"force_fp32_output", ExtraAttrProperty::ONEDNN},
         {"fuse_activation", ExtraAttrProperty::ONEDNN},
@@ -188,6 +189,15 @@ class ExtraInfoUtils {
     return empty_extra_attrs_map_;
   }
 
+  const paddle::framework::AttributeMap& GetExtraDynamicAttrsMap(
+      const std::string& op_type) const {
+    auto iter = g_extra_dynamic_attrs_map_.find(op_type);
+    if (iter != g_extra_dynamic_attrs_map_.end()) {
+      return iter->second;
+    }
+    return empty_extra_attrs_map_;
+  }
+
   const std::vector<std::function<void(framework::AttributeMap*, bool)>>&
   GetExtraAttrsChecker(const std::string& op_type) const {
     auto iter = g_extra_attrs_checker_.find(op_type);
@@ -211,6 +221,8 @@ class ExtraInfoUtils {
 
   std::unordered_map<std::string, paddle::framework::AttributeMap>
       g_extra_attrs_map_;
+  std::unordered_map<std::string, paddle::framework::AttributeMap>
+      g_extra_dynamic_attrs_map_;
   paddle::framework::AttributeMap empty_extra_attrs_map_{};
   std::unordered_map<
       std::string,
diff --git a/paddle/phi/api/yaml/generator/ops_extra_info_gen.py b/paddle/phi/api/yaml/generator/ops_extra_info_gen.py
@@ -17,7 +17,7 @@
 import argparse
 
 
-def map_code_template(attrs_str, attrs_checker_str):
+def map_code_template(default_attrs_str, dynamic_attr_str, attrs_checker_str):
     return f"""// This file is generated by paddle/phi/api/yaml/generator/ops_extra_info_gen.py
 #include "paddle/fluid/operators/ops_extra_info.h"
 
@@ -28,7 +28,11 @@ def map_code_template(attrs_str, attrs_checker_str):
 
 ExtraInfoUtils::ExtraInfoUtils() {{
   g_extra_attrs_map_ = {{
-    {attrs_str}
+    {default_attrs_str}
+  }};
+
+  g_extra_dynamic_attrs_map_ = {{
+    {dynamic_attr_str}
   }};
 
   g_extra_attrs_checker_ = {{
@@ -64,10 +68,7 @@ def parse_attr(attr_str):
         'name'), result.group('default_val')
 
 
-def generate_extra_info(op_compat_yaml_path, ops_extra_info_path):
-    compat_apis = []
-    with open(op_compat_yaml_path, 'rt') as f:
-        compat_apis = yaml.safe_load(f)
+def generate_attr_info(attr_type, op_compat_args):
 
     def get_op_name(api_item):
         names = api_item.split('(')
@@ -76,49 +77,62 @@ def get_op_name(api_item):
         else:
             return names[1].split(')')[0].strip()
 
-    extra_map_str_list = []
-    extra_checker_str_list = []
+    attr_map_str_list = []
+    attr_checker_str_list = []
+    extra_args_map = op_compat_args['extra']
+    if attr_type in extra_args_map:
+        attr_map_list = []
+        attr_checker_func_list = []
+        for attr in extra_args_map[attr_type]:
+            attr_type, attr_name, default_val = parse_attr(attr)
+            attr_checker_func_list.append(
+                f"[](framework::AttributeMap* attr_map, bool only_check_exist_value)-> void {{ ExtraAttrChecker<{attr_type}>(\"{attr_name}\", {default_val})(attr_map, only_check_exist_value);}}"
+            )
+            if attr_type.startswith("std::vector"):
+                attr_map_list.append(
+                    f"{{\"{attr_name}\", {attr_type}{default_val}}}")
+            else:
+                attr_map_list.append(
+                    f"{{\"{attr_name}\", {attr_type}{{{default_val}}}}}")
+        api_extra_attr_map = ", ".join(attr_map_list)
+        api_extra_attr_checkers = ",\n      ".join(attr_checker_func_list)
+        attr_map_str_list.append(
+            f"{{\"{get_op_name(op_compat_args['op'])}\", {{ {api_extra_attr_map} }}}}"
+        )
+        attr_checker_str_list.append(
+            f"{{\"{get_op_name(op_compat_args['op'])}\", {{ {api_extra_attr_checkers} }}}}"
+        )
+        if 'backward' in op_compat_args:
+            for bw_item in op_compat_args['backward'].split(','):
+                bw_op_name = get_op_name(bw_item)
+                attr_map_str_list.append(
+                    f"{{\"{bw_op_name}\", {{ {api_extra_attr_map} }}}}")
+                attr_checker_str_list.append(
+                    f"{{\"{bw_op_name}\", {{ {api_extra_attr_checkers} }}}}")
+    return attr_map_str_list, attr_checker_str_list
 
+
+def generate_extra_info(op_compat_yaml_path, ops_extra_info_path):
+    compat_apis = []
+    with open(op_compat_yaml_path, 'rt') as f:
+        compat_apis = yaml.safe_load(f)
+    extra_default_attr_str_list = []
+    extra_dynamic_attr_str_list = []
+    extra_checker_str_list = []
     for op_compat_args in compat_apis:
         if 'extra' in op_compat_args:
-            extra_args_map = op_compat_args['extra']
             # TODO(chenweihang): add inputs and outputs
-            if 'attrs' in extra_args_map:
-                attr_map_list = []
-                attr_checker_func_list = []
-                for attr in extra_args_map['attrs']:
-                    attr_type, attr_name, default_val = parse_attr(attr)
-                    attr_checker_func_list.append(
-                        f"[](framework::AttributeMap* attr_map, bool only_check_exist_value)-> void {{ ExtraAttrChecker<{attr_type}>(\"{attr_name}\", {default_val})(attr_map, only_check_exist_value);}}"
-                    )
-                    if attr_type.startswith("std::vector"):
-                        attr_map_list.append(
-                            f"{{\"{attr_name}\", {attr_type}{default_val}}}")
-                    else:
-                        attr_map_list.append(
-                            f"{{\"{attr_name}\", {attr_type}{{{default_val}}}}}"
-                        )
-                api_extra_attr_map = ", ".join(attr_map_list)
-                api_extra_attr_checkers = ",\n      ".join(
-                    attr_checker_func_list)
-                extra_map_str_list.append(
-                    f"{{\"{get_op_name(op_compat_args['op'])}\", {{ {api_extra_attr_map} }}}}"
-                )
-                extra_checker_str_list.append(
-                    f"{{\"{get_op_name(op_compat_args['op'])}\", {{ {api_extra_attr_checkers} }}}}"
-                )
-                if 'backward' in op_compat_args:
-                    for bw_item in op_compat_args['backward'].split(','):
-                        bw_op_name = get_op_name(bw_item)
-                        extra_map_str_list.append(
-                            f"{{\"{bw_op_name}\", {{ {api_extra_attr_map} }}}}")
-                        extra_checker_str_list.append(
-                            f"{{\"{bw_op_name}\", {{ {api_extra_attr_checkers} }}}}"
-                        )
-
+            default_attr_map_str, default_attr_checker_str = generate_attr_info(
+                'attrs', op_compat_args)
+            dynamic_attr_map_str, _ = generate_attr_info(
+                'dynamic_attrs', op_compat_args)
+            extra_default_attr_str_list.extend(default_attr_map_str)
+            extra_dynamic_attr_str_list.extend(dynamic_attr_map_str)
+            extra_checker_str_list.extend(default_attr_checker_str)
     ops_extra_info_file = open(ops_extra_info_path, 'w')
     ops_extra_info_file.write(
-        map_code_template(",\n    ".join(extra_map_str_list),
+        map_code_template(",\n    ".join(extra_default_attr_str_list),
+                          ",\n    ".join(extra_dynamic_attr_str_list),
                           ",\n    ".join(extra_checker_str_list)))
     ops_extra_info_file.close()
 
diff --git a/paddle/phi/api/yaml/op_compat.yaml b/paddle/phi/api/yaml/op_compat.yaml
@@ -112,6 +112,7 @@
              bool fuse_residual_connection = false, float Scale_in = 1.0f, float Scale_out = 1.0f,
              float Scale_in_eltwise = 1.0f, 'float[] Scale_weights = {1.0f}', bool force_fp32_output = false,
              int workspace_size_MB = platform::GetDefaultConvWorkspaceSizeLimitMB(), bool exhaustive_search = false]
+    dynamic_attrs : ['float[] Bias_scales = {1.0f}', float Sum_scale = 1.0f, 'float[] Output_shift_scale = {1.0f}', float Activation_scale = 1.0f]
 
 - op : conv2d_fusion
   extra :
diff --git a/paddle/phi/kernels/onednn/conv_handler.h b/paddle/phi/kernels/onednn/conv_handler.h
@@ -406,6 +406,7 @@ class ConvOneDNNHandlerT
 
     // Scales for int8 bias are to be cached to avoid
     // computing them each iteration
+    groups = std::max(groups, 1);
     auto bias_scale_tuple =
         std::static_pointer_cast<std::tuple<float, std::vector<float>>>(
             this->dev_ctx_.GetBlob(key_bs));
@@ -709,7 +710,6 @@ class ConvOneDNNHandlerT
         LOG(ERROR) << "Bias should be of type int32 but is " << bias->dtype();
       }
       const K_Bias* bias_data = bias->data<K_Bias>();
-
       return this->AcquireMemoryWithReorder(
           bias->mem_desc(),
           this->fwd_pd_->bias_desc(),
