Merge pull request #142 from Channingss/exporter/v0.5.1

change onnx_pb2.py generated by protobuf>3.12.0 to lower version protobuf depended onnx_pb.py

Author: jiangjiajun

README.md

@@ -45,7 +45,7 @@ paddle2onnx is a toolkit for converting trained model to **ONNX** from **PaddleP
 ##  使用方式
 ### 静态图模型导出
 
-    paddle2onnx --model_dir paddle_model  --save_file onnx_file --onnx_opset 10 --enable_onnx_checker True
+    paddle2onnx --model_dir paddle_model  --save_file onnx_file --opset_version 10 --enable_onnx_checker True
 
 ### 动态图模型导出
 
@@ -56,14 +56,14 @@ paddle2onnx is a toolkit for converting trained model to **ONNX** from **PaddleP
 |----------|--------------|
 |--model_dir | 指定包含Paddle模型'\_\_model\_\_'和参数'\_\_params\_\_'的路径, 由`paddle.fluid.io.save_inference_model`保存得到|
 |--save_file | 指定转换后的模型保存目录路径 |
-|--onnx_opset | **[可选]** 该参数可设置转换为ONNX的OpSet版本，目前比较稳定地支持9、10、11三个版本，默认为10 |
+|--opset_version | **[可选]** 该参数可设置转换为ONNX的OpSet版本，目前比较稳定地支持9、10、11三个版本，默认为9 |
 |--enable_onnx_checker| **[可选]**  是否检查导出为ONNX模型的正确性, 建议打开此开关。若指定为True，需要安装 pip install onnx==1.7.0, 默认为False|
 |--version |**[可选]** 查看paddle2onnx版本 |
 
 ##  相关文档
 
 - [paddle2onnx测试模型库](docs/model_zoo.md)
-- [paddle2onnx支持准换算子列表](docs/op_list.md)
+- [paddle2onnx支持转换算子列表](docs/op_list.md)
 
 
 ## License

paddle2onnx/command.py

@@ -64,14 +64,16 @@ def program2onnx(model_dir,
                  enable_onnx_checker=False):
     try:
         import paddle
-        v0, v1, v2 = paddle.__version__.split('.')
-        if v0 == '0' and v1 == '0' and v2 == '0':
-            logging.warning("You are use develop version of paddlepaddle")
-        elif int(v0) != 1 or int(v1) < 8:
-            raise ImportError("paddlepaddle>=1.8.0 is required")
     except:
         logging.error(
             "paddlepaddle not installed, use \"pip install paddlepaddle\"")
+
+    v0, v1, v2 = paddle.__version__.split('.')
+    if v0 == '0' and v1 == '0' and v2 == '0':
+        logging.warning("You are use develop version of paddlepaddle")
+    elif int(v0) <= 1 and int(v1) < 8:
+        raise ImportError("paddlepaddle>=1.8.0 is required")
+
     import paddle2onnx as p2o
     # convert model save with 'paddle.fluid.io.save_inference_model'
     if hasattr(paddle, 'enable_static'):
@@ -107,7 +109,7 @@ def main():
                      format(paddle2onnx.__version__))
         return
 
-    assert args.model_dir is not None, "--model should be defined while translating paddle model to onnx"
+    assert args.model_dir is not None, "--model_dir should be defined while translating paddle model to onnx"
     assert args.save_file is not None, "--save_file should be defined while translating paddle model to onnx"
     program2onnx(
         args.model_dir,

paddle2onnx/constant/dtypes.py

@@ -15,7 +15,7 @@
 import numpy as np
 import paddle.fluid.core as core
 from paddle2onnx.onnx_helper import helper
-from paddle2onnx.onnx_helper.onnx_pb2 import TensorProto
+from paddle2onnx.onnx_helper.onnx_pb import TensorProto
 
 ONNX = TensorProto
 

paddle2onnx/onnx_helper/helper.py

@@ -25,7 +25,7 @@
 from six import text_type, integer_types, binary_type
 
 import google.protobuf.message
-from .onnx_pb2 import TensorProto, SparseTensorProto, AttributeProto, ValueInfoProto, TensorShapeProto, \
+from .onnx_pb import TensorProto, SparseTensorProto, AttributeProto, ValueInfoProto, TensorShapeProto, \
     NodeProto, ModelProto, GraphProto, OperatorSetIdProto, TypeProto, IR_VERSION
 from paddle2onnx.onnx_helper import mapping
 from .mapping import STORAGE_TENSOR_TYPE_TO_FIELD

paddle2onnx/onnx_helper/mapping.py

@@ -20,7 +20,7 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-from .onnx_pb2 import TensorProto
+from .onnx_pb import TensorProto
 #from typing import Text, Any
 import numpy as np  # type: ignore
 

paddle2onnx/onnx_helper/onnx_pb2.py …/onnx_helper/onnx_ONNX_REL_1_7_ml_pb2.pypaddle2onnx/onnx_helper/onnx_pb2.py renamed to paddle2onnx/onnx_helper/onnx_ONNX_REL_1_7_ml_pb2.py paddle2onnx/onnx_helper/onnx_pb2.py renamed to paddle2onnx/onnx_helper/onnx_ONNX_REL_1_7_ml_pb2.py

@@ -0,0 +1,25 @@
+#   Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Copyright (c) ONNX Project Contributors.
+# Licensed under the MIT license.
+
+# This file is generated by setup.py. DO NOT EDIT!
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from .onnx_ONNX_REL_1_7_ml_pb2 import *  # noqa

paddle2onnx/onnx_helper/onnx_pb.py

@@ -34,8 +34,8 @@ def opset_10(cls, graph, node, **kw):
         if normalized == False:
             logging.warn(
                         "The parameter normalized of multiclass_nms OP of Paddle is False, which has diff with ONNX." \
-                        " Please set normalized=True in multiclass_nms of Paddle, see doc Q4 in" \
-                        " https://github.com/PaddlePaddle/X2Paddle/blob/develop/FAQ.md")
+                        " Please set normalized=True in multiclass_nms of Paddle, see doc Q1 in" \
+                        " https://github.com/PaddlePaddle/paddle2onnx/blob/develop/FAQ.md")
 
         #convert the paddle attribute to onnx tensor
         node_score_threshold = graph.make_node(

paddle2onnx/op_mapper/detection/multiclass_nms.py

@@ -26,8 +26,8 @@ def is_static_shape(shape):
     if len(shape) > 1 and shape.count(-1) > 1:
         raise Exception(
             "Converting this model to ONNX need with static input shape," \
-            " please fix input shape of this model, see doc Q5 in" \
-            " https://github.com/PaddlePaddle/X2Paddle/blob/develop/FAQ.md."
+            " please fix input shape of this model, see doc Q2 in" \
+            " https://github.com/PaddlePaddle/paddle2onnx/blob/develop/FAQ.md."
         )