From df29a6196d4ba54a73aa49b792bdb0c383d57d68 Mon Sep 17 00:00:00 2001 From: wjm Date: Thu, 10 Jun 2021 22:37:03 +0800 Subject: [PATCH 1/4] fix --- parser/caffe/caffe_parser.cc | 2 -- parser/onnx/onnx_data_parser.h | 2 +- parser/onnx/subgraph_adapter/subgraph_adapter_factory.h | 2 +- parser/tensorflow/tensorflow_frameworkop_parser.cc | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/parser/caffe/caffe_parser.cc b/parser/caffe/caffe_parser.cc index 157f33f..fe5086f 100644 --- a/parser/caffe/caffe_parser.cc +++ b/parser/caffe/caffe_parser.cc @@ -203,11 +203,9 @@ const int32_t kAnchorIndexTwo = 2; const int32_t kAnchorIndexThree = 3; const int32_t kNumOne = 1; const size_t kTensorNum = 2; -const int kMaxParseDepth = 5; const int32_t kMinLineWorldSize = 3; const int32_t kMaxIdentifier = 536870911; // 2^29 - 1 const int32_t kBase = 10; -const uint32_t kInteval = 2; const char *const kPython = "Python"; const char *const kProposalLayer = "ProposalLayer"; const char *const kDetectionOutput = "DetectionOutput"; diff --git a/parser/onnx/onnx_data_parser.h b/parser/onnx/onnx_data_parser.h index fdc59e2..7a7f411 100644 --- a/parser/onnx/onnx_data_parser.h +++ b/parser/onnx/onnx_data_parser.h @@ -42,7 +42,7 @@ class PARSER_FUNC_VISIBILITY OnnxDataParser : public OnnxOpParser { std::vector user_input_dims_v_; - bool is_subgraph_data_op_; + bool is_subgraph_data_op_ = false; }; } // namespace ge diff --git a/parser/onnx/subgraph_adapter/subgraph_adapter_factory.h b/parser/onnx/subgraph_adapter/subgraph_adapter_factory.h index fa023fa..7941085 100644 --- a/parser/onnx/subgraph_adapter/subgraph_adapter_factory.h +++ b/parser/onnx/subgraph_adapter/subgraph_adapter_factory.h @@ -55,7 +55,7 @@ public: */ std::shared_ptr CreateSubgraphAdapter(const std::string &op_type); - + ~SubgraphAdapterFactory() {} protected: /** * @brief SubgraphAdapter creation function diff --git a/parser/tensorflow/tensorflow_frameworkop_parser.cc b/parser/tensorflow/tensorflow_frameworkop_parser.cc index d4bb8aa..9c6eb71 100644 --- a/parser/tensorflow/tensorflow_frameworkop_parser.cc +++ b/parser/tensorflow/tensorflow_frameworkop_parser.cc @@ -75,9 +75,9 @@ Status ParseParams(const Message *op_src, FrameworkOpOperator *op) { op->TfOpDef(attr_v.s()); } else { GE_CHK_BOOL_EXEC(type == "_Retval", - GE_DELETE_NEW_SINGLE(pkg_node); REPORT_INNER_ERROR("E19999", "In NodeDef:%s Attr:opdef is not exist, check invalid", pkg_node->name().c_str()); + GE_DELETE_NEW_SINGLE(pkg_node); return PARAM_INVALID, "In NodeDef %s Attr opdef is not exist.", pkg_node->name().c_str()); } From abc79d4e194cbc43ecccabdb1decd649cf1c34cf Mon Sep 17 00:00:00 2001 From: wjm Date: Thu, 10 Jun 2021 23:04:27 +0800 Subject: [PATCH 2/4] fix --- parser/onnx/subgraph_adapter/subgraph_adapter_factory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parser/onnx/subgraph_adapter/subgraph_adapter_factory.h b/parser/onnx/subgraph_adapter/subgraph_adapter_factory.h index 7941085..350f23e 100644 --- a/parser/onnx/subgraph_adapter/subgraph_adapter_factory.h +++ b/parser/onnx/subgraph_adapter/subgraph_adapter_factory.h @@ -55,7 +55,7 @@ public: */ std::shared_ptr CreateSubgraphAdapter(const std::string &op_type); - ~SubgraphAdapterFactory() {} + ~SubgraphAdapterFactory() = default; protected: /** * @brief SubgraphAdapter creation function From 150a0d8cc2ec4423aaa4d9c82181dc389267fbf4 Mon Sep 17 00:00:00 2001 From: wjm Date: Fri, 11 Jun 2021 02:27:34 +0800 Subject: [PATCH 3/4] add --- parser/func_to_graph/func2graph.py | 2 +- .../parser/testcase/onnx_parser_testcase/onnx_model/if.py | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/parser/func_to_graph/func2graph.py b/parser/func_to_graph/func2graph.py index ef52916..633440f 100644 --- a/parser/func_to_graph/func2graph.py +++ b/parser/func_to_graph/func2graph.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- #------------------------------------------------------------------- # Purpose: diff --git a/tests/ut/parser/testcase/onnx_parser_testcase/onnx_model/if.py b/tests/ut/parser/testcase/onnx_parser_testcase/onnx_model/if.py index e9aaef7..ae2caee 100644 --- a/tests/ut/parser/testcase/onnx_parser_testcase/onnx_model/if.py +++ b/tests/ut/parser/testcase/onnx_parser_testcase/onnx_model/if.py @@ -1,3 +1,10 @@ +#!/usr/bin/env python3 +# -*- coding: UTF-8 -*- +#------------------------------------------------------------------- +# Purpose: +# Copyright 2021 Huawei Technologies Co., Ltd. All rights reserved. +#------------------------------------------------------------------- + # Given a bool scalar input cond. # return constant tensor x if cond is True, otherwise return constant tensor y. import numpy as np From be90c3db806e3f9435c2ff2fb2fdc60145ed307f Mon Sep 17 00:00:00 2001 From: wjm Date: Fri, 11 Jun 2021 03:34:03 +0800 Subject: [PATCH 4/4] submodule --- metadef | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadef b/metadef index 2f89122..84e7ab3 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit 2f89122e1fa26b3633a8efa4bf0a0269bebf537e +Subproject commit 84e7ab39b0daf7ca2b2f5549e3279647da7875e2