diff --git a/modelscope/metrics/image_color_enhance_metric.py b/modelscope/metrics/image_color_enhance_metric.py index df6534c5..b3744975 100644 --- a/modelscope/metrics/image_color_enhance_metric.py +++ b/modelscope/metrics/image_color_enhance_metric.py @@ -6,8 +6,8 @@ from typing import Dict import cv2 import numpy as np -from ..metainfo import Metrics -from ..utils.registry import default_group +from modelscope.metainfo import Metrics +from modelscope.utils.registry import default_group from .base import Metric from .builder import METRICS, MetricKeys diff --git a/modelscope/models/audio/aec/network/se_net.py b/modelscope/models/audio/aec/network/se_net.py index 54808043..837cad3c 100644 --- a/modelscope/models/audio/aec/network/se_net.py +++ b/modelscope/models/audio/aec/network/se_net.py @@ -2,10 +2,12 @@ import torch import torch.nn as nn import torch.nn.functional as F -from ..layers.activations import RectifiedLinear, Sigmoid -from ..layers.affine_transform import AffineTransform -from ..layers.deep_fsmn import DeepFsmn -from ..layers.uni_deep_fsmn import Conv2d, UniDeepFsmn +from modelscope.models.audio.aec.layers.activations import (RectifiedLinear, + Sigmoid) +from modelscope.models.audio.aec.layers.affine_transform import AffineTransform +from modelscope.models.audio.aec.layers.deep_fsmn import DeepFsmn +from modelscope.models.audio.aec.layers.uni_deep_fsmn import (Conv2d, + UniDeepFsmn) class MaskNet(nn.Module): diff --git a/modelscope/models/base/base_head.py b/modelscope/models/base/base_head.py index eb977f5c..07a68253 100644 --- a/modelscope/models/base/base_head.py +++ b/modelscope/models/base/base_head.py @@ -1,12 +1,10 @@ # Copyright (c) Alibaba, Inc. and its affiliates. from abc import ABC, abstractmethod -from typing import Dict, List, Union +from typing import Dict, Union -import numpy as np - -from ...utils.config import ConfigDict -from ...utils.logger import get_logger -from .base_model import Model +from modelscope.models.base.base_model import Model +from modelscope.utils.config import ConfigDict +from modelscope.utils.logger import get_logger logger = get_logger() diff --git a/modelscope/models/base/base_torch_head.py b/modelscope/models/base/base_torch_head.py index 5c769f3a..c5a78519 100644 --- a/modelscope/models/base/base_torch_head.py +++ b/modelscope/models/base/base_torch_head.py @@ -1,13 +1,10 @@ # Copyright (c) Alibaba, Inc. and its affiliates. -import os.path -import re -from typing import Dict, Optional, Union +from typing import Dict import torch -from torch import nn -from ...utils.logger import get_logger -from .base_head import Head +from modelscope.models.base.base_head import Head +from modelscope.utils.logger import get_logger logger = get_logger(__name__) diff --git a/modelscope/models/cv/cartoon/facelib/LK/lk.py b/modelscope/models/cv/cartoon/facelib/LK/lk.py index de7c6ced..df05e3f9 100644 --- a/modelscope/models/cv/cartoon/facelib/LK/lk.py +++ b/modelscope/models/cv/cartoon/facelib/LK/lk.py @@ -1,6 +1,6 @@ import numpy as np -from ..config import config as cfg +from modelscope.models.cv.cartoon.facelib.config import config as cfg class GroupTrack(): diff --git a/modelscope/models/multi_modal/ofa/generate/sequence_generator.py b/modelscope/models/multi_modal/ofa/generate/sequence_generator.py index d592f2eb..548271de 100644 --- a/modelscope/models/multi_modal/ofa/generate/sequence_generator.py +++ b/modelscope/models/multi_modal/ofa/generate/sequence_generator.py @@ -12,8 +12,9 @@ import torch import torch.nn as nn from torch import Tensor -from ..generate import search -from .ngram_repeat_block import NGramRepeatBlock +from modelscope.models.multi_modal.ofa.generate import search +from modelscope.models.multi_modal.ofa.generate.ngram_repeat_block import \ + NGramRepeatBlock def _expand_mask(mask: torch.Tensor, diff --git a/modelscope/models/nlp/__init__.py b/modelscope/models/nlp/__init__.py index b36f2708..b43bcaa0 100644 --- a/modelscope/models/nlp/__init__.py +++ b/modelscope/models/nlp/__init__.py @@ -1,5 +1,5 @@ # Copyright (c) Alibaba, Inc. and its affiliates. -from ...utils.error import TENSORFLOW_IMPORT_WARNING +from modelscope.utils.error import TENSORFLOW_IMPORT_WARNING from .backbones import * # noqa F403 from .bert_for_sequence_classification import * # noqa F403 from .heads import * # noqa F403 diff --git a/modelscope/models/nlp/backbones/space/model/unified_transformer.py b/modelscope/models/nlp/backbones/space/model/unified_transformer.py index 7a564ad5..f5df954d 100644 --- a/modelscope/models/nlp/backbones/space/model/unified_transformer.py +++ b/modelscope/models/nlp/backbones/space/model/unified_transformer.py @@ -5,9 +5,11 @@ import torch import torch.nn as nn import torch.nn.functional as F -from ..modules.embedder import Embedder -from ..modules.transformer_block import TransformerBlock -from .model_base import SpaceModelBase +from modelscope.models.nlp.backbones.space.model.model_base import \ + SpaceModelBase +from modelscope.models.nlp.backbones.space.modules.embedder import Embedder +from modelscope.models.nlp.backbones.space.modules.transformer_block import \ + TransformerBlock class UnifiedTransformer(SpaceModelBase): diff --git a/modelscope/models/nlp/space_for_dialog_modeling.py b/modelscope/models/nlp/space_for_dialog_modeling.py index 64eaab37..aea5b1db 100644 --- a/modelscope/models/nlp/space_for_dialog_modeling.py +++ b/modelscope/models/nlp/space_for_dialog_modeling.py @@ -26,7 +26,7 @@ class SpaceForDialogModeling(Model): """ super().__init__(model_dir, *args, **kwargs) - from ...trainers.nlp.space.trainer.gen_trainer import MultiWOZTrainer + from modelscope.trainers.nlp.space.trainer.gen_trainer import MultiWOZTrainer self.model_dir = model_dir self.config = kwargs.pop( 'config', diff --git a/modelscope/pipelines/cv/image_color_enhance_pipeline.py b/modelscope/pipelines/cv/image_color_enhance_pipeline.py index c6de89a4..799af16e 100644 --- a/modelscope/pipelines/cv/image_color_enhance_pipeline.py +++ b/modelscope/pipelines/cv/image_color_enhance_pipeline.py @@ -1,9 +1,6 @@ from typing import Any, Dict, Optional, Union -import cv2 -import numpy as np import torch -from PIL import Image from torchvision import transforms from modelscope.metainfo import Pipelines @@ -11,13 +8,12 @@ from modelscope.models.base import Model from modelscope.models.cv.image_color_enhance.image_color_enhance import \ ImageColorEnhance from modelscope.outputs import OutputKeys -from modelscope.pipelines.base import Input +from modelscope.pipelines.base import Input, Pipeline +from modelscope.pipelines.builder import PIPELINES from modelscope.preprocessors import (ImageColorEnhanceFinetunePreprocessor, - LoadImage, load_image) -from modelscope.utils.constant import ModelFile, Tasks + LoadImage) +from modelscope.utils.constant import Tasks from modelscope.utils.logger import get_logger -from ..base import Pipeline -from ..builder import PIPELINES logger = get_logger() diff --git a/modelscope/pipelines/cv/image_denoise_pipeline.py b/modelscope/pipelines/cv/image_denoise_pipeline.py index 940c7abe..1c78031a 100644 --- a/modelscope/pipelines/cv/image_denoise_pipeline.py +++ b/modelscope/pipelines/cv/image_denoise_pipeline.py @@ -1,21 +1,17 @@ from typing import Any, Dict, Optional, Union -import cv2 -import numpy as np import torch -from PIL import Image from torchvision import transforms from modelscope.metainfo import Pipelines from modelscope.models import Model from modelscope.models.cv import NAFNetForImageDenoise from modelscope.outputs import OutputKeys -from modelscope.pipelines.base import Input +from modelscope.pipelines.base import Input, Pipeline +from modelscope.pipelines.builder import PIPELINES from modelscope.preprocessors import ImageDenoisePreprocessor, LoadImage from modelscope.utils.constant import Tasks from modelscope.utils.logger import get_logger -from ..base import Pipeline -from ..builder import PIPELINES logger = get_logger() diff --git a/modelscope/pipelines/cv/virtual_tryon_pipeline.py b/modelscope/pipelines/cv/virtual_tryon_pipeline.py index c6577c35..813f3135 100644 --- a/modelscope/pipelines/cv/virtual_tryon_pipeline.py +++ b/modelscope/pipelines/cv/virtual_tryon_pipeline.py @@ -13,10 +13,10 @@ from modelscope.hub.snapshot_download import snapshot_download from modelscope.metainfo import Pipelines from modelscope.models.cv.virual_tryon.sdafnet import SDAFNet_Tryon from modelscope.outputs import OutputKeys +from modelscope.pipelines.base import Pipeline +from modelscope.pipelines.builder import PIPELINES from modelscope.preprocessors import load_image from modelscope.utils.constant import ModelFile, Tasks -from ..base import Pipeline -from ..builder import PIPELINES @PIPELINES.register_module( diff --git a/modelscope/pipelines/multi_modal/video_multi_modal_embedding_pipeline.py b/modelscope/pipelines/multi_modal/video_multi_modal_embedding_pipeline.py index 627c5ce6..166d3f06 100644 --- a/modelscope/pipelines/multi_modal/video_multi_modal_embedding_pipeline.py +++ b/modelscope/pipelines/multi_modal/video_multi_modal_embedding_pipeline.py @@ -1,13 +1,10 @@ from typing import Any, Dict -import torch - from modelscope.metainfo import Pipelines -from modelscope.pipelines.base import Input +from modelscope.pipelines.base import Input, Pipeline +from modelscope.pipelines.builder import PIPELINES from modelscope.utils.constant import Tasks from modelscope.utils.logger import get_logger -from ..base import Model, Pipeline -from ..builder import PIPELINES logger = get_logger() diff --git a/modelscope/preprocessors/nlp.py b/modelscope/preprocessors/nlp.py index e92a3e52..cd170fc1 100644 --- a/modelscope/preprocessors/nlp.py +++ b/modelscope/preprocessors/nlp.py @@ -273,7 +273,7 @@ class FillMaskPreprocessor(NLPPreprocessorBase): super().__init__(model_dir, *args, **kwargs) def build_tokenizer(self, model_dir): - from ..utils.hub import get_model_type + from modelscope.utils.hub import get_model_type model_type = get_model_type(model_dir) if model_type in ['sbert', 'structbert', 'bert']: from sofa import SbertTokenizer diff --git a/modelscope/preprocessors/space/dialog_intent_prediction_preprocessor.py b/modelscope/preprocessors/space/dialog_intent_prediction_preprocessor.py index 2ceede02..c7339538 100644 --- a/modelscope/preprocessors/space/dialog_intent_prediction_preprocessor.py +++ b/modelscope/preprocessors/space/dialog_intent_prediction_preprocessor.py @@ -5,13 +5,14 @@ from typing import Any, Dict import json -from ...metainfo import Preprocessors -from ...utils.config import Config -from ...utils.constant import Fields, ModelFile -from ...utils.type_assert import type_assert -from ..base import Preprocessor -from ..builder import PREPROCESSORS -from .fields.intent_field import IntentBPETextField +from modelscope.metainfo import Preprocessors +from modelscope.preprocessors.base import Preprocessor +from modelscope.preprocessors.builder import PREPROCESSORS +from modelscope.preprocessors.space.fields.intent_field import \ + IntentBPETextField +from modelscope.utils.config import Config +from modelscope.utils.constant import Fields, ModelFile +from modelscope.utils.type_assert import type_assert __all__ = ['DialogIntentPredictionPreprocessor'] diff --git a/modelscope/preprocessors/space/dialog_modeling_preprocessor.py b/modelscope/preprocessors/space/dialog_modeling_preprocessor.py index 293334ab..8ed97452 100644 --- a/modelscope/preprocessors/space/dialog_modeling_preprocessor.py +++ b/modelscope/preprocessors/space/dialog_modeling_preprocessor.py @@ -3,13 +3,14 @@ import os from typing import Any, Dict -from ...metainfo import Preprocessors -from ...utils.config import Config -from ...utils.constant import Fields, ModelFile -from ...utils.type_assert import type_assert -from ..base import Preprocessor -from ..builder import PREPROCESSORS -from .fields.gen_field import MultiWOZBPETextField +from modelscope.metainfo import Preprocessors +from modelscope.preprocessors.base import Preprocessor +from modelscope.preprocessors.builder import PREPROCESSORS +from modelscope.preprocessors.space.fields.gen_field import \ + MultiWOZBPETextField +from modelscope.utils.config import Config +from modelscope.utils.constant import Fields, ModelFile +from modelscope.utils.type_assert import type_assert __all__ = ['DialogModelingPreprocessor'] diff --git a/modelscope/preprocessors/space/dialog_state_tracking_preprocessor.py b/modelscope/preprocessors/space/dialog_state_tracking_preprocessor.py index ca629222..80036ed1 100644 --- a/modelscope/preprocessors/space/dialog_state_tracking_preprocessor.py +++ b/modelscope/preprocessors/space/dialog_state_tracking_preprocessor.py @@ -1,13 +1,12 @@ # Copyright (c) Alibaba, Inc. and its affiliates. -import os from typing import Any, Dict +from modelscope.metainfo import Preprocessors +from modelscope.preprocessors.base import Preprocessor +from modelscope.preprocessors.builder import PREPROCESSORS from modelscope.utils.constant import Fields from modelscope.utils.type_assert import type_assert -from ...metainfo import Preprocessors -from ..base import Preprocessor -from ..builder import PREPROCESSORS from .dst_processors import convert_examples_to_features, multiwoz22Processor __all__ = ['DialogStateTrackingPreprocessor'] diff --git a/modelscope/preprocessors/space/fields/gen_field.py b/modelscope/preprocessors/space/fields/gen_field.py index 9b408acc..f924588c 100644 --- a/modelscope/preprocessors/space/fields/gen_field.py +++ b/modelscope/preprocessors/space/fields/gen_field.py @@ -7,11 +7,11 @@ from itertools import chain import numpy as np -from ....utils.logger import get_logger -from ....utils.nlp.space import ontology, utils -from ....utils.nlp.space.db_ops import MultiWozDB -from ....utils.nlp.space.utils import list2np -from ..tokenizer import Tokenizer +from modelscope.preprocessors.space.tokenizer import Tokenizer +from modelscope.utils.logger import get_logger +from modelscope.utils.nlp.space import ontology, utils +from modelscope.utils.nlp.space.db_ops import MultiWozDB +from modelscope.utils.nlp.space.utils import list2np logger = get_logger() diff --git a/modelscope/preprocessors/space/fields/intent_field.py b/modelscope/preprocessors/space/fields/intent_field.py index d7f69eec..4ed7ab6c 100644 --- a/modelscope/preprocessors/space/fields/intent_field.py +++ b/modelscope/preprocessors/space/fields/intent_field.py @@ -13,10 +13,10 @@ import json import numpy as np from tqdm import tqdm -from ....utils.nlp.space import ontology, utils -from ....utils.nlp.space.scores import hierarchical_set_score -from ....utils.nlp.space.utils import list2np -from ..tokenizer import Tokenizer +from modelscope.preprocessors.space.tokenizer import Tokenizer +from modelscope.utils.nlp.space import ontology +from modelscope.utils.nlp.space.scores import hierarchical_set_score +from modelscope.utils.nlp.space.utils import list2np class BPETextField(object): diff --git a/modelscope/trainers/hooks/logger/base.py b/modelscope/trainers/hooks/logger/base.py index 18ef6eaf..0e9ebb1f 100644 --- a/modelscope/trainers/hooks/logger/base.py +++ b/modelscope/trainers/hooks/logger/base.py @@ -7,8 +7,8 @@ import numpy as np import torch from modelscope.trainers.hooks.hook import Hook +from modelscope.trainers.hooks.priority import Priority from modelscope.utils.constant import ModeKeys -from ..priority import Priority class LoggerHook(Hook): diff --git a/modelscope/trainers/hooks/logger/text_logger_hook.py b/modelscope/trainers/hooks/logger/text_logger_hook.py index 7fb4e397..3eefbd0b 100644 --- a/modelscope/trainers/hooks/logger/text_logger_hook.py +++ b/modelscope/trainers/hooks/logger/text_logger_hook.py @@ -8,10 +8,10 @@ import json import torch from torch import distributed as dist +from modelscope.trainers.hooks.builder import HOOKS +from modelscope.trainers.hooks.logger.base import LoggerHook from modelscope.utils.constant import LogKeys, ModeKeys from modelscope.utils.torch_utils import get_dist_info -from ..builder import HOOKS -from .base import LoggerHook @HOOKS.register_module() diff --git a/modelscope/trainers/nlp/sequence_classification_trainer.py b/modelscope/trainers/nlp/sequence_classification_trainer.py index 23d3a3f5..86c8df58 100644 --- a/modelscope/trainers/nlp/sequence_classification_trainer.py +++ b/modelscope/trainers/nlp/sequence_classification_trainer.py @@ -3,9 +3,9 @@ from typing import Dict, Optional, Tuple, Union import numpy as np +from modelscope.trainers.base import BaseTrainer +from modelscope.trainers.builder import TRAINERS from modelscope.utils.logger import get_logger -from ..base import BaseTrainer -from ..builder import TRAINERS PATH = None logger = get_logger(PATH) diff --git a/modelscope/trainers/nlp/space/trainer/gen_trainer.py b/modelscope/trainers/nlp/space/trainer/gen_trainer.py index 876b18a8..aa28d798 100644 --- a/modelscope/trainers/nlp/space/trainer/gen_trainer.py +++ b/modelscope/trainers/nlp/space/trainer/gen_trainer.py @@ -13,8 +13,9 @@ import torch from tqdm import tqdm from transformers.optimization import AdamW, get_linear_schedule_with_warmup -from .....utils.nlp.space import ontology -from ..metrics.metrics_tracker import MetricsTracker +from modelscope.trainers.nlp.space.metrics.metrics_tracker import \ + MetricsTracker +from modelscope.utils.nlp.space import ontology def get_logger(log_path, name='default'): diff --git a/modelscope/trainers/nlp/space/trainer/intent_trainer.py b/modelscope/trainers/nlp/space/trainer/intent_trainer.py index f5ae6e31..1e6f4a2d 100644 --- a/modelscope/trainers/nlp/space/trainer/intent_trainer.py +++ b/modelscope/trainers/nlp/space/trainer/intent_trainer.py @@ -14,7 +14,8 @@ import torch from tqdm import tqdm from transformers.optimization import AdamW, get_linear_schedule_with_warmup -from ..metrics.metrics_tracker import MetricsTracker +from modelscope.trainers.nlp.space.metrics.metrics_tracker import \ + MetricsTracker def get_logger(log_path, name='default'):