PyPI - paddlex - Versions diffs - 3.0.0rc0__py3-none-any.whl → 3.0.1__py3-none-any.whl - Mend

paddlex 3.0.0rc0py3-none-any.whl → 3.0.1py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (824) hide show

paddlex/hpip_links.html CHANGED Viewed

@@ -4,16 +4,28 @@
         <title>PaddleX HPIP Links</title>
     </head>
     <body>
-        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/3.0.0rc0/ultra_infer_python-1.0.0.3.0.0rc0-cp38-cp38-linux_x86_64.whl"></a>
-        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/3.0.0rc0/ultra_infer_python-1.0.0.3.0.0rc0-cp39-cp39-linux_x86_64.whl"></a>
-        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/3.0.0rc0/ultra_infer_python-1.0.0.3.0.0rc0-cp310-cp310-linux_x86_64.whl"></a>
-        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/3.0.0rc0/ultra_infer_python-1.0.0.3.0.0rc0-cp311-cp311-linux_x86_64.whl"></a>
-        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/3.0.0rc0/ultra_infer_python-1.0.0.3.0.0rc0-cp312-cp312-linux_x86_64.whl"></a>
-        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/3.0.0rc0/ultra_infer_gpu_python-1.0.0.3.0.0rc0-cp38-cp38-linux_x86_64.whl"></a>
-        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/3.0.0rc0/ultra_infer_gpu_python-1.0.0.3.0.0rc0-cp39-cp39-linux_x86_64.whl"></a>
-        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/3.0.0rc0/ultra_infer_gpu_python-1.0.0.3.0.0rc0-cp310-cp310-linux_x86_64.whl"></a>
-        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/3.0.0rc0/ultra_infer_gpu_python-1.0.0.3.0.0rc0-cp311-cp311-linux_x86_64.whl"></a>
-        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/3.0.0rc0/ultra_infer_gpu_python-1.0.0.3.0.0rc0-cp312-cp312-linux_x86_64.whl"></a>
-        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/3.0.0rc0/paddlex_hpi-3.0.0rc0-py3-none-any.whl"></a>
+        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/new_hpi/v1.1.1/ultra_infer_python-1.1.1-cp38-cp38-linux_x86_64.whl"></a>
+        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/new_hpi/v1.1.1/ultra_infer_python-1.1.1-cp39-cp39-linux_x86_64.whl"></a>
+        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/new_hpi/v1.1.1/ultra_infer_python-1.1.1-cp310-cp310-linux_x86_64.whl"></a>
+        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/new_hpi/v1.1.1/ultra_infer_python-1.1.1-cp311-cp311-linux_x86_64.whl"></a>
+        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/new_hpi/v1.1.1/ultra_infer_python-1.1.1-cp312-cp312-linux_x86_64.whl"></a>
+        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/new_hpi/v1.1.1/ultra_infer_gpu_python-1.1.1-cp38-cp38-linux_x86_64.whl"></a>
+        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/new_hpi/v1.1.1/ultra_infer_gpu_python-1.1.1-cp39-cp39-linux_x86_64.whl"></a>
+        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/new_hpi/v1.1.1/ultra_infer_gpu_python-1.1.1-cp310-cp310-linux_x86_64.whl"></a>
+        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/new_hpi/v1.1.1/ultra_infer_gpu_python-1.1.1-cp311-cp311-linux_x86_64.whl"></a>
+        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/new_hpi/v1.1.1/ultra_infer_gpu_python-1.1.1-cp312-cp312-linux_x86_64.whl"></a>
+        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/new_hpi/v1.1.1/ultra_infer_npu_python-1.1.1-cp38-cp38-linux_x86_64.whl"></a>
+        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/new_hpi/v1.1.1/ultra_infer_npu_python-1.1.1-cp39-cp39-linux_x86_64.whl"></a>
+        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/new_hpi/v1.1.1/ultra_infer_npu_python-1.1.1-cp310-cp310-linux_x86_64.whl"></a>
+        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/new_hpi/v1.1.1/ultra_infer_npu_python-1.1.1-cp311-cp311-linux_x86_64.whl"></a>
+        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/new_hpi/v1.1.1/ultra_infer_npu_python-1.1.1-cp312-cp312-linux_x86_64.whl"></a>
+        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/new_hpi/v1.1.1/ultra_infer_npu_python-1.1.1-cp38-cp38-linux_aarch64.whl"></a>
+        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/new_hpi/v1.1.1/ultra_infer_npu_python-1.1.1-cp39-cp39-linux_aarch64.whl"></a>
+        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/new_hpi/v1.1.1/ultra_infer_npu_python-1.1.1-cp310-cp310-linux_aarch64.whl"></a>
+        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/new_hpi/v1.1.1/ultra_infer_npu_python-1.1.1-cp311-cp311-linux_aarch64.whl"></a>
+        <a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/deploy/hpi/ultra_infer/releases/new_hpi/v1.1.1/ultra_infer_npu_python-1.1.1-cp312-cp312-linux_aarch64.whl"></a>
     </body>
 </html>

paddlex/inference/__init__.py CHANGED Viewed

@@ -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,7 +13,7 @@
 # limitations under the License.
 from ..utils import logging
-from .pipelines import create_pipeline, load_pipeline_config
 from .models import create_predictor
+from .pipelines import create_pipeline, load_pipeline_config
+from .utils.hpi import HPIConfig
 from .utils.pp_option import PaddlePredictorOption

paddlex/inference/common/__init__.py CHANGED Viewed

@@ -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/common/batch_sampler/__init__.py CHANGED Viewed

@@ -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,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
+from .audio_batch_sampler import AudioBatchSampler
 from .base_batch_sampler import BaseBatchSampler
+from .det_3d_batch_sampler import Det3DBatchSampler
+from .doc_vlm_batch_sampler import DocVLMBatchSampler
 from .image_batch_sampler import ImageBatchSampler
-from .video_batch_sampler import VideoBatchSampler
 from .ts_batch_sampler import TSBatchSampler
-from .det_3d_batch_sampler import Det3DBatchSampler
-from .audio_batch_sampler import AudioBatchSampler
+from .video_batch_sampler import VideoBatchSampler

paddlex/inference/common/batch_sampler/audio_batch_sampler.py CHANGED Viewed

@@ -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,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import os
-import ast
 from pathlib import Path
-import numpy as np
 from ....utils import logging
 from ....utils.cache import CACHE_DIR
@@ -60,9 +57,11 @@ class AudioBatchSampler(BaseBatchSampler):
             if inputs.startswith("http"):
                 inputs = self._download_from_url(inputs)
             yield [inputs]
+        elif isinstance(inputs, list):
+            yield inputs
         else:
