paddlex 3.0.0rc1__py3-none-any.whl → 3.0.1__py3-none-any.whl

paddlex/inference/utils/io/readers.py

@@ -26,8 +26,8 @@ from ....utils.deps import class_requires_deps, is_dep_available
 
 if is_dep_available("opencv-contrib-python"):
     import cv2
-if is_dep_available("PyMuPDF"):
-    import fitz
+if is_dep_available("pypdfium2"):
+    import pypdfium2 as pdfium
 if is_dep_available("soundfile"):
     import soundfile
 
@@ -96,7 +96,7 @@ class _BaseReader(object):
 class PDFReader(_BaseReader):
     """PDFReader"""
 
-    def __init__(self, backend="fitz", **bk_args):
+    def __init__(self, backend="pypdfium2", **bk_args):
         super().__init__(backend, **bk_args)
 
     def read(self, in_path):
@@ -244,19 +244,19 @@ class PILImageReaderBackend(_ImageReaderBackend):
         return ImageOps.exif_transpose(Image.open(in_path))
 
 
-@class_requires_deps("PyMuPDF", "opencv-contrib-python")
+@class_requires_deps("pypdfium2", "opencv-contrib-python")
 class PDFReaderBackend(_BaseReaderBackend):
 
-    def __init__(self, rotate=0, zoom_x=2.0, zoom_y=2.0):
+    def __init__(self, rotate=0, zoom=2.0):
         super().__init__()
-        self.mat = fitz.Matrix(zoom_x, zoom_y).prerotate(rotate)
+        self._rotation = rotate
+        self._scale = zoom
 
     def read_file(self, in_path):
-        for page in fitz.open(in_path):
-            pixmap = page.get_pixmap(matrix=self.mat, alpha=False)
-            img_cv = np.frombuffer(pixmap.samples, dtype=np.uint8).reshape(
-                pixmap.h, pixmap.w, pixmap.n
-            )
+        for page in pdfium.PdfDocument(in_path):
+            image = page.render(scale=self._scale, rotation=self._rotation).to_pil()
+            image = image.convert("RGB")
+            img_cv = np.array(image)
             img_cv = cv2.cvtColor(img_cv, cv2.COLOR_RGB2BGR)
             yield img_cv
 
@@ -361,7 +361,7 @@ class DecordVideoReaderBackend(_VideoReaderBackend):
         self.valid_mode = True
         self._fps = 0
 
-        # XXX(gaotingquan): There is a confict with `paddle` when import `decord` globally.
+        # XXX(gaotingquan): There is a conflict with `paddle` when import `decord` globally.
         try:
             import decord
 

paddlex/inference/utils/mkldnn_blocklist.py

@@ -0,0 +1,25 @@
+# Copyright (c) 2024 PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+MKLDNN_BLOCKLIST = [
+    "SLANeXt_wired",
+    "SLANeXt_wireless",
+    "LaTeX_OCR_rec",
+    "PP-FormulaNet-L",
+    "PP-FormulaNet-S",
+    "UniMERNet",
+    "PP-FormulaNet_plus-L",
+    "PP-FormulaNet_plus-M",
+    "PP-FormulaNet_plus-S",
+]

paddlex/inference/utils/official_models.py

