paddlex 3.0.0b2__py3-none-any.whl → 3.0.0rc1__py3-none-any.whl

paddlex/modules/anomaly_detection/dataset_checker/__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.
@@ -17,9 +17,8 @@ import os
 import os.path as osp
 
 from ...base import BaseDatasetChecker
-from .dataset_src import check_dataset, convert_dataset, split_dataset, anaylse_dataset
-
 from ..model_list import MODELS
+from .dataset_src import anaylse_dataset, check_dataset, convert_dataset, split_dataset
 
 
 class UadDatasetChecker(BaseDatasetChecker):

paddlex/modules/anomaly_detection/dataset_checker/dataset_src/__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.
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
+from .analyse_dataset import anaylse_dataset
 from .check_dataset import check_dataset
 from .convert_dataset import convert_dataset
 from .split_dataset import split_dataset
-from .analyse_dataset import anaylse_dataset

paddlex/modules/anomaly_detection/dataset_checker/dataset_src/analyse_dataset.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.
@@ -16,14 +16,17 @@
 import os
 import os.path as osp
 
-import matplotlib.pyplot as plt
 import numpy as np
 from PIL import Image, ImageOps
 
+from .....utils.deps import function_requires_deps, is_dep_available
 from .....utils.file_interface import custom_open
-from .....utils.logging import info
 
+if is_dep_available("matplotlib"):
+    import matplotlib.pyplot as plt
 
+
+@function_requires_deps("matplotlib")
 def anaylse_dataset(dataset_dir, output):
     """class analysis for dataset"""
 

paddlex/modules/anomaly_detection/dataset_checker/dataset_src/check_dataset.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.
@@ -17,15 +17,19 @@ import os
 import os.path as osp
 
 import numpy as np
-from PIL import Image, ImageOps
-import cv2
+from PIL import Image
 
-from .utils.visualizer import visualize
+from .....utils.deps import function_requires_deps, is_dep_available
 from .....utils.errors import DatasetFileNotFoundError
 from .....utils.file_interface import custom_open
 from .....utils.logging import info
+from .utils.visualizer import visualize
+
+if is_dep_available("opencv-contrib-python"):
+    import cv2
 
 
+@function_requires_deps("opencv-contrib-python")
 def check_dataset(dataset_dir, output, sample_num=10):
     """check dataset"""
     dataset_dir = osp.abspath(dataset_dir)

paddlex/modules/anomaly_detection/dataset_checker/dataset_src/convert_dataset.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,20 +13,22 @@
 # limitations under the License.
 
 
-import glob
 import json
 import os
 import os.path as osp
 import shutil
 
-import cv2
 import numpy as np
 from PIL import Image, ImageDraw
 
-from .....utils.file_interface import custom_open
 from .....utils import logging
+from .....utils.deps import function_requires_deps, is_dep_available
+from .....utils.file_interface import custom_open
 from .....utils.logging import info
 
+if is_dep_available("opencv-contrib-python"):
+    import cv2
+
 
 def convert_dataset(dataset_type, input_dir):
     """convert to paddlex official format"""
@@ -38,6 +40,7 @@ def convert_dataset(dataset_type, input_dir):
         raise NotImplementedError(dataset_type)
 
 
+@function_requires_deps("opencv-contrib-python")
 def convert_labelme_dataset(input_dir):
     """convert labelme format to paddlex official format"""
     bg_name = "_background_"

paddlex/modules/anomaly_detection/dataset_checker/dataset_src/split_dataset.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.
@@ -18,8 +18,8 @@ import os.path as osp
 import random
 import shutil
 
-from .....utils.file_interface import custom_open
 from .....utils import logging
+from .....utils.file_interface import custom_open
 
 
 def split_dataset(root_dir, train_percent, val_percent):

paddlex/modules/anomaly_detection/dataset_checker/dataset_src/utils/__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/modules/anomaly_detection/dataset_checker/dataset_src/utils/visualizer.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,13 @@
 # limitations under the License.
 
 
-import cv2
 import numpy as np
 
+from ......utils.deps import function_requires_deps, is_dep_available
+
+if is_dep_available("opencv-contrib-python"):
+    import cv2
+
 
 def get_color_map_list(length):
     """Returns the color map for visualizing the segmentation mask"""
@@ -34,6 +38,7 @@ def get_color_map_list(length):
     return color_map
 
 
