[PaddleV3] 修复部分依赖 paddle.fluid 的 tensorflow 模型 part 2

test_benchmark/TensorFlow/ResNetV1/deploy_infer.py

@@ -4,7 +4,6 @@
 
 import numpy as np
 import paddle
-import paddle.fluid as fluid
 from paddle.inference import Config
 from paddle.inference import create_predictor
 

test_benchmark/TensorFlow/ResNetV1/pd_infer.py

@@ -1,5 +1,4 @@
 import paddle
-import paddle.fluid as fluid
 import numpy as np
 import sys
 import os
@@ -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/ResNetV1/input.npy')
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 

test_benchmark/TensorFlow/ResNetV2/deploy_infer.py

@@ -4,7 +4,6 @@
 
 import numpy as np
 import paddle
-import paddle.fluid as fluid
 from paddle.inference import Config
 from paddle.inference import create_predictor
 

test_benchmark/TensorFlow/ResNetV2/pd_infer.py

@@ -1,5 +1,4 @@
 import paddle
-import paddle.fluid as fluid
 import numpy as np
 import sys
 import os
@@ -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/ResNetV2/input.npy')
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 
@@ -33,3 +29,5 @@
             f.write("!!!!!Dygraph Failed\n")
 except:
     f.write("!!!!!Failed\n")
+
+    raise

test_benchmark/TensorFlow/RetinaFace/deploy_infer.py

@@ -4,7 +4,6 @@
 
 import numpy as np
 import paddle
-import paddle.fluid as fluid
 from paddle.inference import Config
 from paddle.inference import create_predictor
 

test_benchmark/TensorFlow/RetinaFace/pd_infer.py

@@ -1,5 +1,4 @@
 import paddle
-import paddle.fluid as fluid
 import numpy as np
 import pickle
 import sys
@@ -12,11 +11,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/RetinaFace/input.npy')
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 

test_benchmark/TensorFlow/ShuffleNet/deploy_infer.py

@@ -4,7 +4,6 @@
 
 import numpy as np
 import paddle
-import paddle.fluid as fluid
 from paddle.inference import Config
 from paddle.inference import create_predictor
 

test_benchmark/TensorFlow/ShuffleNet/pd_infer.py

@@ -1,5 +1,4 @@
 import paddle
-import paddle.fluid as fluid
 import numpy as np
 import sys
 import os
@@ -11,12 +10,8 @@
 try:
     paddle.enable_static()
     exe = paddle.static.Executor(paddle.CPUPlace())
-
-    [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)
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 
     diff = result[0] - tf_result

test_benchmark/TensorFlow/SqueezeNet/deploy_infer.py

@@ -4,7 +4,6 @@
 
 import numpy as np
 import paddle
-import paddle.fluid as fluid
 from paddle.inference import Config
 from paddle.inference import create_predictor
 

test_benchmark/TensorFlow/SqueezeNet/pd_infer.py

@@ -1,5 +1,4 @@
 import paddle
-import paddle.fluid as fluid
 import numpy as np
 import sys
 import os
@@ -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/SqueezeNet/input.npy')
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 

test_benchmark/TensorFlow/ToyUNet-UNet/deploy_infer.py

@@ -4,7 +4,6 @@
 
 import numpy as np
 import paddle
-import paddle.fluid as fluid
 from paddle.inference import Config
 from paddle.inference import create_predictor
 

test_benchmark/TensorFlow/ToyUNet-UNet/pd_infer.py

@@ -1,5 +1,4 @@
 import paddle
-import paddle.fluid as fluid
 import numpy as np
 import pickle
 import sys
@@ -12,11 +11,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)
     with open('../dataset/ToyUNet-UNet/input.pkl', 'rb') as f1:
         data = pickle.load(f1)
 

test_benchmark/TensorFlow/UNet-GanUNet/deploy_infer.py

@@ -4,7 +4,6 @@
 
 import numpy as np
 import paddle
-import paddle.fluid as fluid
 from paddle.inference import Config
 from paddle.inference import create_predictor
 

test_benchmark/TensorFlow/UNet-GanUNet/pd_infer.py

@@ -1,5 +1,4 @@
 import paddle
-import paddle.fluid as fluid
 import numpy as np
 import pickle
 import sys
@@ -12,11 +11,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/UNet-GanUNet/input.npy')]
     result = exe.run(prog, feed={inputs[0]: data[0]}, fetch_list=outputs)
     print(result[0].shape, result[0].mean(), result[0].max(), result[0].min())

test_benchmark/TensorFlow/UNet-UNet/deploy_infer.py