@@ -37,6 +37,7 @@ OFFICIAL_MODELS = {
     "PP-LCNet_x0_75": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-LCNet_x0_75_infer.tar",
     "PP-LCNet_x1_0": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-LCNet_x1_0_infer.tar",
     "PP-LCNet_x1_0_doc_ori": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-LCNet_x1_0_doc_ori_infer.tar",
+    "PP-LCNet_x1_0_textline_ori": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-LCNet_x1_0_textline_ori_infer.tar",
     "PP-LCNet_x1_5": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-LCNet_x1_5_infer.tar",
     "PP-LCNet_x2_5": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-LCNet_x2_5_infer.tar",
     "PP-LCNet_x2_0": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-LCNet_x2_0_infer.tar",
@@ -250,6 +251,9 @@ PP-LCNet_x1_0_vehicle_attribute_infer.tar",
     "UniMERNet": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/UniMERNet_infer.tar",
     "PP-FormulaNet-S": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-FormulaNet-S_infer.tar",
     "PP-FormulaNet-L": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-FormulaNet-L_infer.tar",
+    "PP-FormulaNet_plus-S": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-FormulaNet_plus-S_infer.tar",
+    "PP-FormulaNet_plus-M": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-FormulaNet_plus-M_infer.tar",
+    "PP-FormulaNet_plus-L": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-FormulaNet_plus-L_infer.tar",
     "FasterRCNN-ResNet34-FPN": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/FasterRCNN-ResNet34-FPN_infer.tar",
     "FasterRCNN-ResNet50": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/FasterRCNN-ResNet50_infer.tar",
     "FasterRCNN-ResNet50-FPN": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/FasterRCNN-ResNet50-FPN_infer.tar",
@@ -331,10 +335,20 @@ PP-LCNet_x1_0_vehicle_attribute_infer.tar",
     "PP-DocLayout-L": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-DocLayout-L_infer.tar",
     "PP-DocLayout-M": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-DocLayout-M_infer.tar",
     "PP-DocLayout-S": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-DocLayout-S_infer.tar",
+    "PP-DocLayout_plus-L": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-DocLayout_plus-L_infer.tar",
+    "PP-DocBlockLayout": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-DocBlockLayout_infer.tar",
     "BEVFusion": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/BEVFusion_infer.tar",
     "YOLO-Worldv2-L": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/YOLO-Worldv2-L_infer.tar",
     "PP-DocBee-2B": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-DocBee-2B_infer.tar",
     "PP-DocBee-7B": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-DocBee-7B_infer.tar",
+    "PP-Chart2Table": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-Chart2Table_infer.tar",
+    "PP-OCRv5_server_det": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-OCRv5_server_det_infer.tar",
+    "PP-OCRv5_mobile_det": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-OCRv5_mobile_det_infer.tar",
+    "PP-OCRv5_server_rec": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/\
+PP-OCRv5_server_rec_infer.tar",
+    "PP-OCRv5_mobile_rec": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/\
+PP-OCRv5_mobile_rec_infer.tar",
+    "PP-DocBee2-3B": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-DocBee2-3B_infer.tar",
 }
 
 

paddlex/inference/utils/pp_option.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import os
+from copy import deepcopy
 from typing import Dict, List
 
 from ...utils import logging
@@ -23,6 +24,7 @@ from ...utils.device import (
     set_env_for_device_type,
 )
 from ...utils.flags import USE_PIR_TRT
+from .mkldnn_blocklist import MKLDNN_BLOCKLIST
 from .new_ir_blocklist import NEWIR_BLOCKLIST
 from .trt_blocklist import TRT_BLOCKLIST
 from .trt_config import TRT_CFG_SETTING, TRT_PRECISION_MAP
@@ -44,7 +46,7 @@ class PaddlePredictorOption(object):
     )
     SUPPORT_DEVICE = ("gpu", "cpu", "npu", "xpu", "mlu", "dcu", "gcu")
 
-    def __init__(self, model_name, **kwargs):
+    def __init__(self, model_name=None, **kwargs):
         super().__init__()
         self._model_name = model_name
         self._cfg = {}
@@ -55,6 +57,10 @@ class PaddlePredictorOption(object):
     def model_name(self):
         return self._model_name
 
+    @model_name.setter
+    def model_name(self, model_name):
+        self._model_name = model_name
+
     @property
     def changed(self):
         return self._changed
@@ -64,6 +70,13 @@ class PaddlePredictorOption(object):
         assert isinstance(v, bool)
         self._changed = v
 
+    def copy(self):
+        obj = type(self)(self._model_name)
+        obj._cfg = deepcopy(self._cfg)
+        if hasattr(self, "trt_cfg_setting"):
+            obj.trt_cfg_setting = self.trt_cfg_setting
+        return obj
+
     def _init_option(self, **kwargs):
         for k, v in kwargs.items():
             if self._has_setter(k):
@@ -125,12 +138,20 @@ class PaddlePredictorOption(object):
             raise ValueError(
                 f"`run_mode` must be {support_run_mode_str}, but received {repr(run_mode)}."
             )
-        # TRT Blocklist
-        if run_mode.startswith("trt") and self._model_name in TRT_BLOCKLIST:
-            logging.warning(
-                f"The model({self._model_name}) is not supported to run in trt mode! Using `paddle` instead!"
-            )
-            run_mode = "paddle"
+
+        if self._model_name is not None:
+            # TRT Blocklist
+            if run_mode.startswith("trt") and self._model_name in TRT_BLOCKLIST:
+                logging.warning(
+                    f"The model({self._model_name}) is not supported to run in trt mode! Using `paddle` instead!"
+                )
+                run_mode = "paddle"
+            # MKLDNN Blocklist
+            elif run_mode.startswith("mkldnn") and self._model_name in MKLDNN_BLOCKLIST:
+                logging.warning(
+                    f"The model({self._model_name}) is not supported to run in MKLDNN mode! Using `paddle` instead!"
+                )
+                run_mode = "paddle"
 
         self._update("run_mode", run_mode)
 