+@function_requires_deps("opencv-contrib-python")
 def visualize(image, result, weight=0.6, use_multilabel=False):
     """Convert predict result to color image, and save added image."""
     color_map = get_color_map_list(256)

paddlex/modules/anomaly_detection/evaluator.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/modules/anomaly_detection/exportor.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/modules/anomaly_detection/model_list.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/modules/anomaly_detection/trainer.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,11 +14,8 @@
 
 
 import os
-import glob
-from pathlib import Path
 
 from ..base import BaseTrainer
-from ...utils.config import AttrDict
 from .model_list import MODELS
 
 
@@ -68,4 +65,6 @@ class UadTrainer(BaseTrainer):
             train_args["do_eval"] = True
             train_args["save_interval"] = self.train_config.eval_interval
         train_args["dy2st"] = self.train_config.get("dy2st", False)
+        # amp support 'O1', 'O2', 'OFF'
+        train_args["amp"] = self.train_config.get("amp", "OFF")
         return train_args

paddlex/modules/base/__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.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from .dataset_checker import build_dataset_checker, BaseDatasetChecker
-from .trainer import build_trainer, BaseTrainer
-from .evaluator import build_evaluater, BaseEvaluator
-from .exportor import build_exportor, BaseExportor
+from .dataset_checker import BaseDatasetChecker, build_dataset_checker
+from .evaluator import BaseEvaluator, build_evaluater
+from .exportor import BaseExportor, build_exportor
+from .trainer import BaseTrainer, build_trainer

paddlex/modules/base/build_model.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,7 +13,6 @@
 # limitations under the License.
 
 
-import os
 from ...repo_apis.base import Config, PaddleModel
 
 
@@ -22,7 +21,7 @@ def build_model(model_name: str, config_path: str = None) -> tuple:
 
     Args:
         model_name (str): model name
-        device (str): device, such as gpu, cpu, npu, xpu, mlu
+        device (str): device, such as gpu, cpu, npu, xpu, mlu, gcu
         config_path (str, optional): path to the PaddleX config yaml file.
             Defaults to None, i.e. using the default config file.
 

paddlex/modules/base/dataset_checker/__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.
@@ -13,4 +13,4 @@
 # limitations under the License.
 
 
-from .dataset_checker import build_dataset_checker, BaseDatasetChecker
+from .dataset_checker import BaseDatasetChecker, build_dataset_checker

paddlex/modules/base/dataset_checker/dataset_checker.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.
@@ -16,10 +16,10 @@
 import os
 from abc import ABC, abstractmethod
 
-from .utils import build_res_dict
-from ....utils.misc import AutoRegisterABCMetaClass
 from ....utils.config import AttrDict
 from ....utils.logging import info
+from ....utils.misc import AutoRegisterABCMetaClass
+from .utils import build_res_dict
 
 
 def build_dataset_checker(config: AttrDict) -> "BaseDatasetChecker":
@@ -32,6 +32,11 @@ def build_dataset_checker(config: AttrDict) -> "BaseDatasetChecker":
         BaseDatasetChecker: the dataset checker, which is subclass of BaseDatasetChecker.
     """
     model_name = config.Global.model
+    try:
+        pass
+    except ModuleNotFoundError:
+        pass
+
     return BaseDatasetChecker.get(model_name)(config)
 
 
@@ -77,7 +82,7 @@ class BaseDatasetChecker(ABC, metaclass=AutoRegisterABCMetaClass):
         check_result = build_res_dict(True)
         check_result["attributes"] = attrs
         check_result["analysis"] = analysis
-        check_result["dataset_path"] = self.global_config.dataset_dir
+        check_result["dataset_path"] = os.path.basename(dataset_dir)
         check_result["show_type"] = self.get_show_type()
         check_result["dataset_type"] = self.get_dataset_type()
         info("Check dataset passed !")

paddlex/modules/base/dataset_checker/utils.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,6 @@
 # limitations under the License.
 
 
-import os
-
 __all__ = [
     "build_res_dict",
     "CheckFailedError",

paddlex/modules/base/evaluator.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 os
-from pathlib import Path
 from abc import ABC, abstractmethod
+from pathlib import Path
 
-from .build_model import build_model
-from ...utils.device import update_device_num, set_env_for_device
-from ...utils.misc import AutoRegisterABCMetaClass
 from ...utils.config import AttrDict
+from ...utils.device import (
+    check_supported_device,
+    set_env_for_device,
+    update_device_num,
+)
 from ...utils.logging import *
+from ...utils.misc import AutoRegisterABCMetaClass
+from .build_model import build_model
 
 
 def build_evaluater(config: AttrDict) -> "BaseEvaluator":
@@ -33,6 +37,10 @@ def build_evaluater(config: AttrDict) -> "BaseEvaluator":
         BaseEvaluator: the evaluater, which is subclass of BaseEvaluator.
     """
     model_name = config.Global.model
+    try:
+        pass
+    except ModuleNotFoundError:
+        pass
     return BaseEvaluator.get(model_name)(config)
 
 
@@ -52,6 +60,8 @@ class BaseEvaluator(ABC, metaclass=AutoRegisterABCMetaClass):
         self.eval_config = config.Evaluate
 
         config_path = self.get_config_path(self.eval_config.weight_path)
+        if self.eval_config.get("basic_config_path", None):
+            config_path = self.eval_config.get("basic_config_path", None)
 
         self.pdx_config, self.pdx_model = build_model(
             self.global_config.model, config_path=config_path
@@ -138,10 +148,16 @@ evaling!"
         Returns:
             str: device setting, such as: `gpu:0,1`, `npu:0,1`, `cpu`.
         """
+        check_supported_device(self.global_config.device, self.global_config.model)
         set_env_for_device(self.global_config.device)
-        if using_device_number:
-            return update_device_num(self.global_config.device, using_device_number)
-        return self.global_config.device
+        device_setting = (
+            update_device_num(self.global_config.device, using_device_number)
+            if using_device_number
+            else self.global_config.device
+        )
+        # replace "dcu" with "gpu"
+        device_setting = device_setting.replace("dcu", "gpu")
+        return device_setting
 
     @abstractmethod
     def update_config(self):

paddlex/modules/base/exportor.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,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
+from abc import ABC
 from pathlib import Path
-from abc import ABC, abstractmethod
 
-from .build_model import build_model
-from ...utils.device import update_device_num, set_env_for_device
-from ...utils.misc import AutoRegisterABCMetaClass
-from ...utils.config import AttrDict
 from ...utils import logging
+from ...utils.config import AttrDict
+from ...utils.device import (
+    check_supported_device,
+    set_env_for_device,
+    update_device_num,
+)
+from ...utils.flags import FLAGS_json_format_model
+from ...utils.misc import AutoRegisterABCMetaClass
+from .build_model import build_model
 
 
 def build_exportor(config: AttrDict) -> "BaseExportor":
@@ -33,6 +37,10 @@ def build_exportor(config: AttrDict) -> "BaseExportor":
         BaseExportor: the exportor, which is subclass of BaseExportor.
     """
     model_name = config.Global.model
+    try:
+        pass
+    except ModuleNotFoundError:
+        pass
     return BaseExportor.get(model_name)(config)
 
 
@@ -52,6 +60,8 @@ class BaseExportor(ABC, metaclass=AutoRegisterABCMetaClass):
         self.export_config = config.Export
 
         config_path = self.get_config_path(self.export_config.weight_path)
+        if self.export_config.get("basic_config_path", None):
+            config_path = self.export_config.get("basic_config_path", None)
 
         self.pdx_config, self.pdx_model = build_model(
             self.global_config.model, config_path=config_path
@@ -70,7 +80,12 @@ class BaseExportor(ABC, metaclass=AutoRegisterABCMetaClass):
         """
 
         config_path = Path(weight_path).parent / "config.yaml"
-        if not config_path.exists():
+        # `Path("https://xxx/xxx")` would cause error on Windows
+        try:
+            is_exists = config_path.exists()
+        except Exception:
+            is_exists = False
+        if not is_exists:
             logging.warning(
                 f"The config file(`{config_path}`) related to weight file(`{weight_path}`) is not exist, use default instead."
             )
@@ -103,19 +118,28 @@ exporting!"
         Returns:
             str: device setting, such as: `gpu:0,1`, `npu:0,1`, `cpu`.
         """
+        check_supported_device(self.global_config.device, self.global_config.model)
         set_env_for_device(self.global_config.device)
-        if using_device_number:
-            return update_device_num(self.global_config.device, using_device_number)
-        return self.global_config.device
+        device_setting = (
+            update_device_num(self.global_config.device, using_device_number)
+            if using_device_number
+            else self.global_config.device
+        )
+        # replace "dcu" with "gpu"
+        device_setting = device_setting.replace("dcu", "gpu")
+        return device_setting
 
     def update_config(self):
         """update export config"""
-        pass
 
     def get_export_kwargs(self):
         """get key-value arguments of model export function"""
+        export_with_pir = (
+            self.global_config.get("export_with_pir", False) or FLAGS_json_format_model
+        )
         return {
             "weight_path": self.export_config.weight_path,
             "save_dir": self.global_config.output,
             "device": self.get_device(1),
+            "export_with_pir": export_with_pir,
         }

paddlex/modules/base/trainer.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,11 +14,17 @@
 
 import os
 from abc import ABC, abstractmethod
-from pathlib import Path
-from .build_model import build_model
-from ...utils.device import update_device_num, set_env_for_device
-from ...utils.misc import AutoRegisterABCMetaClass
+
 from ...utils.config import AttrDict
+from ...utils.device import (
+    check_supported_device,
+    set_env_for_device,
+    update_device_num,
+)
+from ...utils.flags import FLAGS_json_format_model, DISABLE_CINN_MODEL_WL
+from ...utils.misc import AutoRegisterABCMetaClass
+from .build_model import build_model
+from .utils.cinn_setting import CINN_WHITELIST, enable_cinn_backend
 
 
 def build_trainer(config: AttrDict) -> "BaseTrainer":
@@ -31,6 +37,10 @@ def build_trainer(config: AttrDict) -> "BaseTrainer":
         BaseTrainer: the trainer, which is subclass of BaseTrainer.
     """
     model_name = config.Global.model
+    try:
+        pass
+    except ModuleNotFoundError:
+        pass
     return BaseTrainer.get(model_name)(config)
 
 
@@ -49,9 +59,13 @@ class BaseTrainer(ABC, metaclass=AutoRegisterABCMetaClass):
         self.config = config
         self.global_config = config.Global
         self.train_config = config.Train
+        self.eval_config = config.Evaluate
         self.benchmark_config = config.get("Benchmark", None)
+        config_path = self.train_config.get("basic_config_path", None)
 
-        self.pdx_config, self.pdx_model = build_model(self.global_config.model)
+        self.pdx_config, self.pdx_model = build_model(
+            self.global_config.model, config_path=config_path
+        )
 
     def train(self, *args, **kwargs):
         """execute model training"""
@@ -61,13 +75,26 @@ class BaseTrainer(ABC, metaclass=AutoRegisterABCMetaClass):
         train_args = self.get_train_kwargs()
         if self.benchmark_config is not None:
             train_args.update({"benchmark": self.benchmark_config})
+        export_with_pir = (
+            self.global_config.get("export_with_pir", False) or FLAGS_json_format_model
+        )
         train_args.update(
             {
                 "uniform_output_enabled": self.train_config.get(
                     "uniform_output_enabled", True
-                )
+                ),
+                "export_with_pir": export_with_pir,
             }
         )
+
+        # apply CINN when model is supported
+        if (
+            not DISABLE_CINN_MODEL_WL
+            and self.train_config.get("dy2st", False)
+            and self.global_config.model in CINN_WHITELIST
+        ):
+            enable_cinn_backend()
+
         train_result = self.pdx_model.train(**train_args)
         assert (
             train_result.returncode == 0
@@ -95,10 +122,16 @@ training!"
         Returns:
             str: device setting, such as: `gpu:0,1`, `npu:0,1` `cpu`.
         """
+        check_supported_device(self.global_config.device, self.global_config.model)
         set_env_for_device(self.global_config.device)
-        if using_device_number:
-            return update_device_num(self.global_config.device, using_device_number)
-        return self.global_config.device
+        device_setting = (
+            update_device_num(self.global_config.device, using_device_number)
+            if using_device_number
+            else self.global_config.device
+        )
+        # replace "dcu" with "gpu"
+        device_setting = device_setting.replace("dcu", "gpu")
+        return device_setting
 
     @abstractmethod
     def update_config(self):

paddlex/modules/base/utils/__init__.py

@@ -0,0 +1,13 @@
+# Copyright (c) 2025 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.