[PaddleV3] 修复部分依赖 paddle.fluid 的 tensorflow 模型 part 1 (#1069)

megemini · web-flow · commit 085508d2fcf1 · 2024-10-23T14:23:08.000+08:00
* [Fix] version check

* [Fix] tensorflow version and initailizer

* [Fix] tensorflow albert

* [Fix] tensorflow inceptionresnetv2

* [Fix] tensorflow inceptionv3

* [Fix] tensorflow inceptionv4

* [Fix] tensorflow mnasneta1

* [Fix] tensorflow mtcnn onet

* [Fix] tensorflow mtcnn pnet

* [Fix] tensorflow mtcnn rnet

* [Fix] tensorflow mobilenetv1

* [Fix] tensorflow decoder eager

* [Fix] tensorflow mobilenetv2

* [Fix] tensorflow mobilenetv3 large

* [Update] black.list
diff --git a/test_benchmark/TensorFlow/AlBert/deploy_infer.py b/test_benchmark/TensorFlow/AlBert/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
 
diff --git a/test_benchmark/TensorFlow/AlBert/pd_infer.py b/test_benchmark/TensorFlow/AlBert/pd_infer.py
@@ -1,5 +1,4 @@
 import paddle
-import paddle.fluid as fluid
 import numpy
 import sys
 import pickle
@@ -18,11 +17,8 @@
 
     # test dygraph
     [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")
+     fetch_targets] = paddle.static.load_inference_model(
+         path_prefix="pd_model_dygraph/inference_model/model", executor=exe)
 
     result = exe.run(inference_program,
                      feed={
diff --git a/test_benchmark/TensorFlow/InceptionResNetV2/deploy_infer.py b/test_benchmark/TensorFlow/InceptionResNetV2/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
 
diff --git a/test_benchmark/TensorFlow/InceptionResNetV2/pd_infer.py b/test_benchmark/TensorFlow/InceptionResNetV2/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/InceptionResNetV2/input.npy')
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 
diff --git a/test_benchmark/TensorFlow/InceptionV3/deploy_infer.py b/test_benchmark/TensorFlow/InceptionV3/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
 
diff --git a/test_benchmark/TensorFlow/InceptionV3/pd_infer.py b/test_benchmark/TensorFlow/InceptionV3/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
@@ -17,11 +16,9 @@
 
     # 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")
+     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]: data},
                      fetch_list=fetch_targets)
diff --git a/test_benchmark/TensorFlow/InceptionV4/deploy_infer.py b/test_benchmark/TensorFlow/InceptionV4/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
 
diff --git a/test_benchmark/TensorFlow/InceptionV4/pd_infer.py b/test_benchmark/TensorFlow/InceptionV4/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/InceptionV4/input.npy')
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 
diff --git a/test_benchmark/TensorFlow/MNASNetA1/deploy_infer.py b/test_benchmark/TensorFlow/MNASNetA1/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
 
diff --git a/test_benchmark/TensorFlow/MNASNetA1/pd_infer.py b/test_benchmark/TensorFlow/MNASNetA1/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/MNASNetA1/input.npy')
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 
diff --git a/test_benchmark/TensorFlow/MTCNN-ONet/deploy_infer.py b/test_benchmark/TensorFlow/MTCNN-ONet/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
 
diff --git a/test_benchmark/TensorFlow/MTCNN-ONet/pd_infer.py b/test_benchmark/TensorFlow/MTCNN-ONet/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/MTCNN-ONet/input.npy')
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 
diff --git a/test_benchmark/TensorFlow/MTCNN-PNet/deploy_infer.py b/test_benchmark/TensorFlow/MTCNN-PNet/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
 
diff --git a/test_benchmark/TensorFlow/MTCNN-PNet/pd_infer.py b/test_benchmark/TensorFlow/MTCNN-PNet/pd_infer.py
@@ -1,5 +1,4 @@
 import paddle
-import paddle.fluid as fluid
 import numpy as np
 import pickle
 import sys
