paddlex 3.0.2__py3-none-any.whl → 3.1.0__py3-none-any.whl

paddlex/inference/utils/pp_option.py

@@ -69,6 +69,7 @@ class PaddlePredictorOption(object):
 
     def __init__(self, model_name=None, **kwargs):
         super().__init__()
+        self._is_default_run_mode = True
         self._model_name = model_name
         self._cfg = {}
         self._init_option(**kwargs)
@@ -106,6 +107,10 @@ class PaddlePredictorOption(object):
                 raise Exception(
                     f"{k} is not supported to set! The supported option is: {self._get_settable_attributes()}"
                 )
+
+        if "run_mode" in self._cfg:
+            self._is_default_run_mode = False
+
         for k, v in self._get_default_config().items():
             self._cfg.setdefault(k, v)
 
@@ -122,12 +127,16 @@ class PaddlePredictorOption(object):
 
     def _get_default_config(self):
         """get default config"""
-        device_type, device_ids = parse_device(get_default_device())
+        if self.device_type is None:
+            device_type, device_ids = parse_device(get_default_device())
+            device_id = None if device_ids is None else device_ids[0]
+        else:
+            device_type, device_id = self.device_type, self.device_id
 
         default_config = {
             "run_mode": get_default_run_mode(self.model_name, device_type),
             "device_type": device_type,
-            "device_id": None if device_ids is None else device_ids[0],
+            "device_id": device_id,
             "cpu_threads": 8,
             "delete_pass": [],
             "enable_new_ir": True if self.model_name not in NEWIR_BLOCKLIST else False,
@@ -148,9 +157,15 @@ class PaddlePredictorOption(object):
         self._cfg[k] = v
         self.changed = True
 
+    def reset_run_mode_by_default(self, model_name=None, device_type=None):
+        if self._is_default_run_mode:
+            model_name = model_name or self.model_name
+            device_type = device_type or self.device_type
+            self._update("run_mode", get_default_run_mode(model_name, device_type))
+
     @property
     def run_mode(self):
-        return self._cfg["run_mode"]
+        return self._cfg.get("run_mode")
 
     @run_mode.setter
     def run_mode(self, run_mode: str):
@@ -189,11 +204,12 @@ class PaddlePredictorOption(object):
                 )
                 run_mode = "paddle"
 
+        self._is_default_run_mode = False
         self._update("run_mode", run_mode)
 
     @property
     def device_type(self):
-        return self._cfg["device_type"]
+        return self._cfg.get("device_type")
 
     @device_type.setter
     def device_type(self, device_type):
@@ -211,7 +227,7 @@ class PaddlePredictorOption(object):
 
     @property
     def device_id(self):
-        return self._cfg["device_id"]
+        return self._cfg.get("device_id")
 
     @device_id.setter
     def device_id(self, device_id):
@@ -219,7 +235,7 @@ class PaddlePredictorOption(object):
 
     @property
     def cpu_threads(self):
-        return self._cfg["cpu_threads"]
+        return self._cfg.get("cpu_threads")
 
     @cpu_threads.setter
     def cpu_threads(self, cpu_threads):
@@ -230,7 +246,7 @@ class PaddlePredictorOption(object):
 
     @property
     def delete_pass(self):
-        return self._cfg["delete_pass"]
+        return self._cfg.get("delete_pass")
 
     @delete_pass.setter
     def delete_pass(self, delete_pass):
@@ -238,7 +254,7 @@ class PaddlePredictorOption(object):
 
     @property
     def enable_new_ir(self):
-        return self._cfg["enable_new_ir"]
+        return self._cfg.get("enable_new_ir")
 
     @enable_new_ir.setter
     def enable_new_ir(self, enable_new_ir: bool):
@@ -247,7 +263,7 @@ class PaddlePredictorOption(object):
 
     @property
     def enable_cinn(self):