@@ -206,7 +227,7 @@ class PaddlePredictorOption(object):
         """set trt config"""
         assert isinstance(
             config, dict
-        ), f"The trt_cfg_setting must be `dict` type, but recived `{type(config)}` type!"
+        ), f"The trt_cfg_setting must be `dict` type, but received `{type(config)}` type!"
         self._update("trt_cfg_setting", config)
 
     @property

paddlex/model.py

@@ -17,7 +17,7 @@ from copy import deepcopy
 from .inference import PaddlePredictorOption, create_predictor
 from .modules import (
     build_dataset_checker,
-    build_evaluater,
+    build_evaluator,
     build_exportor,
     build_trainer,
 )
@@ -119,7 +119,7 @@ class _ModelBasedConfig(_BaseModel):
         trainer.train()
 
     def evaluate(self):
-        evaluator = build_evaluater(self._config)
+        evaluator = build_evaluator(self._config)
         return evaluator.evaluate()
 
     def export(self):

paddlex/modules/__init__.py

@@ -14,7 +14,7 @@
 from importlib import import_module
 
 from .anomaly_detection import UadDatasetChecker, UadEvaluator, UadExportor, UadTrainer
-from .base import build_dataset_checker, build_evaluater, build_exportor, build_trainer
+from .base import build_dataset_checker, build_evaluator, build_exportor, build_trainer
 from .face_recognition import (
     FaceRecDatasetChecker,
     FaceRecEvaluator,

paddlex/modules/anomaly_detection/evaluator.py

@@ -26,7 +26,7 @@ class UadEvaluator(BaseEvaluator):
     entities = MODELS
 
     def update_config(self):
-        """update evalution config"""
+        """update evaluation config"""
         self.pdx_config.update_dataset(self.global_config.dataset_dir, "SegDataset")
         self.pdx_config.update_pretrained_weights(None, is_backbone=True)
 
@@ -47,7 +47,7 @@ class UadEvaluator(BaseEvaluator):
         return config_path
 
     def get_eval_kwargs(self) -> dict:
-        """get key-value arguments of model evalution function
+        """get key-value arguments of model evaluation function
 
         Returns:
             dict: the arguments of evaluation function.

paddlex/modules/base/__init__.py

@@ -13,6 +13,6 @@
 # limitations under the License.
 
 from .dataset_checker import BaseDatasetChecker, build_dataset_checker
-from .evaluator import BaseEvaluator, build_evaluater
+from .evaluator import BaseEvaluator, build_evaluator
 from .exportor import BaseExportor, build_exportor
 from .trainer import BaseTrainer, build_trainer

paddlex/modules/base/evaluator.py

@@ -27,14 +27,14 @@ from ...utils.misc import AutoRegisterABCMetaClass
 from .build_model import build_model
 
 
-def build_evaluater(config: AttrDict) -> "BaseEvaluator":
-    """build model evaluater
+def build_evaluator(config: AttrDict) -> "BaseEvaluator":
+    """build model evaluator
 
     Args:
         config (AttrDict): PaddleX pipeline config, which is loaded from pipeline yaml file.
 
     Returns:
-        BaseEvaluator: the evaluater, which is subclass of BaseEvaluator.
+        BaseEvaluator: the evaluator, which is subclass of BaseEvaluator.
     """
     model_name = config.Global.model
     try:
@@ -161,10 +161,10 @@ evaling!"
 
     @abstractmethod
     def update_config(self):
-        """update evalution config"""
+        """update evaluation config"""
         raise NotImplementedError
 
     @abstractmethod
     def get_eval_kwargs(self):
-        """get key-value arguments of model evalution function"""
+        """get key-value arguments of model evaluation function"""
         raise NotImplementedError

paddlex/modules/base/trainer.py

@@ -21,7 +21,7 @@ from ...utils.device import (
     set_env_for_device,
     update_device_num,
 )
-from ...utils.flags import FLAGS_json_format_model, DISABLE_CINN_MODEL_WL
+from ...utils.flags import DISABLE_CINN_MODEL_WL, FLAGS_json_format_model
 from ...utils.misc import AutoRegisterABCMetaClass
 from .build_model import build_model
 from .utils.cinn_setting import CINN_WHITELIST, enable_cinn_backend

paddlex/modules/doc_vlm/dataset_checker.py

@@ -18,12 +18,12 @@ from .model_list import MODELS
 
 
 class DocVLMDatasetChecker(BaseDatasetChecker):
-    """Dataset Checker for Document Vision Languange Model"""
+    """Dataset Checker for Document Vision Language Model"""
 
     entities = MODELS
 
     def __init__(self, config):
         # not support for now
         raise UnsupportedAPIError(
-            "document vision languange models do not support data check for now."
+            "document vision language models do not support data check for now."
         )

paddlex/modules/doc_vlm/evaluator.py

@@ -18,12 +18,12 @@ from .model_list import MODELS
 
 
 class DocVLMEvaluator(BaseEvaluator):
-    """Document Vision Languange Model Evaluator"""
+    """Document Vision Language Model Evaluator"""
 
     entities = MODELS
 
     def __init__(self, config):
         # not support for now
         raise UnsupportedAPIError(
-            "document vision languange models do not support evaluate for now."
+            "document vision language models do not support evaluate for now."
         )

paddlex/modules/doc_vlm/exportor.py

@@ -18,12 +18,12 @@ from .model_list import MODELS
 
 
 class DocVLMExportor(BaseExportor):
-    """Document Vision Languange Model Exportor"""
+    """Document Vision Language Model Exportor"""
 
     entities = MODELS
 
     def __init__(self, config):
         # not support for now
         raise UnsupportedAPIError(
-            "document vision languange models do not support export for now."
+            "document vision language models do not support export for now."
         )

paddlex/modules/doc_vlm/model_list.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 
 
-MODELS = ["PP-DocBee-2B", "PP-DocBee-7B"]
+MODELS = ["PP-DocBee-2B", "PP-DocBee-7B", "PP-Chart2Table", "PP-DocBee2-3B"]

paddlex/modules/doc_vlm/trainer.py

@@ -18,14 +18,14 @@ from .model_list import MODELS
 
 
 class DocVLMTrainer(BaseTrainer):
-    """Document Vision Languange Model Trainer"""
+    """Document Vision Language Model Trainer"""
 
     entities = MODELS
 
     def __init__(self, config):
         # not support for now
         raise UnsupportedAPIError(
-            "Document vision languange models do not support train for now."
+            "Document vision language models do not support train for now."
         )
 
     def update_config(self):

paddlex/modules/face_recognition/evaluator.py

@@ -24,7 +24,7 @@ class FaceRecEvaluator(BaseEvaluator):
     entities = MODELS
 
     def update_config(self):
-        """update evalution config"""
+        """update evaluation config"""
         if self.eval_config.log_interval:
             self.pdx_config.update_log_interval(self.eval_config.log_interval)
         self.update_dataset_cfg()
@@ -41,7 +41,7 @@ class FaceRecEvaluator(BaseEvaluator):
         self.pdx_config.update(ds_cfg)
 
     def get_eval_kwargs(self) -> dict:
-        """get key-value arguments of model evalution function
+        """get key-value arguments of model evaluation function
 
         Returns:
             dict: the arguments of evaluation function.

paddlex/modules/formula_recognition/evaluator.py

@@ -25,7 +25,7 @@ class FormulaRecEvaluator(BaseEvaluator):
     entities = MODELS
 
     def update_config(self):
-        """update evalution config"""
+        """update evaluation config"""
         if self.eval_config.log_interval:
             self.pdx_config.update_log_interval(self.eval_config.log_interval)
         if self.global_config["model"] == "LaTeX_OCR_rec":
@@ -36,6 +36,9 @@ class FormulaRecEvaluator(BaseEvaluator):
             "UniMERNet",
             "PP-FormulaNet-L",
             "PP-FormulaNet-S",
+            "PP-FormulaNet_plus-L",
+            "PP-FormulaNet_plus-M",
+            "PP-FormulaNet_plus-S",
         ):
             self.pdx_config.update_dataset(
                 self.global_config.dataset_dir, "SimpleDataSet"
@@ -66,7 +69,7 @@ class FormulaRecEvaluator(BaseEvaluator):
             self.pdx_config.update_delimiter(self.eval_config.delimiter, mode="eval")
 
     def get_eval_kwargs(self) -> dict:
-        """get key-value arguments of model evalution function
+        """get key-value arguments of model evaluation function
 
         Returns:
             dict: the arguments of evaluation function.

paddlex/modules/formula_recognition/model_list.py

@@ -17,4 +17,7 @@ MODELS = [
     "UniMERNet",
     "PP-FormulaNet-S",
     "PP-FormulaNet-L",
+    "PP-FormulaNet_plus-S",
+    "PP-FormulaNet_plus-M",
+    "PP-FormulaNet_plus-L",
 ]

paddlex/modules/formula_recognition/trainer.py

@@ -53,6 +53,9 @@ class FormulaRecTrainer(BaseTrainer):
             "UniMERNet",
             "PP-FormulaNet-L",
             "PP-FormulaNet-S",
+            "PP-FormulaNet_plus-L",
+            "PP-FormulaNet_plus-M",
+            "PP-FormulaNet_plus-S",
         ):
             self.pdx_config.update_dataset(
                 self.global_config.dataset_dir, "SimpleDataSet"

paddlex/modules/general_recognition/evaluator.py

@@ -22,7 +22,7 @@ class ShiTuRecEvaluator(ClsEvaluator):
     entities = MODELS
 
     def update_config(self):
-        """update evalution config"""
+        """update evaluation config"""
         if self.eval_config.log_interval:
             self.pdx_config.update_log_interval(self.eval_config.log_interval)
         self.pdx_config.update_dataset(

paddlex/modules/image_classification/evaluator.py

@@ -22,7 +22,7 @@ class ClsEvaluator(BaseEvaluator):
     entities = MODELS
 
     def update_config(self):
-        """update evalution config"""
+        """update evaluation config"""
         if self.eval_config.log_interval:
             self.pdx_config.update_log_interval(self.eval_config.log_interval)
         if self.pdx_config["Arch"]["name"] == "DistillationModel":
@@ -32,7 +32,7 @@ class ClsEvaluator(BaseEvaluator):
         self.pdx_config.update_pretrained_weights(self.eval_config.weight_path)
 
     def get_eval_kwargs(self) -> dict:
-        """get key-value arguments of model evalution function
+        """get key-value arguments of model evaluation function
 
         Returns:
             dict: the arguments of evaluation function.

paddlex/modules/image_classification/model_list.py

@@ -62,6 +62,7 @@ MODELS = [
     "PP-LCNet_x0_75",
     "PP-LCNet_x1_0",
     "PP-LCNet_x1_0_doc_ori",
+    "PP-LCNet_x1_0_textline_ori",
     "PP-LCNet_x1_5",
     "PP-LCNet_x2_0",
     "PP-LCNet_x2_5",

paddlex/modules/instance_segmentation/evaluator.py

@@ -23,7 +23,7 @@ class InstanceSegEvaluator(DetEvaluator):
     entities = MODELS
 
     def update_config(self):
-        """update evalution config"""
+        """update evaluation config"""
         if self.eval_config.log_interval:
             self.pdx_config.update_log_interval(self.eval_config.log_interval)
         self.pdx_config.update_dataset(

paddlex/modules/keypoint_detection/evaluator.py

@@ -23,7 +23,7 @@ class KeypointEvaluator(DetEvaluator):
     entities = MODELS
 
     def update_config(self):
-        """update evalution config"""
+        """update evaluation config"""
         if self.eval_config.log_interval:
             self.pdx_config.update_log_interval(self.eval_config.log_interval)
         metric = self.pdx_config.metric

paddlex/modules/m_3d_bev_detection/evaluator.py

@@ -23,7 +23,7 @@ class BEVFusionEvaluator(BaseEvaluator):
     entities = MODELS
 
     def update_config(self):
-        """update evalution config"""
+        """update evaluation config"""
         if self.eval_config.batch_size is not None:
             self.pdx_config.update_batch_size(self.eval_config.batch_size)
         self.pdx_config.update_dataset(
@@ -35,7 +35,7 @@ class BEVFusionEvaluator(BaseEvaluator):
         self.pdx_config.update_weights(self.eval_config.weight_path)
 
     def get_eval_kwargs(self) -> dict:
-        """get key-value arguments of model evalution function
+        """get key-value arguments of model evaluation function
 
         Returns:
             dict: the arguments of evaluation function.

paddlex/modules/multilabel_classification/evaluator.py

@@ -22,7 +22,7 @@ class MLClsEvaluator(BaseEvaluator):
     entities = MODELS
 
     def update_config(self):
-        """update evalution config"""
+        """update evaluation config"""
         if self.eval_config.log_interval:
             self.pdx_config.update_log_interval(self.eval_config.log_interval)
         if self.pdx_config["Arch"]["name"] == "DistillationModel":
@@ -32,7 +32,7 @@ class MLClsEvaluator(BaseEvaluator):
         self.pdx_config.update_pretrained_weights(self.eval_config.weight_path)
 
     def get_eval_kwargs(self) -> dict:
-        """get key-value arguments of model evalution function
+        """get key-value arguments of model evaluation function
 
         Returns:
             dict: the arguments of evaluation function.

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

@@ -267,8 +267,8 @@ def voc_get_label_anno(root_dir, anno_path):
     Read VOC format annotation file.
 
     Args:
-        root_dir (str): The directoty of VOC annotation file.
-        anno_path (str): The annoation file path.
+        root_dir (str): The directory of VOC annotation file.
+        anno_path (str): The annotation file path.
 
     Returns:
         tuple: A tuple of two elements, the first of which is of type dict, representing the mapping between tag names
@@ -295,7 +295,7 @@ def voc_get_label_anno(root_dir, anno_path):
 
 def voc_get_image_info(annotation_root, img_indexer):
     """
-    Get the iamge info from VOC annotation file.
+    Get the image info from VOC annotation file.
 
     Args:
         annotation_root: The annotation root.
@@ -425,7 +425,7 @@ def voc_xmls_to_cocojson(
         output_json_dict["images"].append(img_info)
 
         for obj in ann_root.findall("object"):
-            if obj.find("bndbox") is None:  # Skip the ojbect wihtout bndbox
+            if obj.find("bndbox") is None:  # Skip the object without bndbox
                 continue
             ann = voc_get_coco_annotation(obj=obj, label_indexer=label_indexer)
             ann.update({"image_id": img_info["id"], "id": bnd_id})

paddlex/modules/object_detection/evaluator.py

@@ -39,14 +39,14 @@ class DetEvaluator(BaseEvaluator):
         )
 
     def update_config(self):
-        """update evalution config"""
+        """update evaluation config"""
         if self.eval_config.log_interval:
             self.pdx_config.update_log_interval(self.eval_config.log_interval)
         self._update_dataset()
         self.pdx_config.update_weights(self.eval_config.weight_path)
 
     def get_eval_kwargs(self) -> dict:
-        """get key-value arguments of model evalution function
+        """get key-value arguments of model evaluation function
 
         Returns:
             dict: the arguments of evaluation function.

paddlex/modules/object_detection/model_list.py

@@ -81,4 +81,6 @@ MODELS = [
     "PP-DocLayout-L",
     "PP-DocLayout-M",
     "PP-DocLayout-S",
+    "PP-DocLayout_plus-L",
+    "PP-DocBlockLayout",
 ]

paddlex/modules/semantic_segmentation/evaluator.py

@@ -26,7 +26,7 @@ class SegEvaluator(BaseEvaluator):
     entities = MODELS
 
     def update_config(self):
-        """update evalution config"""
+        """update evaluation config"""
         self.pdx_config.update_dataset(self.global_config.dataset_dir, "SegDataset")
         self.pdx_config.update_pretrained_weights(None, is_backbone=True)
 
@@ -47,7 +47,7 @@ class SegEvaluator(BaseEvaluator):
         return config_path
 
     def get_eval_kwargs(self) -> dict:
-        """get key-value arguments of model evalution function
+        """get key-value arguments of model evaluation function
 
         Returns:
             dict: the arguments of evaluation function.

paddlex/modules/table_recognition/evaluator.py

@@ -23,7 +23,7 @@ class TableRecEvaluator(BaseEvaluator):
     entities = MODELS
 
     def update_config(self):
-        """update evalution config"""
+        """update evaluation config"""
         if self.eval_config.log_interval:
             self.pdx_config.update_log_interval(self.eval_config.log_interval)
 
@@ -32,7 +32,7 @@ class TableRecEvaluator(BaseEvaluator):
         )
 
     def get_eval_kwargs(self) -> dict:
-        """get key-value arguments of model evalution function
+        """get key-value arguments of model evaluation function
 
         Returns:
             dict: the arguments of evaluation function.