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

paddlex/inference/models/image_feature/predictor.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# 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.
@@ -12,28 +12,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Any, Union, Dict, List, Tuple
+from typing import Any, Dict, List, Tuple, Union
+
 import numpy as np
 
-from ....utils.func_register import FuncRegister
 from ....modules.general_recognition.model_list import MODELS
+from ....utils.func_register import FuncRegister
 from ...common.batch_sampler import ImageBatchSampler
 from ...common.reader import ReadImage
-from ..common import (
-    Resize,
-    ResizeByShort,
-    Normalize,
-    ToCHWImage,
-    ToBatch,
-    StaticInfer,
-)
-from ..base import BasicPredictor
+from ..base import BasePredictor
+from ..common import Normalize, Resize, ResizeByShort, ToBatch, ToCHWImage
 from .processors import NormalizeFeatures
 from .result import IdentityResult
 
 
-class ImageFeaturePredictor(BasicPredictor):
-    """ImageFeaturePredictor that inherits from BasicPredictor."""
+class ImageFeaturePredictor(BasePredictor):
+    """ImageFeaturePredictor that inherits from BasePredictor."""
 
     entities = MODELS
 
@@ -83,11 +77,7 @@ class ImageFeaturePredictor(BasicPredictor):
             preprocessors[name] = op
         preprocessors["ToBatch"] = ToBatch()
 
-        infer = StaticInfer(
-            model_dir=self.model_dir,
-            model_prefix=self.MODEL_FILE_PREFIX,
-            option=self.pp_option,
-        )
+        infer = self.create_static_infer()
 
         postprocessors = {}
         for key in self.config["PostProcess"]:

paddlex/inference/models/image_feature/processors.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# 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.
@@ -14,16 +14,18 @@
 
 import numpy as np
 
+from ...utils.benchmark import benchmark
 
+
+@benchmark.timeit
 class NormalizeFeatures:
     """Normalize Features Transform"""
 
     def _normalize(self, preds):
         """normalize"""
-        feas_norm = np.sqrt(np.sum(np.square(preds[0]), axis=0, keepdims=True))
-        features = np.divide(preds[0], feas_norm)
+        feas_norm = np.sqrt(np.sum(np.square(preds), axis=1, keepdims=True))
+        features = np.divide(preds, feas_norm)
         return features
 
     def __call__(self, preds):
-        normalized_features = [self._normalize(feature) for feature in preds]
-        return normalized_features
+        return self._normalize(preds[0])

paddlex/inference/models/image_feature/result.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# 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.
@@ -13,9 +13,8 @@
 # limitations under the License.
 
 import copy
-from PIL import Image
 
-from ...common.result import BaseResult, StrMixin, JsonMixin
+from ...common.result import BaseResult, JsonMixin
 
 
 class IdentityResult(BaseResult):

paddlex/inference/models/image_multilabel_classification/__init__.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# 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.

paddlex/inference/models/image_multilabel_classification/predictor.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# 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.
@@ -12,17 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Any, Union, Dict, List
+from typing import Any, Dict, List, Union
+
 import numpy as np
 
-from .result import MLClassResult
-from .processors import MultiLabelThreshOutput
-from ..image_classification import ClasPredictor
 from ....modules.multilabel_classification.model_list import MODELS
+from ..image_classification import ClasPredictor
+from .processors import MultiLabelThreshOutput
+from .result import MLClassResult
 
 
 class MLClasPredictor(ClasPredictor):
-    """MLClasPredictor that inherits from BasicPredictor."""
+    """MLClasPredictor that inherits from BasePredictor."""
 
     entities = MODELS
 

paddlex/inference/models/image_multilabel_classification/processors.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# 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.
@@ -12,10 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import numpy as np
 from typing import Union
 
+import numpy as np
+
+from ...utils.benchmark import benchmark
+
 
+@benchmark.timeit
 class MultiLabelThreshOutput:
     """MultiLabelThresh Transform"""
 