-        return self._cfg["enable_cinn"]
+        return self._cfg.get("enable_cinn")
 
     @enable_cinn.setter
     def enable_cinn(self, enable_cinn: bool):
@@ -256,7 +272,7 @@ class PaddlePredictorOption(object):
 
     @property
     def trt_cfg_setting(self):
-        return self._cfg["trt_cfg_setting"]
+        return self._cfg.get("trt_cfg_setting")
 
     @trt_cfg_setting.setter
     def trt_cfg_setting(self, config: Dict):
@@ -268,7 +284,7 @@ class PaddlePredictorOption(object):
 
     @property
     def trt_use_dynamic_shapes(self):
-        return self._cfg["trt_use_dynamic_shapes"]
+        return self._cfg.get("trt_use_dynamic_shapes")
 
     @trt_use_dynamic_shapes.setter
     def trt_use_dynamic_shapes(self, trt_use_dynamic_shapes):
@@ -276,7 +292,7 @@ class PaddlePredictorOption(object):
 
     @property
     def trt_collect_shape_range_info(self):
-        return self._cfg["trt_collect_shape_range_info"]
+        return self._cfg.get("trt_collect_shape_range_info")
 
     @trt_collect_shape_range_info.setter
     def trt_collect_shape_range_info(self, trt_collect_shape_range_info):
@@ -284,7 +300,7 @@ class PaddlePredictorOption(object):
 
     @property
     def trt_discard_cached_shape_range_info(self):
-        return self._cfg["trt_discard_cached_shape_range_info"]
+        return self._cfg.get("trt_discard_cached_shape_range_info")
 
     @trt_discard_cached_shape_range_info.setter
     def trt_discard_cached_shape_range_info(self, trt_discard_cached_shape_range_info):
@@ -294,7 +310,7 @@ class PaddlePredictorOption(object):
 
     @property
     def trt_dynamic_shapes(self):
-        return self._cfg["trt_dynamic_shapes"]
+        return self._cfg.get("trt_dynamic_shapes")
 
     @trt_dynamic_shapes.setter
     def trt_dynamic_shapes(self, trt_dynamic_shapes: Dict[str, List[List[int]]]):
@@ -305,7 +321,7 @@ class PaddlePredictorOption(object):
 
     @property
     def trt_dynamic_shape_input_data(self):