@@ -4,7 +4,6 @@
 
 import numpy as np
 import paddle
-import paddle.fluid as fluid
 from paddle.inference import Config
 from paddle.inference import create_predictor
 

test_benchmark/TensorFlow/UNet-UNet/pd_infer.py

@@ -1,5 +1,4 @@
 import paddle
-import paddle.fluid as fluid
 import numpy as np
 import pickle
 import sys
@@ -12,11 +11,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/UNet-UNet/input.npy')]
     result = exe.run(prog, feed={inputs[0]: data[0]}, fetch_list=outputs)
 

test_benchmark/TensorFlow/VGG16/deploy_infer.py

@@ -4,7 +4,6 @@
 
 import numpy as np
 import paddle
-import paddle.fluid as fluid
 from paddle.inference import Config
 from paddle.inference import create_predictor
 

test_benchmark/TensorFlow/VGG16/pd_infer.py

@@ -1,5 +1,4 @@
 import paddle
-import paddle.fluid as fluid
 import numpy as np
 import sys
 import os
@@ -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/VGG16/input.npy')
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 

test_benchmark/TensorFlow/YOLOv3/deploy_infer.py

@@ -4,7 +4,6 @@
 
 import numpy as np
 import paddle
-import paddle.fluid as fluid
 from paddle.inference import Config
 from paddle.inference import create_predictor
 

test_benchmark/TensorFlow/YOLOv3/pd_infer.py

@@ -1,5 +1,4 @@
 import paddle
-import paddle.fluid as fluid
 import numpy as np
 import pickle
 import sys
@@ -12,11 +11,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/YOLOv3/input.npy')]
     result = exe.run(prog, feed={inputs[0]: data[0]}, fetch_list=outputs)
 

test_benchmark/TensorFlow/YOLOv3_darknet/deploy_infer.py

@@ -4,7 +4,6 @@
 
 import numpy as np
 import paddle
-import paddle.fluid as fluid
 from paddle.inference import Config
 from paddle.inference import create_predictor
 

test_benchmark/TensorFlow/YOLOv3_darknet/pd_infer.py

@@ -1,5 +1,4 @@
 import paddle
-import paddle.fluid as fluid
 import numpy as np
 import pickle
 import sys
@@ -14,11 +13,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)
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 
     diff = result[0] - tf_result

test_benchmark/TensorFlow/black.list

@@ -1,19 +1,6 @@
 EfficientNet
 KerasBert
-ResNetV1
-ResNetV2
-RetinaFace
-ShuffleNet
-SqueezeNet
 ToyUNet-ToyUnet
-ToyUNet-UNet
-UNet-GanUNet
-UNet-UNet
-VGG16
-YOLOv3
-YOLOv3_darknet
-frozen
-frozen_MobileNetV1
 pix2pix
 dataset
 tools

test_benchmark/TensorFlow/frozen/deploy_infer.py

@@ -4,7 +4,6 @@
 
 import numpy as np
 import paddle
-import paddle.fluid as fluid
 from paddle.inference import Config
 from paddle.inference import create_predictor
 

test_benchmark/TensorFlow/frozen/pd_infer.py

@@ -1,5 +1,4 @@
 import paddle
-import paddle.fluid as fluid
 import numpy as np
 import numpy
 import sys
@@ -17,11 +16,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)
 result = exe.run(prog,
                  feed={
                      inputs[0]: input_data["ipt0"],

test_benchmark/TensorFlow/frozen_MobileNetV1/deploy_infer.py

@@ -4,7 +4,6 @@
 
 import numpy as np
 import paddle
-import paddle.fluid as fluid
 from paddle.inference import Config
 from paddle.inference import create_predictor
 

test_benchmark/TensorFlow/frozen_MobileNetV1/pd_infer.py

@@ -1,6 +1,5 @@
 from __future__ import print_function
 import paddle
-import paddle.fluid as fluid
 import sys
 import os
 import numpy as np
@@ -14,11 +13,9 @@
 
 input_data = np.random.rand(1, 224, 224, 3).astype("float32")
 # test dygrah
-[inference_program, feed_target_names, fetch_targets
- ] = fluid.io.load_inference_model(dirname="pd_model_dygraph/inference_model/",
-                                   executor=exe,
-                                   model_filename="model.pdmodel",
-                                   params_filename="model.pdiparams")
+[inference_program, feed_target_names,
+ fetch_targets] = paddle.static.load_inference_model(
+     path_prefix="pd_model_dygraph/inference_model/model", executor=exe)
 
 result = exe.run(inference_program,
                  feed={feed_target_names[0]: input_data},