paddlex/inference/models/image_multilabel_classification/result.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# 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.
@@ -13,13 +13,14 @@
 # limitations under the License.
 
 import copy
+
+import numpy as np
 import PIL
 from PIL import Image, ImageDraw, ImageFont
-import numpy as np
 
 from ....utils.fonts import PINGFANG_FONT_FILE_PATH
+from ...common.result import BaseCVResult, JsonMixin
 from ...utils.color_map import get_colormap
-from ...common.result import BaseCVResult, StrMixin, JsonMixin
 
 
 class MLClassResult(BaseCVResult):

paddlex/inference/models/image_unwarping/__init__.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# 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.

paddlex/inference/models/image_unwarping/predictor.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# 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.
@@ -12,25 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Any, Union, Dict, List, Tuple
+from typing import Any, Dict, List, Tuple, Union
+
 import numpy as np
 
 from ....modules.image_unwarping.model_list import MODELS
 from ...common.batch_sampler import ImageBatchSampler
 from ...common.reader import ReadImage
-from ..common import (
-    Normalize,
-    ToCHWImage,
-    ToBatch,
-    StaticInfer,
-)
-from ..base import BasicPredictor
+from ..base import BasePredictor
+from ..common import Normalize, ToBatch, ToCHWImage
 from .processors import DocTrPostProcess
 from .result import DocTrResult
 
 
-class WarpPredictor(BasicPredictor):
-    """WarpPredictor that inherits from BasicPredictor."""
+class WarpPredictor(BasePredictor):
+    """WarpPredictor that inherits from BasePredictor."""
 
     entities = MODELS
 
@@ -71,11 +67,7 @@ class WarpPredictor(BasicPredictor):
         preprocessors["ToCHW"] = ToCHWImage()
         preprocessors["ToBatch"] = ToBatch()
 
-        infer = StaticInfer(
-            model_dir=self.model_dir,
-            model_prefix=self.MODEL_FILE_PREFIX,
-            option=self.pp_option,
-        )
+        infer = self.create_static_infer()
 
         postprocessors = {"DocTrPostProcess": DocTrPostProcess()}
         return preprocessors, infer, postprocessors

paddlex/inference/models/image_unwarping/processors.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# 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.
@@ -12,10 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from typing import List, Tuple, Union
+
 import numpy as np
-from typing import List, Union, Tuple
+
+from ...utils.benchmark import benchmark
 
 
+@benchmark.timeit
 class DocTrPostProcess:
     """
     Post-processing class for cropping regions from images (though currently only performs scaling and color channel adjustments).

paddlex/inference/models/image_unwarping/result.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# 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.
@@ -13,8 +13,10 @@
 # limitations under the License.
 
 import copy
+
 import numpy as np
-from ...common.result import BaseCVResult, StrMixin, JsonMixin
+
+from ...common.result import BaseCVResult, JsonMixin
 
 
 class DocTrResult(BaseCVResult):

paddlex/inference/models/instance_segmentation/__init__.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# 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.

paddlex/inference/models/instance_segmentation/predictor.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# 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.
@@ -12,20 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Any, Union, Dict, List, Tuple, Sequence, Optional
+from typing import Any, List, Optional, Sequence, Tuple
+
 import numpy as np
 
 from ....modules.instance_segmentation.model_list import MODELS
-from ...common.batch_sampler import ImageBatchSampler
-from ..common import StaticInfer
-from ..object_detection.processors import (
-    ReadImage,
-    ToBatch,
-)
-from .processors import InstanceSegPostProcess
+from ....utils import logging
 from ..object_detection import DetPredictor
+from ..object_detection.processors import ReadImage, ToBatch
+from .processors import InstanceSegPostProcess
 from .result import InstanceSegResult
-from ....utils import logging
 
 
 class InstanceSegPredictor(DetPredictor):
@@ -85,11 +81,7 @@ class InstanceSegPredictor(DetPredictor):
         pre_ops.append(self.build_to_batch())
 
         # build infer
-        infer = StaticInfer(
-            model_dir=self.model_dir,
-            model_prefix=self.MODEL_FILE_PREFIX,
-            option=self.pp_option,
-        )
+        infer = self.create_static_infer()
 
         # build postprocess op
         post_op = self.build_postprocess()

paddlex/inference/models/instance_segmentation/processors.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# 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.
@@ -12,15 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
-from typing import List, Sequence, Tuple, Union, Optional
+from typing import List, Optional
 
-import numpy as np
-from ....utils import logging
+from ...utils.benchmark import benchmark
 from ..object_detection.processors import restructured_boxes
 
-import cv2
-
 
 def extract_masks_from_boxes(boxes, masks):
     """
