pir_infer

.pre-commit-config.yaml

@@ -8,11 +8,6 @@ repos:
         files: \.(md|yml)$
     -   id: remove-tabs
         files: \.(md|yml)$
--   repo: https://github.com/PaddlePaddle/mirrors-yapf.git
-    rev: v0.16.2
-    hooks:
-    -   id: yapf
-        files: (.*\.(py|bzl)|BUILD|.*\.BUILD|WORKSPACE)$
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
     hooks:

ce_tests/dygraph/quant/src/eval.py

@@ -17,9 +17,13 @@
 
 
 def eval(args):
-    model_file = os.path.join(args.model_path, args.model_filename)
-    params_file = os.path.join(args.model_path, args.params_filename)
-    config = paddle_infer.Config(model_file, params_file)
+    if '2' in paddle.__version__.split('.')[0]:
+        config = paddle.inference.Config(
+            os.path.join(args.model_path, args.model_filename),
+            os.path.join(args.model_path, args.params_filename))
+    else:
+        model_prefix = args.model_filename.split('.')[0]
+        config = paddle.inference.Config(os.path.join(args.model_path, model_prefix))
     config.enable_mkldnn()
     config.switch_ir_optim(False)
 

ce_tests/dygraph/quant/src/test.py

@@ -18,9 +18,13 @@
 
 def eval(args):
     # create predictor
-    model_file = os.path.join(args.model_path, args.model_filename)
-    params_file = os.path.join(args.model_path, args.params_filename)
-    config = paddle_infer.Config(model_file, params_file)
+    if '2' in paddle.__version__.split('.')[0]:
+        config = paddle.inference.Config(
+            os.path.join(args.model_path, args.model_filename),
+            os.path.join(args.model_path, args.params_filename))
+    else:
+        model_prefix = args.model_filename.split('.')[0]
+        config = paddle.inference.Config(os.path.join(args.model_path, model_prefix))
     if args.use_gpu:
         config.enable_use_gpu(1000, 0)
     if not args.ir_optim:

demo/dygraph/post_quant/eval.py

@@ -30,9 +30,14 @@
 
 def eval():
     # create predictor
-    model_file = os.path.join(FLAGS.model_path, FLAGS.model_filename)
-    params_file = os.path.join(FLAGS.model_path, FLAGS.params_filename)
-    config = paddle_infer.Config(model_file, params_file)
+    if '2' in paddle.__version__.split('.')[0]:
+        config = paddle.inference.Config(
+            os.path.join(FLAGS.model_path, FLAGS.model_filename),
+            os.path.join(FLAGS.model_path, FLAGS.params_filename))
+    else:
+        model_prefix = FLAGS.model_filename.split('.')[0]
+        config = paddle.inference.Config(os.path.join(FLAGS.model_path, model_prefix))
+
     if FLAGS.use_gpu:
         config.enable_use_gpu(1000, 0)
     if not FLAGS.ir_optim:

example/auto_compression/detection/paddle_inference_eval.py

