!501 sync to master0329

Merge pull request !501 from 赵之轩/ge_dev

metadef

@@ -1 +1 @@
-Subproject commit bf2dfcda7a2eb137f4d02cf899f7747ba8550455
+Subproject commit 0a4c05147cf6e1aa62172636c271e625549f3778

parser/common/convert/pb2json.cc

@@ -31,7 +31,7 @@ using std::string;
 namespace ge {
 namespace {
 const int kSignificantDigits = 10;
-const int kMaxParseDepth = 5;
+const int kMaxParseDepth = 20;
 }
 // JSON parses non utf8 character throwing exceptions, so some fields need to be shielded through black fields
 FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void Pb2Json::Message2Json(const ProtobufMsg &message,

tests/depends/graph/src/attr_util_stub.cc

@@ -121,7 +121,7 @@ GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY OpDescPtr AttrUtils::CloneOpDesc(
   GE_CHK_BOOL_EXEC(imp.UnserializeOpDesc(op_desc, *op_def),
                    REPORT_CALL_ERROR("E19999", "UnserializeOpDesc failed");
                    return op_desc, "[Call][UnserializeOpDesc] op_desc unserialize failed");
-  op_desc->extAttrs_ = org_op_desc->extAttrs_;
+  op_desc->ext_attrs_ = org_op_desc->ext_attrs_;
 
   // This function may be called by some passes of fusion engine, in this condition, do not need these attribute
   if (op_desc->impl_ == nullptr) {
@@ -164,7 +164,7 @@ GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY OpDescPtr AttrUtils::CopyOpDesc(c
     return nullptr;
   }
 
-  op_desc->extAttrs_ = org_op_desc->extAttrs_;
+  op_desc->ext_attrs_ = org_op_desc->ext_attrs_;
 
   if (op_desc->impl_ == nullptr) {
     REPORT_INNER_ERROR("E19999", "op desc impl is nullptr, check invalid");

tests/st/CMakeLists.txt

@@ -61,7 +61,7 @@ target_link_libraries(st_parser_proto PRIVATE
 
 ################################################################################
 set(DUPLICATE_PROTO_LIST
-    "${PARSER_DIR}/metadef/proto/proto_inner/ge_onnx.proto"
+    "${PARSER_DIR}/metadef/proto/onnx/ge_onnx.proto"
 )
 
 protobuf_generate(ge DUP_PROTO_SRCS DUP_PROTO_HDRS ${DUPLICATE_PROTO_LIST})

tests/ut/parser/CMakeLists.txt

@@ -62,7 +62,7 @@ target_link_libraries(ut_parser_proto PRIVATE
 
 ################################################################################
 set(DUPLICATE_PROTO_LIST
-    "${PARSER_DIR}/metadef/proto/proto_inner/ge_onnx.proto"
+    "${PARSER_DIR}/metadef/proto/onnx/ge_onnx.proto"
 )
 
 protobuf_generate(ge DUP_PROTO_SRCS DUP_PROTO_HDRS ${DUPLICATE_PROTO_LIST})