@@ -23,11 +22,8 @@ def check_fuser(file_path, standard_code):
     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/MTCNN-PNet/input.npy')
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 
diff --git a/test_benchmark/TensorFlow/MTCNN-RNet/deploy_infer.py b/test_benchmark/TensorFlow/MTCNN-RNet/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
 
diff --git a/test_benchmark/TensorFlow/MTCNN-RNet/pd_infer.py b/test_benchmark/TensorFlow/MTCNN-RNet/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/MTCNN-RNet/input.npy')
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 
diff --git a/test_benchmark/TensorFlow/MobileNetV1/deploy_infer.py b/test_benchmark/TensorFlow/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
 
diff --git a/test_benchmark/TensorFlow/MobileNetV1/pd_infer.py b/test_benchmark/TensorFlow/MobileNetV1/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/MobileNetV1/input.npy')
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 
diff --git a/test_benchmark/TensorFlow/MobileNetV2/deploy_infer.py b/test_benchmark/TensorFlow/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
 
diff --git a/test_benchmark/TensorFlow/MobileNetV2/pd_infer.py b/test_benchmark/TensorFlow/MobileNetV2/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/MobileNetV2/input.npy')
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 
diff --git a/test_benchmark/TensorFlow/MobileNetV3_large/deploy_infer.py b/test_benchmark/TensorFlow/MobileNetV3_large/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
 
diff --git a/test_benchmark/TensorFlow/MobileNetV3_large/pd_infer.py b/test_benchmark/TensorFlow/MobileNetV3_large/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/MobileNetV3_large/input.npy')
     result = exe.run(prog, feed={inputs[0]: data}, fetch_list=outputs)
 
diff --git a/test_benchmark/TensorFlow/black.list b/test_benchmark/TensorFlow/black.list
@@ -1,16 +1,5 @@
-AlBert
 EfficientNet
-InceptionResNetV2
-InceptionV3
-InceptionV4
 KerasBert
-MNASNetA1
-MTCNN-ONet
-MTCNN-PNet
-MTCNN-RNet
-MobileNetV1
-MobileNetV2
-MobileNetV3_large
 ResNetV1
 ResNetV2
 RetinaFace
diff --git a/x2paddle/convert.py b/x2paddle/convert.py
@@ -13,13 +13,16 @@
 # limitations under the License.
 
 from six import text_type as _text_type
-from x2paddle import program
-from x2paddle.utils import ConverterCheck, check_version
+from packaging.version import Version
+
 import argparse
 import sys
 import logging
 import time
 
+from x2paddle import program
+from x2paddle.utils import ConverterCheck, check_version
+
 logging.basicConfig(level=logging.INFO, format="%(message)s")
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
@@ -160,10 +163,8 @@ def tf2paddle(model_path,
         os.environ["TF_CPP_MIN_LOG_LEVEL"] = '3'
         import tensorflow as tf
         version = tf.__version__
-        if version >= '2.0.0' or version < '1.0.0':
-            logging.info(
-                "[ERROR] 1.0.0<=TensorFlow<2.0.0 is required, and v1.14.0 is recommended"
-            )
+        if Version(version) >= Version('3.0.0'):
+            logging.info("[ERROR] TensorFlow<3.0.0 is required.")
             return
     except:
         logging.info(
diff --git a/x2paddle/decoder/tf_decoder.py b/x2paddle/decoder/tf_decoder.py
@@ -346,7 +346,9 @@ def __init__(self, pb_model, data_format="NHWC", define_input_shape=False):
             initializer = tf.compat.v1.global_variables_initializer()
         except:
             initializer = tf.global_variables_initializer()
-        self.sess.run(initializer)
+
+        if initializer is not None:
+            self.sess.run(initializer)
 
         self.tf_graph = TFGraph(
             self.sess.graph._as_graph_def(add_shapes=True)[0], data_format)
@@ -428,6 +430,7 @@ def _check_input_shape(self, graph_def):
                 ]
                 assert shape.count(None) <= 1, "Only one dimension can be None"
                 try:
+                    tf.compat.v1.disable_eager_execution()
                     x2paddle_input = tf.compat.v1.placeholder(
                         dtype=dtype,
                         shape=shape,
