[PaddleV3] 修复部分依赖 paddle.fluid 的 onnx 模型 part 2 (#1068)

* [Fix] version check

* [Fix] onnx best float32

* [Fix] onnx cifarnet

* [Fix] onnx circledet

* [Fix] onnx crnn lstm

* [Fix] onnx densenet121

* [Fix] onnx efficientnet b0

* [Fix] onnx face cyclegan 34

* [Fix] onnx facedetector

* [Fix] onnx hand landmark ar

* [Fix] onnx inceptionv1

* [Fix] onnx inceptionv2

* [Fix] onnx mnasnet a1

* [Fix] onnx mobilenet v2

* [Fix] onnx modelgen

* [Fix] onnx pnasnet mobile

* [Fix] onnx resnet101

* [Fix] onnx resnet152

* [Fix] onnx resnet18

* [Fix] onnx resnet34

* [Fix] onnx resnet50

* [Fix] onnx ronin 2d cp9

* [Fix] onnx shufflenet

* [Fix] onnx squeezenet

* [Fix] onnx transformer

* [Fix] onnx vgg11

* [Fix] onnx vgg11 bn

* [Fix] onnx vgg16 bn

* [Fix] onnx vgg19

* [Fix] onnx vgg19 bn

* [Fix] onnx yolov5s fix resize

* [Update] black.list

Author: megemini

test_benchmark/ONNX/best_float32/pd_infer.py

@@ -1,4 +1,3 @@
-import paddle.fluid as fluid
 import paddle
 import numpy as np
 import sys
@@ -10,11 +9,8 @@
     exe = paddle.static.Executor(paddle.CPUPlace())
 
     # test dygraph
-    [prog, inputs, outputs] = fluid.io.load_inference_model(
-        dirname="pd_model_dygraph/inference_model/",
-        executor=exe,
-        model_filename="model.pdmodel",
-        params_filename="model.pdiparams")
+    [prog, inputs, outputs] = paddle.static.load_inference_model(
+        path_prefix="pd_model_dygraph/inference_model/model", executor=exe)
     data = np.load('../dataset/best_float32/input.npy')
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 

test_benchmark/ONNX/black.list

@@ -1,16 +1,5 @@
 SwinTransformer
 bert6
-best_float32
-cifarnet
-circledet
-crnn_lstm
-densenet121
-efficientnet_b0
-face_cyclegan_34
-facedetector
-hand_landmark_ar
-inceptionv1
-inceptionv2
 mmdetection_fasterrcnn
 mmdetection_fcos
 mmdetection_fsaf
@@ -20,24 +9,7 @@ mmdetection_yolov3
 mnasnet_a1
 mobilefacenet
 mobilenet_v2
-modelGen
-pnasnet_mobile
-resnet101
-resnet152
-resnet18
-resnet34
-resnet50
-ronin_2d_cp9
-shufflenet
-squeezenet
-transformer
-vgg11
-vgg11_bn
-vgg16_bn
-vgg19
-vgg19_bn
 yolov5s
-yolov5s_fix_resize
 dataset
 tools
 output

test_benchmark/ONNX/cifarnet/pd_infer.py

@@ -1,5 +1,4 @@
 import paddle
-import paddle.fluid as fluid
 import numpy as np
 import pickle
 import sys
@@ -11,11 +10,8 @@
     exe = paddle.static.Executor(paddle.CPUPlace())
 
     # test dygraph
-    [prog, inputs, outputs] = fluid.io.load_inference_model(
-        dirname="pd_model_dygraph/inference_model/",
-        executor=exe,
-        model_filename="model.pdmodel",
-        params_filename="model.pdiparams")
+    [prog, inputs, outputs] = paddle.static.load_inference_model(
+        path_prefix="pd_model_dygraph/inference_model/model", executor=exe)
     data = np.load("../dataset/cifarnet/input.npy")
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 

test_benchmark/ONNX/circledet/pd_infer.py

@@ -1,35 +1,3 @@
-import paddle.fluid as fluid
-import numpy as np
-import sys
-
-# model_name = sys.argv[1]
-# model_dir = sys.argv[2]
-
-# f = open('result.txt', 'w')
-# f.write("======{}: ".format(model_name[:-1]))
-# try:
-#     exe = fluid.Executor(fluid.CPUPlace())
-#     [prog, inputs, outputs] = fluid.io.load_inference_model(dirname=model_dir, executor=exe)
-#     data = np.load('input_0.npy')
-#     result = exe.run(prog, feed={inputs[0]:data}, fetch_list=outputs)
-
-#     tf_result = np.load('result.npy')
-#     diff = result[0] - tf_result
-#     max_abs_diff = np.fabs(diff).max()
-
-#     if max_abs_diff < 1e-05:
-#         f.write("Successed\n")
-#     else:
-#         relative_diff = max_abs_diff / np.fabs(tf_result).max()
-#         if relative_diff < 1e-05:
-#             f.write("Successed\n")
-#         else:
-#             f.write("!!!!!Failed\n")
-# except:
-#     f.write("!!!!!Failed\n")
-#     raise
-
-import paddle.fluid as fluid
 import paddle
 import numpy as np
 import sys
@@ -41,11 +9,8 @@
     exe = paddle.static.Executor(paddle.CPUPlace())
 
     # test dygraph
-    [prog, inputs, outputs] = fluid.io.load_inference_model(
-        dirname="pd_model_dygraph/inference_model/",
-        executor=exe,
-        model_filename="model.pdmodel",
-        params_filename="model.pdiparams")
+    [prog, inputs, outputs] = paddle.static.load_inference_model(
+        path_prefix="pd_model_dygraph/inference_model/model", executor=exe)
     data = np.load('../dataset/circledet/input_0.npy')
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 

test_benchmark/ONNX/crnn_lstm/pd_infer.py

@@ -1,5 +1,4 @@
 import paddle
-import paddle.fluid as fluid
 import numpy as np
 import pickle
 import sys
@@ -11,11 +10,8 @@
     exe = paddle.static.Executor(paddle.CPUPlace())
 
     # test dygraph
-    [prog, inputs, outputs] = fluid.io.load_inference_model(
-        dirname="pd_model_dygraph/inference_model/",
-        executor=exe,
-        model_filename="model.pdmodel",
-        params_filename="model.pdiparams")
+    [prog, inputs, outputs] = paddle.static.load_inference_model(
+        path_prefix="pd_model_dygraph/inference_model/model", executor=exe)
     data = np.load("../dataset/crnn_lstm/input.npy")
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 

test_benchmark/ONNX/densenet121/pd_infer.py

@@ -1,4 +1,3 @@
-import paddle.fluid as fluid
 import paddle
 import numpy as np
 import sys
@@ -10,11 +9,8 @@
     exe = paddle.static.Executor(paddle.CPUPlace())
 
     # test dygraph
-    [prog, inputs, outputs] = fluid.io.load_inference_model(
-        dirname="pd_model_dygraph/inference_model/",
-        executor=exe,
-        model_filename="model.pdmodel",
-        params_filename="model.pdiparams")
+    [prog, inputs, outputs] = paddle.static.load_inference_model(
+        path_prefix="pd_model_dygraph/inference_model/model", executor=exe)
     data = np.load('../dataset/densenet121/input_0.npy')
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
     paddle.disable_static()

test_benchmark/ONNX/efficientnet_b0/pd_infer.py

@@ -1,4 +1,3 @@
-import paddle.fluid as fluid
 import paddle
 import numpy as np
 import sys
@@ -10,11 +9,8 @@
     exe = paddle.static.Executor(paddle.CPUPlace())
 
     # test dygraph
-    [prog, inputs, outputs] = fluid.io.load_inference_model(
-        dirname="pd_model_dygraph/inference_model/",
-        executor=exe,
-        model_filename="model.pdmodel",
-        params_filename="model.pdiparams")
+    [prog, inputs, outputs] = paddle.static.load_inference_model(
+        path_prefix="pd_model_dygraph/inference_model/model", executor=exe)
     data = np.load('../dataset/efficientnet_b0/input_0.npy')
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 

test_benchmark/ONNX/face_cyclegan_34/pd_infer.py

@@ -1,4 +1,3 @@
-import paddle.fluid as fluid
 import paddle
 import numpy as np
 import sys
@@ -10,11 +9,8 @@
     exe = paddle.static.Executor(paddle.CPUPlace())
 
     # test dygraph
-    [prog, inputs, outputs] = fluid.io.load_inference_model(
-        dirname="pd_model_dygraph/inference_model/",
-        executor=exe,
-        model_filename="model.pdmodel",
-        params_filename="model.pdiparams")
+    [prog, inputs, outputs] = paddle.static.load_inference_model(
+        path_prefix="pd_model_dygraph/inference_model/model", executor=exe)
     data = np.load('../dataset/face_cyclegan_34/input_0.npy')
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 

test_benchmark/ONNX/facedetector/pd_infer.py

@@ -1,5 +1,4 @@
 import paddle
-import paddle.fluid as fluid
 import numpy as np
 import pickle
 import sys
@@ -11,11 +10,8 @@
     exe = paddle.static.Executor(paddle.CPUPlace())
 
     # test dygraph
-    [prog, inputs, outputs] = fluid.io.load_inference_model(
-        dirname="pd_model_dygraph/inference_model/",
-        executor=exe,
-        model_filename="model.pdmodel",
-        params_filename="model.pdiparams")
+    [prog, inputs, outputs] = paddle.static.load_inference_model(
+        path_prefix="pd_model_dygraph/inference_model/model", executor=exe)
     data = np.load('../dataset/facedetector/input.npy')
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 

test_benchmark/ONNX/hand_landmark_ar/pd_infer.py

@@ -1,5 +1,4 @@
 import paddle
-import paddle.fluid as fluid
 import numpy as np
 import pickle
 import sys
@@ -10,11 +9,8 @@
     paddle.enable_static()
     exe = paddle.static.Executor(paddle.CPUPlace())
     # test Dygraph
-    [prog, inputs, outputs] = fluid.io.load_inference_model(
-        dirname="pd_model_dygraph/inference_model/",
-        executor=exe,
-        model_filename="model.pdmodel",
-        params_filename="model.pdiparams")
+    [prog, inputs, outputs] = paddle.static.load_inference_model(
+        path_prefix="pd_model_dygraph/inference_model/model", executor=exe)
     data = np.load("../dataset/hand_landmark_ar/input.npy")
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)