wangwei
/
parser
Not watched
1
0
Fork 0
Code
Releases 0 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

!501 sync to master0329 

Merge pull request !501 from 赵之轩/ge_dev
pull/503/head
计晨 Gitee 3 years ago
parent
c15f71c51e 64c966d35d
commit
d3bbcd1abc
No known key found for this signature in database GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 6 additions and 6 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      metadef
  2. +1
    -1
      parser/common/convert/pb2json.cc
  3. +2
    -2
      tests/depends/graph/src/attr_util_stub.cc
  4. +1
    -1
      tests/st/CMakeLists.txt
  5. +1
    -1
      tests/ut/parser/CMakeLists.txt

+ 1
- 1
metadef

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

+ 1
- 1
parser/common/convert/pb2json.cc View File

@@ -31,7 +31,7 @@ using std::string;
namespace ge { namespace ge {
namespace { namespace {
const int kSignificantDigits = 10; 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 // 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, FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void Pb2Json::Message2Json(const ProtobufMsg &message,


+ 2
- 2
tests/depends/graph/src/attr_util_stub.cc View File

@@ -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), GE_CHK_BOOL_EXEC(imp.UnserializeOpDesc(op_desc, *op_def),
REPORT_CALL_ERROR("E19999", "UnserializeOpDesc failed"); REPORT_CALL_ERROR("E19999", "UnserializeOpDesc failed");
return op_desc, "[Call][UnserializeOpDesc] op_desc unserialize 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 // This function may be called by some passes of fusion engine, in this condition, do not need these attribute
if (op_desc->impl_ == nullptr) { if (op_desc->impl_ == nullptr) {
@@ -164,7 +164,7 @@ GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY OpDescPtr AttrUtils::CopyOpDesc(c
return nullptr; return nullptr;
} }


op_desc->extAttrs_ = org_op_desc->extAttrs_;
op_desc->ext_attrs_ = org_op_desc->ext_attrs_;


if (op_desc->impl_ == nullptr) { if (op_desc->impl_ == nullptr) {
REPORT_INNER_ERROR("E19999", "op desc impl is nullptr, check invalid"); REPORT_INNER_ERROR("E19999", "op desc impl is nullptr, check invalid");


+ 1
- 1
tests/st/CMakeLists.txt View File

@@ -61,7 +61,7 @@ target_link_libraries(st_parser_proto PRIVATE


################################################################################ ################################################################################
set(DUPLICATE_PROTO_LIST 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}) protobuf_generate(ge DUP_PROTO_SRCS DUP_PROTO_HDRS ${DUPLICATE_PROTO_LIST})


+ 1
- 1
tests/ut/parser/CMakeLists.txt View File

@@ -62,7 +62,7 @@ target_link_libraries(ut_parser_proto PRIVATE


################################################################################ ################################################################################
set(DUPLICATE_PROTO_LIST 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}) protobuf_generate(ge DUP_PROTO_SRCS DUP_PROTO_HDRS ${DUPLICATE_PROTO_LIST})


Write Preview
Loading…
Cancel
Save