Merge pull request #223 from Channingss/develop

[onnx] fix conflict between onnxruntime and paddle

x2paddle/convert.py

@@ -194,6 +194,18 @@ def main():
     assert args.framework is not None, "--framework is not defined(support tensorflow/caffe/onnx)"
     assert args.save_dir is not None, "--save_dir is not defined"
 
+    if args.framework == "onnx":
+        try:
+            import onnxruntime as rt
+            version = rt.__version__
+            if version != '1.0.0':
+                print("onnxruntime==1.0.0 is required")
+                return
+        except:
+            print(
+                "onnxruntime is not installed, use \"pip install onnxruntime==1.0.0\"."
+            )
+
     try:
         import paddle
         v0, v1, v2 = paddle.__version__.split('.')

x2paddle/decoder/onnx_decoder.py

@@ -476,17 +476,7 @@ class ONNXDecoder(object):
         return 'x2paddle_' + name
 
     def check_model_running_state(self, model_path):
-        try:
-            import onnxruntime as rt
-            version = rt.__version__
-            if version != '1.0.0':
-                print("onnxruntime==1.0.0 is required")
-                return
-        except:
-            raise Exception(
-                "onnxruntime is not installed, use \"pip install onnxruntime==1.0.0\"."
-            )
-
+        import onnxruntime as rt
         model = onnx.load(model_path)
         model = onnx.shape_inference.infer_shapes(model)
         if len(model.graph.value_info) < len(model.graph.node) - 1: