Browse Source

[FIX] fix typo for import package

tags/v0.3.2
bxdd 2 years ago
parent
commit
cdeaf46516
15 changed files with 41 additions and 39 deletions
  1. +2
    -2
      learnware/__init__.py
  2. +2
    -2
      learnware/market/anchor/__init__.py
  3. +2
    -2
      learnware/market/easy/__init__.py
  4. +7
    -7
      learnware/reuse/__init__.py
  5. +2
    -2
      learnware/reuse/utils.py
  6. +2
    -2
      learnware/specification/__init__.py
  7. +1
    -1
      learnware/specification/regular/__init__.py
  8. +8
    -8
      learnware/specification/regular/image/__init__.py
  9. +2
    -2
      learnware/specification/regular/image/utils.py
  10. +2
    -2
      learnware/specification/regular/table/__init__.py
  11. +5
    -5
      learnware/specification/regular/text/__init__.py
  12. +1
    -1
      learnware/specification/regular/text/utils.py
  13. +1
    -1
      learnware/utils/__init__.py
  14. +3
    -1
      learnware/utils/gpu.py
  15. +1
    -1
      learnware/utils/import_utils.py

+ 2
- 2
learnware/__init__.py View File

@@ -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!")

+ 2
- 2
learnware/market/anchor/__init__.py View File

@@ -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:


+ 2
- 2
learnware/market/easy/__init__.py View File

@@ -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


+ 7
- 7
learnware/reuse/__init__.py View File

@@ -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"],
)


+ 2
- 2
learnware/reuse/utils.py View File

@@ -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:


+ 2
- 2
learnware/specification/__init__.py View File

@@ -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


+ 1
- 1
learnware/specification/regular/__init__.py View File

@@ -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


+ 8
- 8
learnware/specification/regular/image/__init__.py View File

@@ -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"],
)


+ 2
- 2
learnware/specification/regular/image/utils.py View File

@@ -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:


+ 2
- 2
learnware/specification/regular/table/__init__.py View File

@@ -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!")


+ 5
- 5
learnware/specification/regular/text/__init__.py View File

@@ -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"],
)


+ 1
- 1
learnware/specification/regular/text/utils.py View File

@@ -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:


+ 1
- 1
learnware/utils/__init__.py View File

@@ -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


+ 3
- 1
learnware/utils/gpu.py View File

@@ -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


+ 1
- 1
learnware/utils/import_utils.py View File

@@ -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:


Loading…
Cancel
Save