From 35fba2f57edbf8bf07215444f6413c26eac11d23 Mon Sep 17 00:00:00 2001
From: channingss <chen_linghchi@163.com>
Date: Thu, 5 Sep 2019 10:11:00 +0800
Subject: [PATCH] fix bug:import torch

---
 x2paddle/convert.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/x2paddle/convert.py b/x2paddle/convert.py
index b21e8d8..5ef5065 100644
--- a/x2paddle/convert.py
+++ b/x2paddle/convert.py
@@ -139,15 +139,6 @@ def caffe2paddle(proto, weight, save_dir, caffe_proto):
 
 def onnx2paddle(model_path, save_dir):
     # check onnx installation and version
-    try:
-        import onnx
-        version = onnx.version.version
-        if version != '1.5.0':
-            print("onnx==1.5.0 is required")
-            return
-    except:
-        print("onnx is not installed, use \"pip install onnx==1.5.0\".")
-        return
     try:
         import torch
         version = torch.__version__
@@ -159,6 +150,15 @@ def onnx2paddle(model_path, save_dir):
                 "we use caffe2 to inference graph, please use \"pip install torch==1.1.0\"."
             )
         return
+    try:
+        import onnx
+        version = onnx.version.version
+        if version != '1.5.0':
+            print("onnx==1.5.0 is required")
+            return
+    except:
+        print("onnx is not installed, use \"pip install onnx==1.5.0\".")
+        return
     print("Now translating model from onnx to paddle.")
 
     from x2paddle.decoder.onnx_decoder import ONNXDecoder
-- 
GitLab