Browse Source

!419 increase parser st testcase

Merge pull request !419 from jwx930962/st_parser
pull/422/MERGE
i-robot Gitee 3 years ago
parent
commit
fb4cb1a564
4 changed files with 1125 additions and 138 deletions
  1. +16
    -1
      tests/depends/ops_stub/ops_stub.h
  2. +1
    -0
      tests/st/CMakeLists.txt
  3. +12
    -12
      tests/st/testcase/origin_models/test.json
  4. +1096
    -125
      tests/st/testcase/test_tensorflow_parser.cc

+ 16
- 1
tests/depends/ops_stub/ops_stub.h View File

@@ -286,6 +286,19 @@ REG_OP(Mul)
DT_COMPLEX64, DT_COMPLEX128})) DT_COMPLEX64, DT_COMPLEX128}))
.OP_END_FACTORY_REG(Mul) .OP_END_FACTORY_REG(Mul)


REG_OP(Pooling)
.INPUT(x, TensorType({DT_FLOAT16, DT_FLOAT32, DT_INT8}))
.OUTPUT(y, TensorType({DT_FLOAT16, DT_FLOAT32, DT_INT32}))
.ATTR(mode, Int, 0) // 0:max pooling or 1:avg pooling
.ATTR(global_pooling, Bool, false)
.ATTR(window, ListInt, {1,1}) // kernel size
.ATTR(stride, ListInt, {1,1}) // stride size
.ATTR(pad, ListInt, {0,0,0,0}) // pad size
.ATTR(dilation, ListInt, {1,1,1,1})
.ATTR(ceil_mode, Int, 0)
.ATTR(data_format, String, "NCHW")
.OP_END_FACTORY_REG(Pooling)

// for plugin // for plugin
static Status ParseParamsStub(const google::protobuf::Message* op_src, ge::Operator& op_dest) { static Status ParseParamsStub(const google::protobuf::Message* op_src, ge::Operator& op_dest) {
return SUCCESS; return SUCCESS;
@@ -380,20 +393,22 @@ REGISTER_CUSTOM_OP("Add")
.OriginOpType("Add") .OriginOpType("Add")
.ParseParamsFn(ParseParamsStub); .ParseParamsFn(ParseParamsStub);



REGISTER_CUSTOM_OP("PartitionedCall") REGISTER_CUSTOM_OP("PartitionedCall")
.FrameworkType(domi::ONNX) .FrameworkType(domi::ONNX)
.OriginOpType({"ai.onnx::9::Clip"}) .OriginOpType({"ai.onnx::9::Clip"})
.ParseParamsFn(ParseParamsClipV9Stub) .ParseParamsFn(ParseParamsClipV9Stub)
.ParseOpToGraphFn(ParseOpToGraphClipV9Stub); .ParseOpToGraphFn(ParseOpToGraphClipV9Stub);

REGISTER_CUSTOM_OP("TensorArray") REGISTER_CUSTOM_OP("TensorArray")
.FrameworkType(domi::TENSORFLOW) .FrameworkType(domi::TENSORFLOW)
.OriginOpType("TensorArrayV3") .OriginOpType("TensorArrayV3")
.ParseParamsByOperatorFn(ParseParamByOpFuncStub)
.ParseParamsFn(ParseParamsStub); .ParseParamsFn(ParseParamsStub);


REGISTER_CUSTOM_OP("TensorArrayWrite") REGISTER_CUSTOM_OP("TensorArrayWrite")
.FrameworkType(domi::TENSORFLOW) .FrameworkType(domi::TENSORFLOW)
.OriginOpType("TensorArrayWriteV3") .OriginOpType("TensorArrayWriteV3")
.ParseParamsByOperatorFn(ParseParamByOpFuncStub)
.ParseParamsFn(ParseParamsStub); .ParseParamsFn(ParseParamsStub);


REGISTER_CUSTOM_OP("DynamicRNN") REGISTER_CUSTOM_OP("DynamicRNN")


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

@@ -368,6 +368,7 @@ target_compile_definitions(st_parser PRIVATE
target_link_libraries(st_parser target_link_libraries(st_parser
$<BUILD_INTERFACE:intf_pub> $<BUILD_INTERFACE:intf_pub>
st_parser_proto st_parser_proto
json
-Wl,--whole-archive st_parser_common -Wl,--no-whole-archive -Wl,--whole-archive st_parser_common -Wl,--no-whole-archive
st_parser_graph st_parser_register error_manager_stub mmpa_stub attr_util_stub st_parser_graph st_parser_register error_manager_stub mmpa_stub attr_util_stub
gtest gtest_main slog_stub ascend_protobuf c_sec -lrt -ldl -lgcov gtest gtest_main slog_stub ascend_protobuf c_sec -lrt -ldl -lgcov


+ 12
- 12
tests/st/testcase/origin_models/test.json View File

@@ -3,6 +3,12 @@
{ {
"attr": [ "attr": [
{ {
"key": "dtype",
"value": {
"type": "DT_HALF"
}
},
{
"key": "shape", "key": "shape",
"value": { "value": {
"shape": { "shape": {
@@ -13,12 +19,6 @@
] ]
} }
} }
},
{
"key": "dtype",
"value": {
"type": "DT_HALF"
}
} }
], ],
"name": "Placeholder", "name": "Placeholder",
@@ -27,6 +27,12 @@
{ {
"attr": [ "attr": [
{ {
"key": "dtype",
"value": {
"type": "DT_HALF"
}
},
{
"key": "shape", "key": "shape",
"value": { "value": {
"shape": { "shape": {
@@ -37,12 +43,6 @@
] ]
} }
} }
},
{
"key": "dtype",
"value": {
"type": "DT_HALF"
}
} }
], ],
"name": "Placeholder_1", "name": "Placeholder_1",


+ 1096
- 125
tests/st/testcase/test_tensorflow_parser.cc
File diff suppressed because it is too large
View File


Loading…
Cancel
Save