From 82fc5ede8190ffd94f0cb19ac440705f4579c5f7 Mon Sep 17 00:00:00 2001
From: Xiaoyu Zhang <35585791+BBuf@users.noreply.github.com>
Date: Tue, 2 Nov 2021 20:18:39 +0800
Subject: [PATCH] fix convert bug (#46)

* fix convert bug

* refine

* update ci test.sh
---
 ci/test.sh                                       | 3 ++-
 examples/oneflow2onnx/models/test_inceptionv3.py | 2 +-
 examples/oneflow2onnx/models/test_lenet.py       | 3 ++-
 examples/oneflow2onnx/models/test_resnet50.py    | 2 +-
 setup.py                                         | 4 ----
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ci/test.sh b/ci/test.sh
index e1cd180..c7a87fa 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -4,4 +4,5 @@ python3 -m pip install --user --upgrade pip
 if [ -f requirements.txt ]; then python3 -m pip install -r requirements.txt --user; fi
 python3 -m pip install oneflow --user -U -f https://staging.oneflow.info/branch/master/cu110
 python3 setup.py install
-python3 -m pytest examples/oneflow2onnx
+python3 -m pytest examples/oneflow2onnx/models
+
diff --git a/examples/oneflow2onnx/models/test_inceptionv3.py b/examples/oneflow2onnx/models/test_inceptionv3.py
index 86db1af..faef52a 100644
--- a/examples/oneflow2onnx/models/test_inceptionv3.py
+++ b/examples/oneflow2onnx/models/test_inceptionv3.py
@@ -470,6 +470,6 @@ def test_inceptionv3():
 
     with tempfile.TemporaryDirectory() as tmpdirname:
         flow.save(inceptionv3.state_dict(), tmpdirname)
-        convert_to_onnx_and_check(inceptionv3_graph, flow_weight_dir=tmpdirname, onnx_model_path="/tmp")
+        convert_to_onnx_and_check(inceptionv3_graph, flow_weight_dir=tmpdirname, onnx_model_path="/tmp", print_outlier=True)
 
 test_inceptionv3()
diff --git a/examples/oneflow2onnx/models/test_lenet.py b/examples/oneflow2onnx/models/test_lenet.py
index b9a7a58..6895ede 100644
--- a/examples/oneflow2onnx/models/test_lenet.py
+++ b/examples/oneflow2onnx/models/test_lenet.py
@@ -44,6 +44,7 @@ class LeNet(nn.Module):
         return logits
 
 lenet = LeNet()
+lenet = lenet.to("cuda")
 lenet.eval()
 
 class lenetGraph(flow.nn.Graph):
@@ -58,7 +59,7 @@ class lenetGraph(flow.nn.Graph):
 def test_lenet():
     
     lenet_graph = lenetGraph()
-    lenet_graph._compile(flow.randn(1, 3, 32, 32))
+    lenet_graph._compile(flow.randn(1, 3, 32, 32).to("cuda"))
 
     with tempfile.TemporaryDirectory() as tmpdirname:
         flow.save(lenet.state_dict(), tmpdirname)
diff --git a/examples/oneflow2onnx/models/test_resnet50.py b/examples/oneflow2onnx/models/test_resnet50.py
index 9e274d9..5665559 100644
--- a/examples/oneflow2onnx/models/test_resnet50.py
+++ b/examples/oneflow2onnx/models/test_resnet50.py
@@ -309,7 +309,7 @@ def test_resnet():
     
     resnet_graph = ResNetGraph()
     resnet_graph._compile(flow.randn(1, 3, 224, 224).to("cuda"))
-    print(resnet_graph._full_graph_proto)
+    # print(resnet_graph._full_graph_proto)
     with tempfile.TemporaryDirectory() as tmpdirname:
         flow.save(resnet.state_dict(), tmpdirname)
         convert_to_onnx_and_check(resnet_graph, flow_weight_dir=tmpdirname, onnx_model_path="/tmp", print_outlier=False)
diff --git a/setup.py b/setup.py
index 7c4c00b..9d624bc 100644
--- a/setup.py
+++ b/setup.py
@@ -24,11 +24,7 @@ long_description += "Email: zhangxiaoyu@oneflow.org"
 
 setuptools.setup(
     name="oneflow_onnx",
-<<<<<<< HEAD
     version="0.5.1",
-=======
-    version="0.5.0.rc",
->>>>>>> parent of cca89ba... release v0.5.0 (#42)
     author="zhangxiaoyu",
     author_email="zhangxiaoyu@oneflow.org",
     description="a toolkit for converting trained model of OneFlow to ONNX and ONNX to OneFlow.",
-- 
GitLab