[PaddleV3] 修复依赖 paddle.fluid 的 caffe 模型

test_benchmark/Caffe/3class/deploy_infer.py

@@ -3,7 +3,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/Caffe/3class/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
@@ -16,11 +15,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)
     # test dygraph
     paddle.disable_static()
     from pd_model_dygraph.x2paddle_code import main

test_benchmark/Caffe/AlexNet/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/Caffe/AlexNet/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
@@ -18,11 +17,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)
     # test dygraph
     paddle.disable_static()
     from pd_model_dygraph.x2paddle_code import main

test_benchmark/Caffe/FaceDetction/deploy_infer.py

@@ -3,7 +3,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/Caffe/FaceDetction/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
@@ -16,11 +15,9 @@
 
     # test dygraph
     paddle.enable_static()
-    [prog, 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")
+    [prog, feed_target_names,
+     fetch_targets] = paddle.static.load_inference_model(
+         path_prefix="pd_model_dygraph/inference_model/model", executor=exe)
 
     result = exe.run(prog,
                      feed={feed_target_names[0]: input_data},

test_benchmark/Caffe/MNasNet/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/Caffe/MNasNet/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
@@ -19,11 +18,9 @@
     exe = paddle.static.Executor(paddle.CPUPlace())
 
     # test dygraph
-    [prog, 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")
+    [prog, feed_target_names,
+     fetch_targets] = paddle.static.load_inference_model(
+         path_prefix="pd_model_dygraph/inference_model/model", executor=exe)
     result = exe.run(prog,
                      feed={feed_target_names[0]: input_data},
                      fetch_list=fetch_targets)

test_benchmark/Caffe/MTCNN1/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/Caffe/MTCNN1/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
@@ -19,11 +18,9 @@
     exe = paddle.static.Executor(paddle.CPUPlace())
 
     # test dygraph
-    [prog, 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")
+    [prog, feed_target_names,
+     fetch_targets] = paddle.static.load_inference_model(
+         path_prefix="pd_model_dygraph/inference_model/model", executor=exe)
     result = exe.run(prog,
                      feed={feed_target_names[0]: input_data},
                      fetch_list=fetch_targets)

test_benchmark/Caffe/MTCNN2/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/Caffe/MTCNN2/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
@@ -19,11 +18,9 @@
     exe = paddle.static.Executor(paddle.CPUPlace())
 
     # test dygraph
-    [prog, 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")
+    [prog, feed_target_names,
+     fetch_targets] = paddle.static.load_inference_model(
+         path_prefix="pd_model_dygraph/inference_model/model", executor=exe)
     result = exe.run(prog,
                      feed={feed_target_names[0]: input_data},
                      fetch_list=fetch_targets)

test_benchmark/Caffe/MTCNN3/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/Caffe/MTCNN3/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
@@ -19,11 +18,9 @@
     exe = paddle.static.Executor(paddle.CPUPlace())
 
     # test dygraph
-    [prog, 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")
+    [prog, feed_target_names,
+     fetch_targets] = paddle.static.load_inference_model(
+         path_prefix="pd_model_dygraph/inference_model/model", executor=exe)
     result = exe.run(prog,
                      feed={feed_target_names[0]: input_data},
                      fetch_list=fetch_targets)

test_benchmark/Caffe/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/Caffe/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
@@ -19,11 +18,9 @@
     exe = paddle.static.Executor(paddle.CPUPlace())
 
     # test dygraph
-    [prog, 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")
+    [prog, feed_target_names,
+     fetch_targets] = paddle.static.load_inference_model(
+         path_prefix="pd_model_dygraph/inference_model/model", executor=exe)
     result = exe.run(prog,
                      feed={feed_target_names[0]: input_data},
                      fetch_list=fetch_targets)

test_benchmark/Caffe/MobileNetV2/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/Caffe/MobileNetV2/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
@@ -19,11 +18,9 @@
     exe = paddle.static.Executor(paddle.CPUPlace())
 
     # test dygraph
-    [prog, 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")
+    [prog, feed_target_names,
+     fetch_targets] = paddle.static.load_inference_model(
+         path_prefix="pd_model_dygraph/inference_model/model", executor=exe)
     result = exe.run(prog,
                      feed={feed_target_names[0]: input_data},
                      fetch_list=fetch_targets)

test_benchmark/Caffe/ResNet18/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/Caffe/ResNet18/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
@@ -19,11 +18,9 @@
     exe = paddle.static.Executor(paddle.CPUPlace())
 
     # test dygraph
-    [prog, 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")
+    [prog, feed_target_names,
+     fetch_targets] = paddle.static.load_inference_model(
+         path_prefix="pd_model_dygraph/inference_model/model", executor=exe)
     result = exe.run(prog,
                      feed={feed_target_names[0]: input_data},
                      fetch_list=fetch_targets)

test_benchmark/Caffe/ResNet50/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/Caffe/ResNet50/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
@@ -19,11 +18,9 @@
     exe = paddle.static.Executor(paddle.CPUPlace())
 
     # test dygraph
-    [prog, 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")
+    [prog, feed_target_names,
+     fetch_targets] = paddle.static.load_inference_model(
+         path_prefix="pd_model_dygraph/inference_model/model", executor=exe)
     result = exe.run(prog,
                      feed={feed_target_names[0]: input_data},
                      fetch_list=fetch_targets)

test_benchmark/Caffe/SSD/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/Caffe/SSD/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
@@ -18,16 +17,14 @@
     paddle.enable_static()
     exe = paddle.static.Executor(paddle.CPUPlace())
     # test dygraph
-    [prog, 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")
+    [prog, feed_target_names,
+     fetch_targets] = paddle.static.load_inference_model(
+         path_prefix="pd_model_dygraph/inference_model/model", executor=exe)
     result = exe.run(prog,
                      feed={feed_target_names[0]: input_data},
                      fetch_list=fetch_targets,
                      return_numpy=False)
-    lod = result[0].lod()[0]
+    lod = result[0].lod()
     res_pd = np.asarray(result[0])
     res_cf = caffe_output['detection_out'][0]
     diffTest = True

test_benchmark/Caffe/SegFlow/pd_infer.py

@@ -1,4 +1,3 @@
-import paddle.fluid as fluid
 import paddle
 import numpy as np
 import sys
@@ -11,11 +10,8 @@
     exe = paddle.static.Executor(paddle.CUDAPlace(0))
 
     # 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/SegFlow/inputs_segflow_0314.pkl", "rb") as fr:
         input_list = pickle.load(fr)
     result = exe.run(prog,

test_benchmark/Caffe/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