Merge branch 'change_ci_docker' of...

Merge branch 'change_ci_docker' of https://github.com/Oneflow-Inc/oneflow_convert_tools into change_ci_docker

README.md

@@ -95,5 +95,6 @@ python3 setup.py install
 - 2021/4/14 修复CI错误，支持X2OneFlow的所有模型自动代码生成功能，发布0.2.3 whell包。
 - 2020/4/15 完成X2OneFlow所有模型的自动代码生成功能，发布0.3.0 whell包。
 - 2020/4/16 将Expand OP并入主分支，并修复导入oneflow_api报错的bug，发布0.3.1 whell包。
-- 2020/4/16 解决自动代码生成遗留问题，并将自动代码生成的测试加入CI，发布0.3.2 wheell包。
+- 2020/4/16 解决自动代码生成遗留问题，并将自动代码生成的测试加入CI，发布0.3.2 whell包。
+- 2020/6/21 导出ONNX新增PreLU/LeakyReLU OP，修复自动代码生成bug，发布0.3.3 whell包。
 

README_en.md

@@ -95,3 +95,5 @@ This tool is to transform OneFlow models into models that can be used on the Ser
 - 2021/4/14 Refined CI errors. Supported code generations for all functions of X2OneFlow. 0.2.3 whell package was announced.
 - 2020/4/15 Finalized code generations for all functions of X2OneFlow. 0.3.0 whell was announced.
 - 2020/4/16 Merged Expand OP into the main branch. Debugged oneflow_api. 0.3.1 whell package was announced.
+- 2020/4/16 Solve the remaining problems of automatic code generation, add the test of automatic code generation to CI. 0.3.2 whell package was announced. 
+- 2020/6/21 Add PreLU/LeakyReLU OP ONNX Export， fix automatic code generation bug. 0.3.3 whell package was announced. 

ci/test.sh

@@ -37,4 +37,3 @@ python3 -m pytest examples/x2oneflow/paddle2oneflow/models/test_vggnet.py
 python3 -m pytest examples/x2oneflow/paddle2oneflow/models/test_vision_transformer.py
 python3 -m pytest examples/x2oneflow/paddle2oneflow/models/test_xception_deeplab.py
 python3 -m pytest examples/x2oneflow/paddle2oneflow/models/test_xception.py
-./test_code_gen.sh

docs/README.md

-# \#oneflow2onnx
+# oneflow2onnx
 
 **[简体中文](README.md) | English**
 

docs/README_en.md

-# \#oneflow2onnx
+# oneflow2onnx
 
 **简体中文 | [English](README_en.md)**
 

docs/oneflow2onnx/op_list.md

@@ -21,4 +21,5 @@
 | 53 | Conv     | 54 | QuantizeLinear | 56 | ReduceMin    | 57 | BatchNormalization|
 | 58 | ReduceSum| 59 | ReduceProd | 60 | ArgMax   | 61 | ArgMin             |
 |62  | Reshape  | 63 | Squeeze    | 64 | Transpose| 65 | Concat             |
-| 66 | Cast     | 67 | Identity   | 68 | Mul      |
+| 66 | Cast     | 67 | Identity   | 68 | Mul      | 69 | PReLU              |
+| 70 | LeakyReLU|

examples/x2oneflow/paddle2oneflow/code_gen/test_xception_deeplab.py

@@ -444,5 +444,5 @@ def Xception71_deeplab(**args):
 
 def test_Xception41_deeplab():
     load_paddle_module_and_check(
-        Xception41_deeplab, input_size=(1, 3, 224, 224), train_flag=False, flow_weight_dir="/tmp/oneflow", oneflow_code_gen_flag=True
+        Xception41_deeplab, input_size=(1, 3, 224, 224), train_flag=False, flow_weight_dir="/tmp/oneflow", oneflow_code_gen_flag=False
     )

oneflow_onnx/x2oneflow/util.py

@@ -146,6 +146,8 @@ def load_pytorch_module_and_check(
 
     if oneflow_code_gen_flag == True and len(input_size) == 4:
         oneflow_code_gen_func(input_size, model_weight_save_dir)
+        flow.clear_default_session()
+        return
         
     if train_flag == False:
         pt_module.eval()
@@ -236,6 +238,8 @@ def load_paddle_module_and_check(
 
     if oneflow_code_gen_flag == True and len(input_size) == 4:
         oneflow_code_gen_func(input_size, model_weight_save_dir)
+        flow.clear_default_session()
+        return
     
     if train_flag == False:
         pd_module.eval()
@@ -331,6 +335,8 @@ def load_tensorflow2_module_and_check(
 
     if oneflow_code_gen_flag == True and len(input_size) == 4:
         oneflow_code_gen_func(input_size, model_weight_save_dir)
+        flow.clear_default_session()
+        return
     
     if train_flag == True:
         flow_res = job_train(ipt1)

setup.py

@@ -24,7 +24,7 @@ long_description += "Email: zhangxiaoyu@oneflow.org"
 
 setuptools.setup(
     name="oneflow_onnx",
-    version="0.3.2",
+    version="0.3.3",
     author="zhangxiaoyu",
     author_email="zhangxiaoyu@oneflow.org",
     description="a toolkit for converting trained model of OneFlow to ONNX and ONNX to OneFlow.",