diff --git a/learnware/__init__.py b/learnware/__init__.py index b140a86..f081fc1 100644 --- a/learnware/__init__.py +++ b/learnware/__init__.py @@ -2,7 +2,7 @@ __version__ = "0.1.2.99" import os from .logger import get_module_logger -from .utils import is_torch_avaliable +from .utils import is_torch_available logger = get_module_logger("Initialization") @@ -28,5 +28,5 @@ def init(make_dir: bool = False, tf_loglevel: str = "2", **kwargs): # logger.info(f"The tensorflow log level is setted to {tf_loglevel}") -if not is_torch_avaliable(verbose=False): +if not is_torch_available(verbose=False): logger.warning("The functionality of learnware is limited due to 'torch' is not installed!") diff --git a/learnware/market/anchor/__init__.py b/learnware/market/anchor/__init__.py index c005c0c..d1b8392 100644 --- a/learnware/market/anchor/__init__.py +++ b/learnware/market/anchor/__init__.py @@ -1,12 +1,12 @@ from .organizer import AnchoredOrganizer from .user_info import AnchoredUserInfo -from ...utils import is_torch_avaliable +from ...utils import is_torch_available from ...logger import get_module_logger logger = get_module_logger("market_anchor") -if not is_torch_avaliable(verbose=False): +if not is_torch_available(verbose=False): AnchoredSearcher = None logger.warning("AnchoredSearcher is skipped because 'torch' is not installed!") else: diff --git a/learnware/market/easy/__init__.py b/learnware/market/easy/__init__.py index 63907a9..7495ee5 100644 --- a/learnware/market/easy/__init__.py +++ b/learnware/market/easy/__init__.py @@ -1,11 +1,11 @@ from .organizer import EasyOrganizer -from ...utils import is_torch_avaliable +from ...utils import is_torch_available from ...logger import get_module_logger logger = get_module_logger("market_easy") -if not is_torch_avaliable(verbose=False): +if not is_torch_available(verbose=False): EasySearcher = None EasySemanticChecker = None EasyStatChecker = None diff --git a/learnware/reuse/__init__.py b/learnware/reuse/__init__.py index ad47c32..8da61ed 100644 --- a/learnware/reuse/__init__.py +++ b/learnware/reuse/__init__.py @@ -2,18 +2,18 @@ from .base import BaseReuser from .align import AlignLearnware from ..logger import get_module_logger -from ..utils import is_torch_avaliable -from .utils import is_geatpy_avaliable, is_lightgbm_avaliable +from ..utils import is_torch_available +from .utils import is_geatpy_available, is_lightgbm_available logger = get_module_logger("reuse") -if not is_geatpy_avaliable(verbose=False): +if not is_geatpy_available(verbose=False): EnsemblePruningReuser = None logger.warning("EnsemblePruningReuser is skipped due to 'geatpy' is not installed!") else: from .ensemble_pruning import EnsemblePruningReuser -if not is_torch_avaliable(verbose=False): +if not is_torch_available(verbose=False): AveragingReuser = None FeatureAugmentReuser = None HeteroMapAlignLearnware = None @@ -26,14 +26,14 @@ else: from .feature_augment import FeatureAugmentReuser from .hetero import HeteroMapAlignLearnware, FeatureAlignLearnware -if not is_lightgbm_avaliable(verbose=False) or not is_torch_avaliable(verbose=False): +if not is_lightgbm_available(verbose=False) or not is_torch_available(verbose=False): JobSelectorReuser = None uninstall_packages = [ value for flag, value in zip( [ - is_lightgbm_avaliable(verbose=False), - is_torch_avaliable(verbose=False), + is_lightgbm_available(verbose=False), + is_torch_available(verbose=False), ], ["lightgbm", "torch"], ) diff --git a/learnware/reuse/utils.py b/learnware/reuse/utils.py index c227682..a85135f 100644 --- a/learnware/reuse/utils.py +++ b/learnware/reuse/utils.py @@ -4,7 +4,7 @@ from ..logger import get_module_logger logger = get_module_logger("reuse_utils") -def is_geatpy_avaliable(verbose=False): +def is_geatpy_available(verbose=False): try: import geatpy except ModuleNotFoundError as err: @@ -16,7 +16,7 @@ def is_geatpy_avaliable(verbose=False): return True -def is_lightgbm_avaliable(verbose=False): +def is_lightgbm_available(verbose=False): try: import lightgbm except ModuleNotFoundError as err: diff --git a/learnware/specification/__init__.py b/learnware/specification/__init__.py index 6defc3e..81642cf 100644 --- a/learnware/specification/__init__.py +++ b/learnware/specification/__init__.py @@ -10,9 +10,9 @@ from .regular import ( from .system import HeteroMapTableSpecification -from ..utils import is_torch_avaliable +from ..utils import is_torch_available -if not is_torch_avaliable(verbose=False): +if not is_torch_available(verbose=False): generate_stat_spec = None generate_rkme_table_spec = None generate_rkme_image_spec = None diff --git a/learnware/specification/regular/__init__.py b/learnware/specification/regular/__init__.py index c9b087a..0c8b05d 100644 --- a/learnware/specification/regular/__init__.py +++ b/learnware/specification/regular/__init__.py @@ -1,5 +1,5 @@ from .base import RegularStatSpecification -from ...utils import is_torch_avaliable +from ...utils import is_torch_available from .text import RKMETextSpecification from .table import RKMETableSpecification, RKMEStatSpecification, rkme_solve_qp diff --git a/learnware/specification/regular/image/__init__.py b/learnware/specification/regular/image/__init__.py index e883f99..224d875 100644 --- a/learnware/specification/regular/image/__init__.py +++ b/learnware/specification/regular/image/__init__.py @@ -1,23 +1,23 @@ -from .utils import is_torch_optimizer_avaliable, is_torch_vision_avaliable -from ....utils import is_torch_avaliable +from .utils import is_torch_optimizer_available, is_torchvision_available +from ....utils import is_torch_available from ....logger import get_module_logger logger = get_module_logger("regular_image_spec") if ( - not is_torch_vision_avaliable(verbose=False) - or not is_torch_optimizer_avaliable(verbose=False) - or not is_torch_avaliable(verbose=False) + not is_torchvision_available(verbose=False) + or not is_torch_optimizer_available(verbose=False) + or not is_torch_available(verbose=False) ): RKMEImageSpecification = None uninstall_packages = [ value for flag, value in zip( [ - is_torch_vision_avaliable(verbose=False), - is_torch_optimizer_avaliable(verbose=False), - is_torch_avaliable(verbose=False), + is_torchvision_available(verbose=False), + is_torch_optimizer_available(verbose=False), + is_torch_available(verbose=False), ], ["torchvision", "torch-optimizer", "torch"], ) diff --git a/learnware/specification/regular/image/utils.py b/learnware/specification/regular/image/utils.py index 80c97f2..cd60d96 100644 --- a/learnware/specification/regular/image/utils.py +++ b/learnware/specification/regular/image/utils.py @@ -3,7 +3,7 @@ from ....logger import get_module_logger logger = get_module_logger("regular_image_spec_utils") -def is_torch_optimizer_avaliable(verbose=False): +def is_torch_optimizer_available(verbose=False): try: import torch_optimizer except ModuleNotFoundError as err: @@ -13,7 +13,7 @@ def is_torch_optimizer_avaliable(verbose=False): return True -def is_torch_vision_avaliable(verbose=False): +def is_torchvision_available(verbose=False): try: import torchvision except ModuleNotFoundError as err: diff --git a/learnware/specification/regular/table/__init__.py b/learnware/specification/regular/table/__init__.py index cc4cda9..262e72c 100644 --- a/learnware/specification/regular/table/__init__.py +++ b/learnware/specification/regular/table/__init__.py @@ -1,9 +1,9 @@ -from ....utils import is_torch_avaliable +from ....utils import is_torch_available from ....logger import get_module_logger logger = get_module_logger("regular_table_spec") -if not is_torch_avaliable(verbose=False): +if not is_torch_available(verbose=False): RKMETableSpecification = None RKMEStatSpecification = None logger.warning("RKMETableSpecification is skipped because torch is not installed!") diff --git a/learnware/specification/regular/text/__init__.py b/learnware/specification/regular/text/__init__.py index 3d8c830..d679589 100644 --- a/learnware/specification/regular/text/__init__.py +++ b/learnware/specification/regular/text/__init__.py @@ -1,18 +1,18 @@ -from .utils import is_sentence_transformers_avaliable +from .utils import is_sentence_transformers_available -from ....utils import is_torch_avaliable +from ....utils import is_torch_available from ....logger import get_module_logger logger = get_module_logger("regular_text_spec") -if not is_sentence_transformers_avaliable(verbose=False) or not is_torch_avaliable(verbose=False): +if not is_sentence_transformers_available(verbose=False) or not is_torch_available(verbose=False): RKMETextSpecification = None uninstall_packages = [ value for flag, value in zip( [ - is_sentence_transformers_avaliable(verbose=False), - is_torch_avaliable(verbose=False), + is_sentence_transformers_available(verbose=False), + is_torch_available(verbose=False), ], ["sentence_transformers", "torch"], ) diff --git a/learnware/specification/regular/text/utils.py b/learnware/specification/regular/text/utils.py index 2052c02..d4568a5 100644 --- a/learnware/specification/regular/text/utils.py +++ b/learnware/specification/regular/text/utils.py @@ -3,7 +3,7 @@ from ....logger import get_module_logger logger = get_module_logger("regular_text_spec_utils") -def is_sentence_transformers_avaliable(verbose=False): +def is_sentence_transformers_available(verbose=False): try: import sentence_transformers except ModuleNotFoundError as err: diff --git a/learnware/utils/__init__.py b/learnware/utils/__init__.py index f37bc03..c118620 100644 --- a/learnware/utils/__init__.py +++ b/learnware/utils/__init__.py @@ -1,7 +1,7 @@ import os import zipfile -from .import_utils import is_torch_avaliable +from .import_utils import is_torch_available from .module import get_module_by_module_path from .file import read_yaml_to_dict, save_dict_to_yaml from .gpu import setup_seed, choose_device diff --git a/learnware/utils/gpu.py b/learnware/utils/gpu.py index 395d979..07ab21d 100644 --- a/learnware/utils/gpu.py +++ b/learnware/utils/gpu.py @@ -1,5 +1,6 @@ import random import numpy as np +from .import_utils import is_torch_available def setup_seed(seed): @@ -48,7 +49,8 @@ def choose_device(cuda_idx=-1): class CudaManager: def __init__(self): - pass + if is_torch_available(verbose=False): + pass def get_specification_cuda_idx(self): pass diff --git a/learnware/utils/import_utils.py b/learnware/utils/import_utils.py index 9f4406c..449b727 100644 --- a/learnware/utils/import_utils.py +++ b/learnware/utils/import_utils.py @@ -3,7 +3,7 @@ from ..logger import get_module_logger logger = get_module_logger("import_utils") -def is_torch_avaliable(verbose=False): +def is_torch_available(verbose=False): try: import torch except ModuleNotFoundError as err: