Merge branch 'has_attr' of https://github.com/luotao1/Paddle into luotao1-has_attr

paddle/fluid/framework/op_desc.cc

@@ -237,6 +237,27 @@ void OpDesc::SetOutput(const std::string &param_name,
   this->outputs_[param_name] = args;
 }
 
+bool OpDesc::HasAttr(const std::string &name) const {
+  if (attrs_.find(name) != attrs_.end()) {
+    return true;
+  } else {
+    auto &op_info = OpInfoMap::Instance();
+    if (op_info.Has(desc_.type())) {
+      auto op_info_ptr = op_info.Get(desc_.type());
+      if (op_info_ptr.HasOpProtoAndChecker()) {
+        const proto::OpProto &proto = op_info_ptr.Proto();
+        for (int i = 0; i != proto.attrs_size(); ++i) {
+          const proto::OpProto::Attr &attr = proto.attrs(i);
+          if (attr.name() == name) {
+            return true;
+          }
+        }
+      }
+    }
+  }
+  return false;
+}
+
 proto::AttrType OpDesc::GetAttrType(const std::string &name) const {
   auto it = attrs_.find(name);
   PADDLE_ENFORCE(it != attrs_.end(), "Attribute %s is not found", name);

paddle/fluid/framework/op_desc.h

@@ -61,9 +61,7 @@ class OpDesc {
   void SetOutput(const std::string &param_name,
                  const std::vector<std::string> &args);
 
-  bool HasAttr(const std::string &name) const {
-    return attrs_.find(name) != attrs_.end();
-  }
+  bool HasAttr(const std::string &name) const;
 
   proto::AttrType GetAttrType(const std::string &name) const;