From 29a321b4042f69418d2de785a193bcbe48104f7f Mon Sep 17 00:00:00 2001 From: wjm Date: Fri, 11 Jun 2021 09:18:54 +0800 Subject: [PATCH] fix --- parser/func_to_graph/func2graph.py | 2 +- parser/onnx/onnx_data_parser.h | 2 +- parser/onnx/subgraph_adapter/subgraph_adapter_factory.h | 2 +- parser/tensorflow/tensorflow_frameworkop_parser.cc | 2 +- tests/ut/parser/testcase/onnx_parser_testcase/onnx_model/if.py | 7 +++++++ 5 files changed, 11 insertions(+), 4 deletions(-) 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/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..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() = default; 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()); } 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