-        return self._cfg["trt_dynamic_shape_input_data"]
+        return self._cfg.get("trt_dynamic_shape_input_data")
 
     @trt_dynamic_shape_input_data.setter
     def trt_dynamic_shape_input_data(
@@ -315,7 +331,7 @@ class PaddlePredictorOption(object):
 
     @property
     def trt_shape_range_info_path(self):
-        return self._cfg["trt_shape_range_info_path"]
+        return self._cfg.get("trt_shape_range_info_path")
 
     @trt_shape_range_info_path.setter
     def trt_shape_range_info_path(self, trt_shape_range_info_path: str):
@@ -324,7 +340,7 @@ class PaddlePredictorOption(object):
 
     @property
     def trt_allow_rebuild_at_runtime(self):
-        return self._cfg["trt_allow_rebuild_at_runtime"]
+        return self._cfg.get("trt_allow_rebuild_at_runtime")
 
     @trt_allow_rebuild_at_runtime.setter
     def trt_allow_rebuild_at_runtime(self, trt_allow_rebuild_at_runtime):
@@ -332,7 +348,7 @@ class PaddlePredictorOption(object):
 
     @property
     def mkldnn_cache_capacity(self):
-        return self._cfg["mkldnn_cache_capacity"]
+        return self._cfg.get("mkldnn_cache_capacity")
 
     @mkldnn_cache_capacity.setter
     def mkldnn_cache_capacity(self, capacity: int):

paddlex/modules/anomaly_detection/dataset_checker/dataset_src/convert_dataset.py

@@ -100,9 +100,9 @@ def convert_labelme_dataset(input_dir):
                 if not os.path.exists(img_path):
                     logging.info("%s is not existed, skip this image" % img_path)
                     continue
-                img_name = img_path.split("/")[-1]
+                img_name = osp.basename(img_path)
                 img_file_list.append(f"images/{img_name}")
-                label_img_name = annotated_img_path.split("/")[-1]
+                label_img_name = osp.basename(annotated_img_path)
                 label_file_list.append(f"annotations/{label_img_name}")
 
                 img = np.asarray(cv2.imread(img_path))

paddlex/modules/face_recognition/dataset_checker/dataset_src/utils/visualizer.py

@@ -16,7 +16,7 @@ import numpy as np
 import PIL
 from PIL import ImageDraw, ImageFont
 
-from ......utils.fonts import PINGFANG_FONT_FILE_PATH
+from ......utils.fonts import PINGFANG_FONT
 
 
 def colormap(rgb=False):
@@ -114,7 +114,7 @@ def draw_label(image, label, label_map_dict):
     min_font_size = int(image_size[0] * 0.02)
     max_font_size = int(image_size[0] * 0.05)
     for font_size in range(max_font_size, min_font_size - 1, -1):
-        font = ImageFont.truetype(PINGFANG_FONT_FILE_PATH, font_size, encoding="utf-8")
+        font = ImageFont.truetype(PINGFANG_FONT.path, font_size, encoding="utf-8")
         if tuple(map(int, PIL.__version__.split("."))) <= (10, 0, 0):
             text_width_tmp, text_height_tmp = draw.textsize(
                 label_map_dict[int(label)], font
@@ -127,7 +127,7 @@ def draw_label(image, label, label_map_dict):
         if text_width_tmp <= image_size[0]:
             break
         else:
-            font = ImageFont.truetype(PINGFANG_FONT_FILE_PATH, min_font_size)
+            font = ImageFont.truetype(PINGFANG_FONT.path, min_font_size)
     color_list = colormap(rgb=True)
     color = tuple(color_list[0])
     font_color = tuple(font_colormap(3))

paddlex/modules/formula_recognition/dataset_checker/dataset_src/analyse_dataset.py

@@ -22,7 +22,7 @@ import numpy as np
 
 from .....utils.deps import function_requires_deps, is_dep_available
 from .....utils.file_interface import custom_open
-from .....utils.fonts import PINGFANG_FONT_FILE_PATH
+from .....utils.fonts import PINGFANG_FONT
 from .....utils.logging import warning
 
 if is_dep_available("opencv-contrib-python"):
@@ -128,7 +128,7 @@ def deep_analyse(dataset_path, output, datatype="FormulaRecDataset"):
     if os_system == "windows":
         plt.rcParams["font.sans-serif"] = "FangSong"
     else:
-        font = font_manager.FontProperties(fname=PINGFANG_FONT_FILE_PATH, size=15)
+        font = font_manager.FontProperties(fname=PINGFANG_FONT.path, size=15)
 
     fig, ax = plt.subplots(figsize=(15, 9), dpi=120)
     xlabel_name = "公式长度区间"

paddlex/modules/general_recognition/dataset_checker/dataset_src/analyse_dataset.py

@@ -19,7 +19,7 @@ import numpy as np
 
 from .....utils.deps import function_requires_deps, is_dep_available
 from .....utils.file_interface import custom_open
-from .....utils.fonts import PINGFANG_FONT_FILE_PATH
+from .....utils.fonts import PINGFANG_FONT
 
 if is_dep_available("matplotlib"):
     import matplotlib.pyplot as plt
@@ -52,7 +52,7 @@ def deep_analyse(dataset_path, output, dataset_type="ShiTuRec"):
     if os_system == "windows":
         plt.rcParams["font.sans-serif"] = "FangSong"
     else:
-        font = font_manager.FontProperties(fname=PINGFANG_FONT_FILE_PATH, size=10)
+        font = font_manager.FontProperties(fname=PINGFANG_FONT.path, size=10)
 
     x = np.arange(len(categories))  # 标签位置
     width = 0.35  # 每个条形的宽度

paddlex/modules/general_recognition/dataset_checker/dataset_src/utils/visualizer.py

@@ -16,7 +16,7 @@ import numpy as np
 import PIL
 from PIL import ImageDraw, ImageFont
 
-from ......utils.fonts import PINGFANG_FONT_FILE_PATH
+from ......utils.fonts import PINGFANG_FONT
 
 
 def colormap(rgb=False):
@@ -114,7 +114,7 @@ def draw_label(image, label):
     min_font_size = int(image_size[0] * 0.02)
     max_font_size = int(image_size[0] * 0.05)
     for font_size in range(max_font_size, min_font_size - 1, -1):
-        font = ImageFont.truetype(PINGFANG_FONT_FILE_PATH, font_size, encoding="utf-8")
+        font = ImageFont.truetype(PINGFANG_FONT.path, font_size, encoding="utf-8")
         if tuple(map(int, PIL.__version__.split("."))) <= (10, 0, 0):
             text_width_tmp, text_height_tmp = draw.textsize(label, font)
         else:
@@ -123,7 +123,7 @@ def draw_label(image, label):
         if text_width_tmp <= image_size[0]:
             break
         else:
-            font = ImageFont.truetype(PINGFANG_FONT_FILE_PATH, min_font_size)
+            font = ImageFont.truetype(PINGFANG_FONT.path, min_font_size)
     color_list = colormap(rgb=True)
     color = tuple(color_list[0])
     font_color = tuple(font_colormap(3))

paddlex/modules/image_classification/dataset_checker/dataset_src/analyse_dataset.py

@@ -20,7 +20,7 @@ import numpy as np
 
 from .....utils.deps import function_requires_deps, is_dep_available
 from .....utils.file_interface import custom_open
-from .....utils.fonts import PINGFANG_FONT_FILE_PATH
+from .....utils.fonts import PINGFANG_FONT
 
 if is_dep_available("matplotlib"):
     import matplotlib.pyplot as plt
@@ -68,7 +68,7 @@ def deep_analyse(dataset_path, output):
     if os_system == "windows":
         plt.rcParams["font.sans-serif"] = "FangSong"
     else:
-        font = font_manager.FontProperties(fname=PINGFANG_FONT_FILE_PATH, size=10)
+        font = font_manager.FontProperties(fname=PINGFANG_FONT.path, size=10)
     fig, ax = plt.subplots(figsize=(max(8, int(len(classes) / 5)), 5), dpi=300)
     ax.bar(x, cnts_train_sorted, width=0.5, label="train")
     ax.bar(x + width, cnts_val_sorted, width=0.5, label="val")

paddlex/modules/image_classification/dataset_checker/dataset_src/utils/visualizer.py

@@ -16,7 +16,7 @@ import numpy as np
 import PIL
 from PIL import ImageDraw, ImageFont
 
-from ......utils.fonts import PINGFANG_FONT_FILE_PATH
+from ......utils.fonts import PINGFANG_FONT
 
 
 def colormap(rgb=False):
@@ -114,7 +114,7 @@ def draw_label(image, label, label_map_dict):
     min_font_size = int(image_size[0] * 0.02)
     max_font_size = int(image_size[0] * 0.05)
     for font_size in range(max_font_size, min_font_size - 1, -1):
-        font = ImageFont.truetype(PINGFANG_FONT_FILE_PATH, font_size, encoding="utf-8")
+        font = ImageFont.truetype(PINGFANG_FONT.path, font_size, encoding="utf-8")
         if tuple(map(int, PIL.__version__.split("."))) <= (10, 0, 0):
             text_width_tmp, text_height_tmp = draw.textsize(
                 label_map_dict[int(label)], font
@@ -127,7 +127,7 @@ def draw_label(image, label, label_map_dict):
         if text_width_tmp <= image_size[0]:
             break
         else:
-            font = ImageFont.truetype(PINGFANG_FONT_FILE_PATH, min_font_size)
+            font = ImageFont.truetype(PINGFANG_FONT.path, min_font_size)
     color_list = colormap(rgb=True)
     color = tuple(color_list[0])
     font_color = tuple(font_colormap(3))

paddlex/modules/instance_segmentation/dataset_checker/dataset_src/analyse_dataset.py

@@ -20,7 +20,7 @@ from collections import defaultdict
 import numpy as np
 
 from .....utils.deps import function_requires_deps, is_dep_available
-from .....utils.fonts import PINGFANG_FONT_FILE_PATH
+from .....utils.fonts import PINGFANG_FONT
 
 if is_dep_available("matplotlib"):
     import matplotlib.pyplot as plt
@@ -64,7 +64,7 @@ def deep_analyse(dataset_dir, output):
     if os_system == "windows":
         plt.rcParams["font.sans-serif"] = "FangSong"
     else:
-        font = font_manager.FontProperties(fname=PINGFANG_FONT_FILE_PATH)
+        font = font_manager.FontProperties(fname=PINGFANG_FONT.path)
     fig, ax = plt.subplots(figsize=(max(8, int(len(classes) / 5)), 5), dpi=120)
     ax.bar(x, cnts_train_sorted, width=0.5, label="train")
     ax.bar(x + width, cnts_val_sorted, width=0.5, label="val")

paddlex/modules/instance_segmentation/dataset_checker/dataset_src/utils/visualizer.py

@@ -18,7 +18,7 @@ from PIL import Image, ImageDraw, ImageFont
 
 from ......utils import logging
 from ......utils.deps import function_requires_deps, is_dep_available
-from ......utils.fonts import PINGFANG_FONT_FILE_PATH
+from ......utils.fonts import PINGFANG_FONT
 
 if is_dep_available("pycocotools"):
     from pycocotools.coco import COCO
@@ -124,7 +124,7 @@ def draw_bbox(image, coco_info: "COCO", img_id):
         font_size = int(0.024 * int(image_info["width"])) + 2
     except:
         font_size = 12
-    font = ImageFont.truetype(PINGFANG_FONT_FILE_PATH, font_size, encoding="utf-8")
+    font = ImageFont.truetype(PINGFANG_FONT.path, font_size, encoding="utf-8")
 
     image = image.convert("RGB")
     draw = ImageDraw.Draw(image)

paddlex/modules/m_3d_bev_detection/dataset_checker/dataset_src/analyse_dataset.py

@@ -21,7 +21,7 @@ from collections import defaultdict
 import numpy as np
 
 from paddlex.utils.deps import function_requires_deps, is_dep_available
-from paddlex.utils.fonts import PINGFANG_FONT_FILE_PATH
+from paddlex.utils.fonts import PINGFANG_FONT
 
 if is_dep_available("matplotlib"):
     import matplotlib.pyplot as plt
@@ -88,7 +88,7 @@ def deep_analyse(dataset_dir, output):
     if os_system == "windows":
         plt.rcParams["font.sans-serif"] = "FangSong"
     else:
-        font = font_manager.FontProperties(fname=PINGFANG_FONT_FILE_PATH)
+        font = font_manager.FontProperties(fname=PINGFANG_FONT.path)
     fig, ax = plt.subplots(figsize=(max(8, int(len(classes) / 5)), 5), dpi=120)
     ax.bar(x, cnts_train_sorted, width=0.5, label="train")
     ax.bar(x + width, cnts_val_sorted, width=0.5, label="val")

paddlex/modules/multilabel_classification/dataset_checker/dataset_src/analyse_dataset.py

@@ -20,7 +20,7 @@ import numpy as np
 
 from .....utils.deps import function_requires_deps, is_dep_available
 from .....utils.file_interface import custom_open
-from .....utils.fonts import PINGFANG_FONT_FILE_PATH
+from .....utils.fonts import PINGFANG_FONT
 
 if is_dep_available("matplotlib"):
     import matplotlib.pyplot as plt
@@ -70,7 +70,7 @@ def deep_analyse(dataset_path, output):
     if os_system == "windows":
         plt.rcParams["font.sans-serif"] = "FangSong"
     else:
-        font = font_manager.FontProperties(fname=PINGFANG_FONT_FILE_PATH, size=10)
+        font = font_manager.FontProperties(fname=PINGFANG_FONT.path, size=10)
     fig, ax = plt.subplots(figsize=(max(8, int(len(classes) / 5)), 5), dpi=300)
     ax.bar(x, cnts_train_sorted, width=0.5, label="train")
     ax.bar(x + width, cnts_val_sorted, width=0.5, label="val")

paddlex/modules/multilabel_classification/dataset_checker/dataset_src/utils/visualizer.py

@@ -15,7 +15,7 @@
 import numpy as np
 from PIL import Image, ImageDraw, ImageFont
 
-from ......utils.fonts import PINGFANG_FONT_FILE_PATH
+from ......utils.fonts import PINGFANG_FONT
 
 
 def colormap(rgb=False):
@@ -114,7 +114,7 @@ def draw_multi_label(image, label, label_map_dict):
     image_width, image_height = image.size
     font_size = int(image_width * 0.06)
 
-    font = ImageFont.truetype(PINGFANG_FONT_FILE_PATH, font_size)
+    font = ImageFont.truetype(PINGFANG_FONT.path, font_size)
     text_lines = []
     row_width = 0
     row_height = 0

paddlex/modules/object_detection/dataset_checker/dataset_src/analyse_dataset.py

@@ -20,7 +20,7 @@ from collections import defaultdict
 import numpy as np
 
 from .....utils.deps import function_requires_deps, is_dep_available
-from .....utils.fonts import PINGFANG_FONT_FILE_PATH
+from .....utils.fonts import PINGFANG_FONT
 
 if is_dep_available("matplotlib"):
     import matplotlib.pyplot as plt
@@ -64,7 +64,7 @@ def deep_analyse(dataset_dir, output):
     if os_system == "windows":
         plt.rcParams["font.sans-serif"] = "FangSong"
     else:
-        font = font_manager.FontProperties(fname=PINGFANG_FONT_FILE_PATH)
+        font = font_manager.FontProperties(fname=PINGFANG_FONT.path)
     fig, ax = plt.subplots(figsize=(max(8, int(len(classes) / 5)), 5), dpi=120)
     ax.bar(x, cnts_train_sorted, width=0.5, label="train")
     ax.bar(x + width, cnts_val_sorted, width=0.5, label="val")

paddlex/modules/object_detection/dataset_checker/dataset_src/utils/visualizer.py

@@ -18,7 +18,7 @@ from PIL import ImageDraw, ImageFont
 
 from ......utils import logging
 from ......utils.deps import function_requires_deps, is_dep_available
-from ......utils.fonts import PINGFANG_FONT_FILE_PATH
+from ......utils.fonts import PINGFANG_FONT
 
 if is_dep_available("pycocotools"):
     from pycocotools.coco import COCO
@@ -124,7 +124,7 @@ def draw_bbox(image, coco_info: "COCO", img_id):
         font_size = int(0.024 * int(image_info["width"])) + 2
     except:
         font_size = 12
-    font = ImageFont.truetype(PINGFANG_FONT_FILE_PATH, font_size, encoding="utf-8")
+    font = ImageFont.truetype(PINGFANG_FONT.path, font_size, encoding="utf-8")
 
     image = image.convert("RGB")
     draw = ImageDraw.Draw(image)

paddlex/modules/text_recognition/dataset_checker/dataset_src/analyse_dataset.py

@@ -22,7 +22,7 @@ import numpy as np
 
 from .....utils.deps import function_requires_deps, is_dep_available
 from .....utils.file_interface import custom_open
-from .....utils.fonts import PINGFANG_FONT_FILE_PATH
+from .....utils.fonts import PINGFANG_FONT
 from .....utils.logging import warning
 
 if is_dep_available("opencv-contrib-python"):
@@ -130,7 +130,7 @@ def deep_analyse(dataset_path, output, datatype="MSTextRecDataset"):
     if os_system == "windows":
         plt.rcParams["font.sans-serif"] = "FangSong"
     else:
-        font = font_manager.FontProperties(fname=PINGFANG_FONT_FILE_PATH, size=15)
+        font = font_manager.FontProperties(fname=PINGFANG_FONT.path, size=15)
     if datatype == "LaTeXOCRDataset":
         fig, ax = plt.subplots(figsize=(15, 9), dpi=120)
         xlabel_name = "公式长度区间"

paddlex/modules/text_recognition/model_list.py

@@ -33,4 +33,7 @@ MODELS = [
     "ch_RepSVTR_rec",
     "PP-OCRv5_server_rec",
     "PP-OCRv5_mobile_rec",
+    "latin_PP-OCRv5_mobile_rec",
+    "eslav_PP-OCRv5_mobile_rec",
+    "korean_PP-OCRv5_mobile_rec",
 ]

paddlex/modules/ts_classification/dataset_checker/dataset_src/analyse_dataset.py

@@ -20,7 +20,7 @@ import numpy as np
 import pandas as pd
 
 from .....utils.deps import function_requires_deps, is_dep_available
-from .....utils.fonts import PINGFANG_FONT_FILE_PATH
+from .....utils.fonts import PINGFANG_FONT
 
 if is_dep_available("matplotlib"):
     import matplotlib.pyplot as plt
@@ -59,7 +59,7 @@ def deep_analyse(dataset_dir, output, label_col="label"):
     if os_system == "windows":
         plt.rcParams["font.sans-serif"] = "FangSong"
     else:
-        font = font_manager.FontProperties(fname=PINGFANG_FONT_FILE_PATH)
+        font = font_manager.FontProperties(fname=PINGFANG_FONT.path)
     fig, ax = plt.subplots(figsize=(max(8, int(len(label_unique) / 5)), 5), dpi=120)
     ax.bar(x, cls_train_sorted, width=0.5, label="train")
     ax.bar(x + width, cls_val_sorted, width=0.5, label="val")

paddlex/modules/video_classification/dataset_checker/dataset_src/analyse_dataset.py

@@ -25,7 +25,7 @@ if is_dep_available("matplotlib"):
     from matplotlib import font_manager
 
 from .....utils.file_interface import custom_open
-from .....utils.fonts import PINGFANG_FONT_FILE_PATH
+from .....utils.fonts import PINGFANG_FONT
 
 
 @function_requires_deps("matplotlib")
@@ -69,7 +69,7 @@ def deep_analyse(dataset_path, output):
     if os_system == "windows":
         plt.rcParams["font.sans-serif"] = "FangSong"
     else:
-        font = font_manager.FontProperties(fname=PINGFANG_FONT_FILE_PATH, size=10)
+        font = font_manager.FontProperties(fname=PINGFANG_FONT.path, size=10)
     fig, ax = plt.subplots(figsize=(max(8, int(len(classes) / 5)), 5), dpi=300)
     ax.bar(x, cnts_train_sorted, width=0.5, label="train")
     ax.bar(x + width, cnts_val_sorted, width=0.5, label="val")

paddlex/modules/video_detection/dataset_checker/dataset_src/analyse_dataset.py

@@ -20,7 +20,7 @@ import numpy as np
 
 from .....utils.deps import function_requires_deps, is_dep_available
 from .....utils.file_interface import custom_open
-from .....utils.fonts import PINGFANG_FONT_FILE_PATH
+from .....utils.fonts import PINGFANG_FONT
 
 if is_dep_available("matplotlib"):
     import matplotlib.pyplot as plt
@@ -74,7 +74,7 @@ def deep_analyse(dataset_path, output):
     if os_system == "windows":
         plt.rcParams["font.sans-serif"] = "FangSong"
     else:
-        font = font_manager.FontProperties(fname=PINGFANG_FONT_FILE_PATH, size=10)
+        font = font_manager.FontProperties(fname=PINGFANG_FONT.path, size=10)
     fig, ax = plt.subplots(figsize=(max(8, int(len(classes) / 5)), 5), dpi=300)
     ax.bar(x, cnts_train_sorted, width=0.5, label="train")
     ax.bar(x + width, cnts_val_sorted, width=0.5, label="val")

paddlex/repo_apis/PaddleOCR_api/text_rec/register.py

@@ -214,3 +214,30 @@ register_model_info(
         "supported_apis": ["train", "evaluate", "predict", "export"],
     }
 )
+
+register_model_info(
+    {
+        "model_name": "latin_PP-OCRv5_mobile_rec",
+        "suite": "TextRec",
+        "config_path": osp.join(PDX_CONFIG_DIR, "latin_PP-OCRv5_mobile_rec.yaml"),
+        "supported_apis": ["train", "evaluate", "predict", "export"],
+    }
+)
+
+register_model_info(
+    {
+        "model_name": "eslav_PP-OCRv5_mobile_rec",
+        "suite": "TextRec",
+        "config_path": osp.join(PDX_CONFIG_DIR, "eslav_PP-OCRv5_mobile_rec.yaml"),
+        "supported_apis": ["train", "evaluate", "predict", "export"],
+    }
+)
+
+register_model_info(
+    {
+        "model_name": "korean_PP-OCRv5_mobile_rec",
+        "suite": "TextRec",
+        "config_path": osp.join(PDX_CONFIG_DIR, "korean_PP-OCRv5_mobile_rec.yaml"),
+        "supported_apis": ["train", "evaluate", "predict", "export"],
+    }
+)

paddlex/repo_manager/meta.py

@@ -33,7 +33,7 @@ REPO_META = {
     "PaddleSeg": {
         "git_path": "/PaddlePaddle/PaddleSeg.git",
         "platform": "github",
-        "branch": "release/2.10",
+        "branch": "develop",
         "install_pkg": True,
         "dist_name": "paddleseg",
         "import_name": "paddleseg",
@@ -45,7 +45,7 @@ REPO_META = {
     "PaddleClas": {
         "git_path": "/PaddlePaddle/PaddleClas.git",
         "platform": "github",
-        "branch": "release/2.6",
+        "branch": "develop",
         "install_pkg": True,
         "dist_name": "paddleclas",
         "import_name": "paddleclas",
@@ -58,7 +58,7 @@ REPO_META = {
     "PaddleDetection": {
         "git_path": "/PaddlePaddle/PaddleDetection.git",
         "platform": "github",
-        "branch": "release/2.8.1",
+        "branch": "develop",
         "install_pkg": True,
         "dist_name": "paddledet",
         "import_name": "ppdet",

paddlex/utils/device.py

@@ -117,7 +117,10 @@ def set_env_for_device_type(device_type):
         }
         _set(envs)
     if device_type.lower() == "mlu":
-        envs = {"FLAGS_use_stride_kernel": "0"}
+        envs = {
+            "FLAGS_use_stride_kernel": "0",
+            "FLAGS_use_stream_safe_cuda_allocator": "0",
+        }
         _set(envs)
     if device_type.lower() == "gcu":
         envs = {"FLAGS_use_stride_kernel": "0"}