@@ -40,6 +36,7 @@ def extract_masks_from_boxes(boxes, masks):
     return new_masks
 
 
+@benchmark.timeit
 class InstanceSegPostProcess(object):
     """Save Result Transform"""
 

paddlex/inference/models/instance_segmentation/result.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# 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.
@@ -12,24 +12,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
-import cv2
-import numpy as np
 import copy
-import PIL
-from PIL import Image, ImageDraw, ImageFont
 
-from ...utils.color_map import get_colormap, font_colormap
-from ...common.result import BaseCVResult, StrMixin, JsonMixin
-from ....utils.fonts import PINGFANG_FONT_FILE_PATH
+import numpy as np
+from PIL import Image
+
+from ....utils.deps import function_requires_deps, is_dep_available
+from ...common.result import BaseCVResult, JsonMixin
+from ...utils.color_map import get_colormap
 from ..object_detection.result import draw_box
 
+if is_dep_available("opencv-contrib-python"):
+    import cv2
+
 
+@function_requires_deps("opencv-contrib-python")
 def draw_segm(im, masks, mask_info, alpha=0.7):
     """
     Draw segmentation on image
     """
-    mask_color_id = 0
     w_ratio = 0.4
     color_list = get_colormap(rgb=True)
     im = np.array(im).astype("float32")

paddlex/inference/models/keypoint_detection/__init__.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# 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.

paddlex/inference/models/keypoint_detection/predictor.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# 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.
@@ -19,14 +19,16 @@ import numpy as np
 from ....modules.keypoint_detection.model_list import MODELS
 from ....utils import logging
 from ...common.batch_sampler import ImageBatchSampler
-
 from ..common import ToBatch
 from ..object_detection import DetPredictor
-from .processors import TopDownAffine, KptPostProcess
+from .processors import KptPostProcess, TopDownAffine
 from .result import KptResult
 
 
 class KptBatchSampler(ImageBatchSampler):
+    # don't support to pass pdf file as input
+    PDF_SUFFIX = []
+
     def sample(self, inputs):
         if not isinstance(inputs, list):
             inputs = [inputs]

paddlex/inference/models/keypoint_detection/processors.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# 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.
@@ -13,14 +13,18 @@
 # limitations under the License.
 
 import math
-from typing import List, Sequence, Tuple, Union, Optional
+from typing import List, Optional, Sequence, Tuple, Union
 
-import cv2
 import numpy as np
 from numpy import ndarray
 
+from ....utils.deps import class_requires_deps, is_dep_available
+from ...utils.benchmark import benchmark
 from ..object_detection.processors import get_affine_transform
 
+if is_dep_available("opencv-contrib-python"):
+    import cv2
+
 Number = Union[int, float]
 Kpts = List[dict]
 
