paddlex 3.0.1__py3-none-any.whl → 3.0.3__py3-none-any.whl

paddlex/.version

@@ -1 +1 @@
-3.0.1
+3.0.3

paddlex/inference/models/base/predictor/base_predictor.py

@@ -337,9 +337,11 @@ class BasePredictor(
             pp_option = PaddlePredictorOption(model_name=self.model_name)
         elif pp_option.model_name is None:
             pp_option.model_name = self.model_name
+            pp_option.reset_run_mode_by_default(model_name=self.model_name)
         if device_info:
             pp_option.device_type = device_info[0]
             pp_option.device_id = device_info[1]
+            pp_option.reset_run_mode_by_default(device_type=device_info[0])
         hpi_info = self.get_hpi_info()
         if hpi_info is not None:
             hpi_info = hpi_info.model_dump(exclude_unset=True)

paddlex/inference/models/common/static_infer.py

@@ -33,7 +33,7 @@ from ...utils.hpi import (
     suggest_inference_backend_and_config,
 )
 from ...utils.model_paths import get_model_paths
-from ...utils.pp_option import PaddlePredictorOption
+from ...utils.pp_option import PaddlePredictorOption, get_default_run_mode
 from ...utils.trt_config import DISABLE_TRT_HALF_OPS_CONFIG
 
 CACHE_DIR = ".cache"
@@ -407,15 +407,10 @@ class PaddleInfer(StaticInfer):
                 assert self._option.device_type == "cpu"
                 config.disable_gpu()
                 if "mkldnn" in self._option.run_mode:
-                    try:
-                        config.enable_mkldnn()
-                        if "bf16" in self._option.run_mode:
-                            config.enable_mkldnn_bfloat16()
-                    except Exception:
-                        logging.warning(
-                            "MKL-DNN is not available. We will disable MKL-DNN."
-                        )
-                    config.set_mkldnn_cache_capacity(-1)
+                    config.enable_mkldnn()
+                    if "bf16" in self._option.run_mode:
+                        config.enable_mkldnn_bfloat16()
+                    config.set_mkldnn_cache_capacity(self._option.mkldnn_cache_capacity)
                 else:
                     if hasattr(config, "disable_mkldnn"):
                         config.disable_mkldnn()
@@ -639,10 +634,19 @@ class HPInfer(StaticInfer):
                 )
             backend_config = self._config.backend_config or {}
 
-        if backend == "paddle" and not backend_config:
-            logging.warning(
-                "The Paddle Inference backend is selected with the default configuration. This may not provide optimal performance."
-            )
+        if backend == "paddle":
+            if not backend_config:
+                is_default_config = True
+            elif backend_config.keys() != {"run_mode"}:
+                is_default_config = False
+            else:
+                is_default_config = backend_config["run_mode"] == get_default_run_mode(
+                    self._config.pdx_model_name, self._config.device_type
+                )
+            if is_default_config:
+                logging.warning(
+                    "The Paddle Inference backend is selected with the default configuration. This may not provide optimal performance."
+                )
 
         return backend, backend_config
 
@@ -683,6 +687,8 @@ class HPInfer(StaticInfer):
         return PaddleInfer(self._model_dir, self._model_file_prefix, option=pp_option)
 
     def _build_ui_runtime(self, backend, backend_config, ui_option=None):
+        # TODO: Validate the compatibility of backends with device types
+
         from ultra_infer import ModelFormat, Runtime, RuntimeOption
 
         if ui_option is None:

paddlex/inference/models/common/ts/funcs.py

@@ -17,10 +17,11 @@ from typing import Callable, Dict, List, Optional, Union
 
 import numpy as np
 import pandas as pd
+from packaging.version import Version
 from pandas.tseries import holiday as hd
 from pandas.tseries.offsets import DateOffset, Day, Easter
 
-from .....utils.deps import function_requires_deps, is_dep_available
+from .....utils.deps import function_requires_deps, get_dep_version, is_dep_available
 
 if is_dep_available("chinese-calendar"):
     import chinese_calendar
@@ -496,13 +497,23 @@ def time_feature(
     # Extend the time series if no known_cov_numeric
     if not kcov:
         freq = freq if freq is not None else pd.infer_freq(tf_kcov[time_col])
-        extend_time = pd.date_range(
-            start=tf_kcov[time_col][-1],
-            freq=freq,
-            periods=extend_points + 1,
-            closed="right",
-            name=time_col,
-        ).to_frame()
+        pd_version = get_dep_version("pandas")
+        if Version(pd_version) >= Version("1.4"):
+            extend_time = pd.date_range(
+                start=tf_kcov[time_col][-1],
+                freq=freq,
+                periods=extend_points + 1,
+                inclusive="right",
+                name=time_col,
+            ).to_frame()
+        else:
+            extend_time = pd.date_range(
+                start=tf_kcov[time_col][-1],
+                freq=freq,
+                periods=extend_points + 1,
+                closed="right",
+                name=time_col,
+            ).to_frame()
         tf_kcov = pd.concat([tf_kcov, extend_time])
 
     # Extract and add time features to known_cov_numeric

paddlex/inference/models/formula_recognition/predictor.py

@@ -136,7 +136,7 @@ class FormulaRecPredictor(BasePredictor):
         }
 
     @register("DecodeImage")
-    def build_readimg(self, channel_first, img_mode):
+    def build_readimg(self, channel_first, img_mode="RGB"):
         assert channel_first == False
         return "Read", ReadImage(format=img_mode)
 

paddlex/inference/models/formula_recognition/processors.py

@@ -365,7 +365,7 @@ class LaTeXOCRDecode(object):
         dec = [self.tokenizer.decode(tok) for tok in tokens]
         dec_str_list = [
             "".join(detok.split(" "))
-            .replace("臓", " ")
+            .replace("Ġ", " ")
             .replace("[EOS]", "")
             .replace("[BOS]", "")
             .replace("[PAD]", "")
@@ -798,7 +798,7 @@ class UniMERNetDecode(object):
             for i in reversed(range(len(toks[b]))):
                 if toks[b][i] is None:
                     toks[b][i] = ""
-                toks[b][i] = toks[b][i].replace("臓", " ").strip()
+                toks[b][i] = toks[b][i].replace("Ġ", " ").strip()
                 if toks[b][i] in (
                     [
                         self.tokenizer.bos_token,

paddlex/inference/models/text_recognition/result.py

@@ -35,7 +35,7 @@ class TextRecResult(BaseCVResult):
 
     def _to_img(self):
         """Draw label on image"""
-        image = Image.fromarray(self["input_img"])
+        image = Image.fromarray(self["input_img"][:, :, ::-1])
         rec_text = self["rec_text"]
         rec_score = self["rec_score"]
         image = image.convert("RGB")