-            logging.warning(
-                f"Not supported input data type! Only `str` are supported, but got: {input}."
+            raise TypeError(
+                f"Not supported input data type! Only `str` are supported, but got: {type(inputs)}."
             )
     @BaseBatchSampler.batch_size.setter

paddlex/inference/common/batch_sampler/base_batch_sampler.py CHANGED Viewed

@@ -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,14 +12,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from typing import Union, Tuple, List, Dict, Any, Iterator
-from abc import ABC, abstractmethod
+from abc import abstractmethod
+from typing import Any, Dict, Iterator, List, Tuple
-from ....utils.flags import (
-    INFER_BENCHMARK,
-    INFER_BENCHMARK_ITER,
-    INFER_BENCHMARK_DATA_SIZE,
-)
+class Batch:
+    def __init__(self):
+        self.instances = []
+        self.input_paths = []
+    def append(self, instance, input_path):
+        self.instances.append(instance)
+        self.input_paths.append(input_path)
+    def reset(self):
+        self.instances = []
+        self.input_paths = []
+    def __len__(self):
+        return len(self.instances)
 class BaseBatchSampler:
@@ -33,9 +44,6 @@ class BaseBatchSampler:
         """
         super().__init__()
         self._batch_size = batch_size
-        self._benchmark = INFER_BENCHMARK
-        self._benchmark_iter = INFER_BENCHMARK_ITER
-        self._benchmark_data_size = INFER_BENCHMARK_DATA_SIZE
     @property
     def batch_size(self) -> int:
@@ -69,11 +77,7 @@ class BaseBatchSampler:
         Yields:
             Iterator[List[Any]]: An iterator yielding the batch data.
         """
-        if input is None and self._benchmark:
-            for _ in range(self._benchmark_iter):
-                yield self._rand_batch(self._benchmark_data_size)
-        else:
-            yield from self.sample(input)
+        yield from self.sample(input)
     @abstractmethod
     def sample(self, *args: Tuple[Any], **kwargs: Dict[str, Any]) -> Iterator[list]:

paddlex/inference/common/batch_sampler/det_3d_batch_sampler.py CHANGED Viewed

@@ -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,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from typing import Any, Dict, List, Optional, Union
 import os
-import ast
-from pathlib import Path
-import numpy as np
 import pickle
 import tarfile
+from pathlib import Path
+from typing import Any, Dict, List, Union
 from ....utils import logging
-from ....utils.download import download
 from ....utils.cache import CACHE_DIR
+from ....utils.download import download
 from .base_batch_sampler import BaseBatchSampler

paddlex/inference/common/batch_sampler/doc_vlm_batch_sampler.py ADDED Viewed

@@ -0,0 +1,87 @@
+# 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.
+from ....utils import logging
+from .base_batch_sampler import BaseBatchSampler
+class DocVLMBatchSampler(BaseBatchSampler):
+    model_names_only_supports_batchsize_of_one = {"PP-DocBee-2B", "PP-DocBee-7B"}
+    def __init__(self, model_name, batch_size: int = 1) -> None:
+        """Initializes the BaseBatchSampler.
+        Args:
+            model_name (str): The name of the model.
+            batch_size (int, optional): The size of each batch. Only support 1.
+        """
+        self.model_name = model_name
+        if (
+            self.model_name in self.model_names_only_supports_batchsize_of_one
+            and batch_size != 1
+        ):
+            logging.warning(
+                f"doc vlm batch sampler only support batch size 1 for {self.model_name}, but got {batch_size} and it will not take effect."
+            )
+            batch_size = 1
+        super().__init__(batch_size)
+    def sample(self, inputs):
+        """Generate list of input file path.
+        Args:
+            inputs (str): file path.
+        Yields:
+            list: list of file path.
+        """
+        if isinstance(inputs, dict):
+            inputs = [inputs]
+        if not (isinstance(inputs, list) and all(isinstance(i, dict) for i in inputs)):
+            raise TypeError(
+                f"Not supported input data type! Only `Dict` or `List[Dict]` are supported, but got: {type(inputs)}."
+            )
+        batch = []
+        for input_ in inputs:
+            batch.append(input_)
+            if len(batch) == self.batch_size:
+                yield batch
+                batch = []
+        if len(batch) > 0:
+            yield batch
+    @BaseBatchSampler.batch_size.setter
+    def batch_size(self, batch_size):
+        """Sets the batch size.
+        Args:
+            batch_size (int): The batch size to set.
+        Raises:
+            Warning: If the batch size is not equal 1.
+        """
+        # only support batch size 1
+        if (
+            self.model_name in self.model_names_only_supports_batchsize_of_one
+            and batch_size != 1
+        ):
+            logging.warning(
+                f"doc vlm batch sampler only support batch size 1 for {self.model_name}, but got {batch_size} and it will not take effect."
+            )
+        else:
+            self._batch_size = batch_size

paddlex/inference/common/batch_sampler/image_batch_sampler.py CHANGED Viewed

@@ -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,40 +13,35 @@
 # limitations under the License.
 import os
-import ast
 from pathlib import Path
 import numpy as np
 from ....utils import logging
-from ....utils.download import download
 from ....utils.cache import CACHE_DIR
+from ....utils.download import download
 from ...utils.io import PDFReader
-from .base_batch_sampler import BaseBatchSampler
+from .base_batch_sampler import BaseBatchSampler, Batch
-class ImgInstance:
+class ImgBatch(Batch):
     def __init__(self):
-        self.instances = []
-        self.input_paths = []
+        super().__init__()
         self.page_indexes = []
     def append(self, instance, input_path, page_index):
-        self.instances.append(instance)
-        self.input_paths.append(input_path)
+        super().append(instance, input_path)
         self.page_indexes.append(page_index)
     def reset(self):
-        self.instances = []
-        self.input_paths = []
+        super().reset()
         self.page_indexes = []
-    def __len__(self):
-        return len(self.instances)
 class ImageBatchSampler(BaseBatchSampler):
-    SUFFIX = ["jpg", "png", "jpeg", "JPEG", "JPG", "bmp"]
+    IMG_SUFFIX = ["jpg", "png", "jpeg", "bmp"]
+    PDF_SUFFIX = ["pdf"]
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -60,16 +55,19 @@ class ImageBatchSampler(BaseBatchSampler):
         return save_path.as_posix()
     def _get_files_list(self, fp):
-        file_list = []
         if fp is None or not os.path.exists(fp):
-            raise Exception(f"Not found any img file in path: {fp}")
+            raise Exception(f"Not found any files in path: {fp}")
+        if os.path.isfile(fp):
+            return [fp]
-        if os.path.isfile(fp) and fp.split(".")[-1] in self.SUFFIX:
-            file_list.append(fp)
-        elif os.path.isdir(fp):
+        file_list = []
+        if os.path.isdir(fp):
             for root, dirs, files in os.walk(fp):
                 for single_file in files:
-                    if single_file.split(".")[-1] in self.SUFFIX:
+                    if (
+                        single_file.split(".")[-1].lower()
+                        in self.IMG_SUFFIX + self.PDF_SUFFIX
+                    ):
                         file_list.append(os.path.join(root, single_file))
         if len(file_list) == 0:
             raise Exception("Not found any file in {}".format(fp))
@@ -80,57 +78,44 @@ class ImageBatchSampler(BaseBatchSampler):
         if not isinstance(inputs, list):
             inputs = [inputs]
-        batch = ImgInstance()
+        batch = ImgBatch()
         for input in inputs:
             if isinstance(input, np.ndarray):
                 batch.append(input, None, None)
                 if len(batch) == self.batch_size:
                     yield batch
-                    batch.reset()
-            elif isinstance(input, str) and input.split(".")[-1] in ("PDF", "pdf"):
-                file_path = (
-                    self._download_from_url(input)
-                    if input.startswith("http")
-                    else input
-                )
-                for page_idx, page_img in enumerate(self.pdf_reader.read(file_path)):
-                    batch.append(page_img, file_path, page_idx)
-                    if len(batch) == self.batch_size:
-                        yield batch
-                        batch.reset()
+                    batch = ImgBatch()
             elif isinstance(input, str):
-                file_path = (
-                    self._download_from_url(input)
-                    if input.startswith("http")
-                    else input
-                )
-                file_list = self._get_files_list(file_path)
-                for file_path in file_list:
+                suffix = input.split(".")[-1].lower()
+                if suffix in self.PDF_SUFFIX:
+                    file_path = (
+                        self._download_from_url(input)
+                        if input.startswith("http")
+                        else input
+                    )
+                    for page_idx, page_img in enumerate(
+                        self.pdf_reader.read(file_path)
+                    ):
+                        batch.append(page_img, file_path, page_idx)
+                        if len(batch) == self.batch_size:
+                            yield batch
+                            batch = ImgBatch()
+                elif suffix in self.IMG_SUFFIX:
+                    file_path = (
+                        self._download_from_url(input)
+                        if input.startswith("http")
+                        else input
+                    )
                     batch.append(file_path, file_path, None)
                     if len(batch) == self.batch_size:
                         yield batch
-                        batch.reset()
+                        batch = ImgBatch()
+                else:
+                    file_list = self._get_files_list(input)
+                    yield from self.sample(file_list)
             else:
                 logging.warning(
                     f"Not supported input data type! Only `numpy.ndarray` and `str` are supported! So has been ignored: {input}."
                 )
         if len(batch) > 0:
             yield batch
-    def _rand_batch(self, data_size):
-        def parse_size(s):
-            res = ast.literal_eval(s)
-            if isinstance(res, int):
-                return (res, res)
-            else:
-                assert isinstance(res, (tuple, list))
-                assert len(res) == 2
-                assert all(isinstance(item, int) for item in res)
-                return res
-        size = parse_size(data_size)
-        rand_batch = [
-            np.random.randint(0, 256, (*size, 3), dtype=np.uint8)
-            for _ in range(self.batch_size)
-        ]
-        return rand_batch

paddlex/inference/common/batch_sampler/ts_batch_sampler.py CHANGED Viewed

@@ -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,15 +13,14 @@
 # limitations under the License.
 import os
-import ast
 from pathlib import Path
-import numpy as np
 import pandas as pd
 from ....utils import logging
-from ....utils.download import download
 from ....utils.cache import CACHE_DIR
-from .base_batch_sampler import BaseBatchSampler
+from ....utils.download import download
+from .base_batch_sampler import BaseBatchSampler, Batch
 class TSBatchSampler(BaseBatchSampler):
@@ -83,13 +82,13 @@ class TSBatchSampler(BaseBatchSampler):
         if not isinstance(inputs, list):
             inputs = [inputs]
-        batch = []
+        batch = Batch()
         for input in inputs:
             if isinstance(input, pd.DataFrame):
-                batch.append(input)
+                batch.append(input, None)
                 if len(batch) == self.batch_size:
                     yield batch
-                    batch = []
+                    batch = Batch()
             elif isinstance(input, str):
                 file_path = (
                     self._download_from_url(input)
@@ -98,10 +97,10 @@ class TSBatchSampler(BaseBatchSampler):
                 )
                 file_list = self._get_files_list(file_path)
                 for file_path in file_list:
-                    batch.append(file_path)
+                    batch.append(file_path, file_path)
                     if len(batch) == self.batch_size:
                         yield batch
-                        batch = []
+                        batch = Batch()
             else:
                 logging.warning(
                     f"Not supported input data type! Only `pd.DataFrame` and `str` are supported! So has been ignored: {input}."

paddlex/inference/common/batch_sampler/video_batch_sampler.py CHANGED Viewed

@@ -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,11 @@
 # limitations under the License.
 import os
-import ast
 from pathlib import Path
-import numpy as np
 from ....utils import logging
-from ....utils.download import download
 from ....utils.cache import CACHE_DIR
+from ....utils.download import download
 from .base_batch_sampler import BaseBatchSampler
@@ -74,21 +72,3 @@ class VideoBatchSampler(BaseBatchSampler):
                 )
         if len(batch) > 0:
             yield batch
-    def _rand_batch(self, data_size):
-        def parse_size(s):
-            res = ast.literal_eval(s)
-            if isinstance(res, int):
-                return (res, res)
-            else:
-                assert isinstance(res, (tuple, list))
-                assert len(res) == 2
-                assert all(isinstance(item, int) for item in res)
-                return res
-        size = parse_size(data_size)
-        rand_batch = [
-            np.random.randint(0, 256, (*size, 3), dtype=np.uint8)
-            for _ in range(self.batch_size)
-        ]
-        return rand_batch

paddlex/inference/common/reader/__init__.py CHANGED Viewed

@@ -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,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from .image_reader import ReadImage
 from .audio_reader import ReadAudio
-from .video_reader import ReadVideo
-from .ts_reader import ReadTS
 from .det_3d_reader import ReadNuscenesData
+from .image_reader import ReadImage
+from .ts_reader import ReadTS
+from .video_reader import ReadVideo

paddlex/inference/common/reader/audio_reader.py CHANGED Viewed

@@ -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,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import numpy as np
-import lazy_paddle as paddle
 from ...utils.io import AudioReader
@@ -29,6 +27,8 @@ class ReadAudio:
         self._audio_reader = AudioReader(backend="wav")
     def read(self, input):
+        import paddle
         if isinstance(input, str):
             audio, sample_rate = self._audio_reader.read(input)
             if sample_rate != 16000:

paddlex/inference/common/reader/det_3d_reader.py CHANGED Viewed

@@ -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,11 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import numpy as np
-import cv2
 import os
-from typing import Generic, List, Optional, Any, Dict
-import pickle
+from typing import Generic
+import numpy as np
+from ...utils.benchmark import benchmark
 class _EasyDict(dict):
@@ -79,6 +80,7 @@ class Sample(_EasyDict):
         self.attrs = None
+@benchmark.timeit_with_options(name=None, is_read_operation=True)
 class ReadNuscenesData:
     def __init__(

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

paddlex 3.0.0rc0py3-none-any.whl → 3.0.1py3-none-any.whl