@@ -65,6 +69,8 @@ def get_warp_matrix(
     return matrix
 
 
+@benchmark.timeit
+@class_requires_deps("opencv-contrib-python")
 class TopDownAffine:
     """refer to https://github.com/open-mmlab/mmpose/blob/71ec36ebd63c475ab589afc817868e749a61491f/mmpose/datasets/transforms/topdown_transforms.py#L13
     Get the bbox image as the model input by affine transform.
@@ -196,6 +202,8 @@ def transform_preds(
     return target_coords
 
 
+@benchmark.timeit
+@class_requires_deps("opencv-contrib-python")
 class KptPostProcess:
     """Save Result Transform"""
 

paddlex/inference/models/keypoint_detection/result.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# 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.
@@ -12,16 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import cv2
 import copy
 import math
-from PIL import Image
 
-import matplotlib.pyplot as plt
 import numpy as np
+from PIL import Image
 
+from ....utils.deps import function_requires_deps, is_dep_available
 from ...common.result import BaseCVResult, JsonMixin
 
+if is_dep_available("opencv-contrib-python"):
+    import cv2
+if is_dep_available("matplotlib"):
+    import matplotlib.pyplot as plt
+
 
 def get_color(idx):
     idx = idx * 3
@@ -29,6 +33,7 @@ def get_color(idx):
     return color
 
 
+@function_requires_deps("matplotlib", "opencv-contrib-python")
 def draw_keypoints(img, results, visual_thresh=0.1, ids=None):
     plt.switch_backend("agg")
     skeletons = results["keypoints"]

paddlex/inference/models/{3d_bev_detection → m_3d_bev_detection}/__init__.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# 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.

paddlex/inference/models/{3d_bev_detection → m_3d_bev_detection}/predictor.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# 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.
@@ -12,38 +12,32 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Any, Union, Dict, List, Tuple, Iterator
 import shutil
 import tempfile
-from importlib import import_module
-import lazy_paddle
+from typing import Any, Dict, Iterator, List, Tuple
 
+from ....modules.m_3d_bev_detection.model_list import MODELS
 from ....utils import logging
 from ....utils.func_register import FuncRegister
-
-module_3d_bev_detection = import_module(".3d_bev_detection", "paddlex.modules")
-module_3d_model_list = getattr(module_3d_bev_detection, "model_list")
-MODELS = getattr(module_3d_model_list, "MODELS")
 from ...common.batch_sampler import Det3DBatchSampler
 from ...common.reader import ReadNuscenesData
-from ..common import StaticInfer
-from ..base import BasicPredictor
+from ..base import BasePredictor
 from ..base.predictor.base_predictor import PredictionWrap
 from .processors import (
+    GetInferInput,
+    LoadMultiViewImageFromFiles,
     LoadPointsFromFile,
     LoadPointsFromMultiSweeps,
-    LoadMultiViewImageFromFiles,
-    ResizeImage,
     NormalizeImage,
     PadImage,
+    ResizeImage,
     SampleFilterByKey,
-    GetInferInput,
 )
 from .result import BEV3DDetResult
 
 
-class BEVDet3DPredictor(BasicPredictor):
-    """BEVDet3DPredictor that inherits from BasicPredictor."""
+class BEVDet3DPredictor(BasePredictor):
+    """BEVDet3DPredictor that inherits from BasePredictor."""
 
     entities = MODELS
 
@@ -86,12 +80,11 @@ class BEVDet3DPredictor(BasicPredictor):
         Returns:
             tuple: A tuple containing the preprocessors and inference engine.
         """
-        if (
-            lazy_paddle.is_compiled_with_cuda()
-            and not lazy_paddle.is_compiled_with_rocm()
-        ):
-            from ....ops.voxelize import hard_voxelize
-            from ....ops.iou3d_nms import nms_gpu
+        import paddle
+
+        if paddle.is_compiled_with_cuda() and not paddle.is_compiled_with_rocm():
+            from ....ops.iou3d_nms import nms_gpu  # noqa: F401
+            from ....ops.voxelize import hard_voxelize  # noqa: F401
         else:
             logging.error("3D BEVFusion custom ops only support GPU platform!")
 
@@ -105,11 +98,7 @@ class BEVDet3DPredictor(BasicPredictor):
                 pre_tfs[name] = op
         pre_tfs["GetInferInput"] = GetInferInput()
 
-        infer = StaticInfer(
-            model_dir=self.model_dir,
-            model_prefix=self.MODEL_FILE_PREFIX,
-            option=self.pp_option,
-        )
+        infer = self.create_static_infer()
 
         return pre_tfs, infer