@@ -243,9 +243,13 @@ def load_predictor(
         raise ValueError(
             "Predict by TensorRT mode: {}, expect device=='GPU', but device == {}".
             format(precision, device))
-    config = Config(
+    # support paddle 2.x
+    if '2' in paddle.__version__.split('.')[0]:
+        config = Config(
         os.path.join(model_dir, "model.pdmodel"),
         os.path.join(model_dir, "model.pdiparams"))
+    else:
+        config = Config(os.path.join(model_dir, "model"))
 
     config.enable_memory_optim()
     if device == "GPU":

example/auto_compression/image_classification/paddle_inference_eval.py

@@ -113,9 +113,14 @@ def __init__(self):
 
     def _create_paddle_predictor(self):
         inference_model_dir = args.model_path
-        model_file = os.path.join(inference_model_dir, args.model_filename)
-        params_file = os.path.join(inference_model_dir, args.params_filename)
-        config = paddle.inference.Config(model_file, params_file)
+        if '2' in paddle.__version__.split('.')[0]:
+            config = paddle.inference.Config(
+            os.path.join(inference_model_dir, args.model_filename),
+            os.path.join(inference_model_dir, args.params_filename))
+        else:
+            model_prefix = args.model_filename.split('.')[0]
+            config = paddle.inference.Config(os.path.join(inference_model_dir, model_prefix))
+
         precision = paddle.inference.Config.Precision.Float32
         if args.use_int8:
             precision = paddle.inference.Config.Precision.Int8

example/auto_compression/nlp/paddle_inference_eval.py

@@ -207,9 +207,13 @@ def create_predictor(cls, args):
         create_predictor func
         """
         cls.rerun_flag = False
-        config = paddle.inference.Config(
-            os.path.join(args.model_path, args.model_filename),
-            os.path.join(args.model_path, args.params_filename))
+        if '2' in paddle.__version__.split('.')[0]:
+            config = paddle.inference.Config(
+                os.path.join(args.model_path, args.model_filename),
+                os.path.join(args.model_path, args.params_filename))
+        else:
+            model_prefix=args.model_filename.split('.')[0]
+            config = paddle.inference.Config(os.path.join(args.model_path, model_prefix))
         config.switch_ir_debug(True)
         # 适用于ERNIE 3.0-Medium模型
         # config.exp_disable_tensorrt_ops(["elementwise_add"])

example/auto_compression/nlp/paddle_inference_eval_uie.py

@@ -162,10 +162,14 @@ def create_predictor(cls, args):
         """
         create_predictor func
         """
-        cls.rerun_flag = False
-        config = paddle.inference.Config(
-            os.path.join(args.model_path, args.model_filename),
-            os.path.join(args.model_path, args.params_filename))
+        cls.rerun_flag = False    
+        if '2' in paddle.__version__.split('.')[0]:
+            config = paddle.inference.Config(
+                os.path.join(args.model_path, args.model_filename),
+                os.path.join(args.model_path, args.params_filename))
+        else:
+            model_prefix=args.model_filename.split('.')[0]
+            config = paddle.inference.Config(os.path.join(args.model_path, model_prefix))
         if args.device == "gpu":
             # set GPU configs accordingly
             config.enable_use_gpu(100, 0)

example/auto_compression/pytorch_huggingface/paddle_inference_eval.py

@@ -188,9 +188,14 @@ def create_predictor(cls, args):
         create_predictor func
         """
         cls.rerun_flag = False
-        config = paddle.inference.Config(
-            os.path.join(args.model_path, args.model_filename),
-            os.path.join(args.model_path, args.params_filename))
+
+        if '2' in paddle.__version__.split('.')[0]:
+            config = paddle.inference.Config(
+                os.path.join(args.model_path, args.model_filename),
+                os.path.join(args.model_path, args.params_filename))
+        else:
+            model_prefix = args.model_filename.split('.')[0]
+            config = paddle.inference.Config(os.path.join(args.model_path, model_prefix))
 
         if args.device == "gpu":
             # set GPU configs accordingly

example/auto_compression/pytorch_yolo_series/paddle_inference_eval.py

@@ -253,9 +253,13 @@ def load_predictor(
         raise ValueError(
             "Predict by TensorRT mode: {}, expect device=='GPU', but device == {}".
             format(precision, device))
-    config = Config(
+    if '2' in paddle.__version__.split('.')[0]:
+        config = Config(
         os.path.join(model_dir, "model.pdmodel"),
         os.path.join(model_dir, "model.pdiparams"))
+    else:
+        config = Config(os.path.join(model_dir, "model"))
+
     if device == "GPU":
         # initial GPU memory(M), device ID
         config.enable_use_gpu(200, 0)

example/auto_compression/pytorch_yolo_series/paddle_trt_infer.py

@@ -244,9 +244,12 @@ def load_predictor(model_dir,
         raise ValueError(
             "Predict by TensorRT mode: {}, expect device=='GPU', but device == {}"
             .format(run_mode, device))
-    config = Config(
-        os.path.join(model_dir, 'model.pdmodel'),
-        os.path.join(model_dir, 'model.pdiparams'))
+    if '2' in paddle.__version__.split('.')[0]:
+        config = Config(
+        os.path.join(model_dir, "model.pdmodel"),
+        os.path.join(model_dir, "model.pdiparams"))
+    else:
+        config = Config(os.path.join(model_dir, "model"))
     if device == 'GPU':
         # initial GPU memory(M), device ID
         config.enable_use_gpu(200, 0)

example/auto_compression/semantic_segmentation/paddle_inference_eval.py

@@ -44,9 +44,13 @@ def load_predictor(args):
     load predictor func
     """
     rerun_flag = False
-    model_file = os.path.join(args.model_path, args.model_filename)
-    params_file = os.path.join(args.model_path, args.params_filename)
-    pred_cfg = PredictConfig(model_file, params_file)
+    if '2' in paddle.__version__.split('.')[0]:
+        pred_cfg = PredictConfig(
+        os.path.join(args.model_path, args.model_filename),
+        os.path.join(args.model_path, args.params_filename))
+    else:
+        model_prefix = args.model_filename.split(".")[0]
+        pred_cfg = PredictConfig(os.path.join(args.model_path, model_prefix))
     pred_cfg.enable_memory_optim()
     pred_cfg.switch_ir_optim(True)
     if args.device == "GPU":

example/quantization/ptq/classification/eval.py

@@ -30,9 +30,13 @@
 
 def eval():
     # create predictor
-    model_file = os.path.join(FLAGS.model_path, FLAGS.model_filename)
-    params_file = os.path.join(FLAGS.model_path, FLAGS.params_filename)
-    config = paddle_infer.Config(model_file, params_file)
+    if '2' in paddle.__version__.split('.')[0]:
+        config = paddle.inference.Config(
+            os.path.join(FLAGS.model_path, FLAGS.model_filename),
+            os.path.join(FLAGS.model_path, FLAGS.params_filename))
+    else:
+        model_prefix = FLAGS.model_filename.split('.')[0]
+        config = paddle.inference.Config(os.path.join(FLAGS.model_path, model_prefix))
     if FLAGS.use_gpu:
         config.enable_use_gpu(1000, 0)
     if not FLAGS.ir_optim: