[to #43259593]update abs paths typo

Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/9491629

modelscope/hub/api.py

@@ -9,10 +9,11 @@ from typing import List, Optional, Tuple, Union
 
 import requests
 
+from modelscope.msdatasets.config import (DOWNLOADED_DATASETS_PATH,
+                                          HUB_DATASET_ENDPOINT)
+from modelscope.utils.constant import (DEFAULT_DATASET_REVISION,
+                                       DEFAULT_MODEL_REVISION, DownloadMode)
 from modelscope.utils.logger import get_logger
-from ..msdatasets.config import DOWNLOADED_DATASETS_PATH, HUB_DATASET_ENDPOINT
-from ..utils.constant import (DEFAULT_DATASET_REVISION, DEFAULT_MODEL_REVISION,
-                              DownloadMode)
 from .errors import (InvalidParameter, NotExistError, RequestError,
                      datahub_raise_on_error, handle_http_response, is_ok,
                      raise_on_error)

modelscope/hub/file_download.py

@@ -19,8 +19,8 @@ from requests.exceptions import HTTPError
 from tqdm import tqdm
 
 from modelscope import __version__
+from modelscope.utils.constant import DEFAULT_MODEL_REVISION
 from modelscope.utils.logger import get_logger
-from ..utils.constant import DEFAULT_MODEL_REVISION
 from .api import HubApi, ModelScopeConfig
 from .constants import (DEFAULT_MODELSCOPE_GROUP, LOGGER_NAME,
                         MODEL_ID_SEPARATOR)

modelscope/hub/repository.py

@@ -2,8 +2,8 @@ import os
 from typing import Optional
 
 from modelscope.hub.errors import GitError, InvalidParameter
+from modelscope.utils.constant import DEFAULT_MODEL_REVISION
 from modelscope.utils.logger import get_logger
-from ..utils.constant import DEFAULT_MODEL_REVISION
 from .api import ModelScopeConfig
 from .git import GitCommandWrapper
 from .utils.utils import get_endpoint

modelscope/hub/snapshot_download.py

@@ -3,8 +3,8 @@ import tempfile
 from pathlib import Path
 from typing import Dict, Optional, Union
 
+from modelscope.utils.constant import DEFAULT_MODEL_REVISION
 from modelscope.utils.logger import get_logger
-from ..utils.constant import DEFAULT_MODEL_REVISION
 from .api import HubApi, ModelScopeConfig
 from .errors import NotExistError
 from .file_download import (get_file_download_url, http_get_file,

modelscope/metrics/builder.py

@@ -1,9 +1,9 @@
 # Copyright (c) Alibaba, Inc. and its affiliates.
 
-from ..metainfo import Metrics
-from ..utils.config import ConfigDict
-from ..utils.constant import Tasks
-from ..utils.registry import Registry, build_from_cfg, default_group
+from modelscope.metainfo import Metrics
+from modelscope.utils.config import ConfigDict
+from modelscope.utils.constant import Tasks
+from modelscope.utils.registry import Registry, build_from_cfg, default_group
 
 METRICS = Registry('metrics')
 

modelscope/metrics/sequence_classification_metric.py

@@ -2,10 +2,11 @@ from typing import Dict, List, Union
 
 import numpy as np
 
+from modelscope.metainfo import Metrics
 from modelscope.outputs import OutputKeys
-from ..metainfo import Metrics
-from ..utils.registry import default_group
-from ..utils.tensor_utils import torch_nested_detach, torch_nested_numpify
+from modelscope.utils.registry import default_group
+from modelscope.utils.tensor_utils import (torch_nested_detach,
+                                           torch_nested_numpify)
 from .base import Metric
 from .builder import METRICS, MetricKeys
 

modelscope/metrics/text_generation_metric.py

@@ -1,7 +1,7 @@
 from typing import Dict
 
-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
 

modelscope/models/audio/ans/frcrn.py

@@ -6,9 +6,9 @@ import torch.nn as nn
 import torch.nn.functional as F
 
 from modelscope.metainfo import Models
+from modelscope.models.base import Model, Tensor
 from modelscope.models.builder import MODELS
 from modelscope.utils.constant import ModelFile, Tasks
-from ...base import Model, Tensor
 from .conv_stft import ConviSTFT, ConvSTFT
 from .unet import UNet
 

modelscope/models/multi_modal/image_captioning_model.py

@@ -5,9 +5,9 @@ import torch.cuda
 from PIL import Image
 
 from modelscope.metainfo import Models
+from modelscope.models.base import Model
+from modelscope.models.builder import MODELS
 from modelscope.utils.constant import ModelFile, Tasks
-from ..base import Model
-from ..builder import MODELS
 
 __all__ = ['OfaForImageCaptioning']
 

modelscope/models/multi_modal/mplug_for_visual_question_answering.py

@@ -1,9 +1,9 @@
 from typing import Dict
 
-from ...metainfo import Models
-from ...utils.constant import Tasks
-from ..base import Model, Tensor
-from ..builder import MODELS
+from modelscope.metainfo import Models
+from modelscope.models.base import Model, Tensor
+from modelscope.models.builder import MODELS
+from modelscope.utils.constant import Tasks
 
 __all__ = ['MPlugForVisualQuestionAnswering']
 

modelscope/models/multi_modal/ofa_for_image_captioning_model.py

@@ -3,10 +3,10 @@ from typing import Any, Dict
 import torch.cuda
 
 from modelscope.metainfo import Models
+from modelscope.models.base import Model
+from modelscope.models.builder import MODELS
 from modelscope.outputs import OutputKeys
 from modelscope.utils.constant import Tasks
-from ..base import Model
-from ..builder import MODELS
 from .ofa import OFAModel, OFATokenizer
 from .ofa.generate import sequence_generator as sg
 from .ofa.generate.utils import move_to_device

modelscope/models/nlp/backbones/space/model/intent_unified_transformer.py

@@ -4,7 +4,7 @@ import torch
 import torch.nn as nn
 import torch.nn.functional as F
 
-from ......utils.nlp.space.criterions import compute_kl_loss
+from modelscope.utils.nlp.space.criterions import compute_kl_loss
 from .unified_transformer import UnifiedTransformer
 
 

modelscope/models/nlp/backbones/space/model/model_base.py

@@ -4,7 +4,7 @@ import os
 
 import torch.nn as nn
 
-from ......utils.constant import ModelFile
+from modelscope.utils.constant import ModelFile
 
 
 class SpaceModelBase(nn.Module):

modelscope/models/nlp/backbones/structbert/adv_utils.py

@@ -16,7 +16,7 @@
 import torch
 from torch import nn
 
-from .....utils.logger import get_logger
+from modelscope.utils.logger import get_logger
 
 logger = get_logger(__name__)
 

modelscope/models/nlp/backbones/structbert/configuration_sbert.py

@@ -17,7 +17,7 @@
 """ SBERT model configuration, mainly copied from :class:`~transformers.BertConfig` """
 from transformers import PretrainedConfig
 
-from .....utils import logger as logging
+from modelscope.utils import logger as logging
 
 logger = logging.get_logger(__name__)
 

modelscope/models/nlp/backbones/structbert/modeling_sbert.py

@@ -15,11 +15,11 @@ from transformers.modeling_utils import (apply_chunking_to_forward,
                                          find_pruneable_heads_and_indices,
                                          prune_linear_layer)
 
-from .....metainfo import Models
-from .....utils.constant import Fields
-from .....utils.logger import get_logger
-from ....base import TorchModel
-from ....builder import BACKBONES
+from modelscope.metainfo import Models
+from modelscope.models.base import TorchModel
+from modelscope.models.builder import BACKBONES
+from modelscope.utils.constant import Fields
+from modelscope.utils.logger import get_logger
 from .configuration_sbert import SbertConfig
 
 logger = get_logger(__name__)

modelscope/models/nlp/bert_for_sequence_classification.py

@@ -4,10 +4,10 @@ from typing import Any, Dict
 import json
 import numpy as np
 
-from ...metainfo import Models
-from ...utils.constant import Tasks
-from ..base import Model
-from ..builder import MODELS
+from modelscope.metainfo import Models
+from modelscope.models.base import Model
+from modelscope.models.builder import MODELS
+from modelscope.utils.constant import Tasks
 
 __all__ = ['BertForSequenceClassification']
 

modelscope/models/nlp/csanmt_for_translation.py

@@ -7,10 +7,10 @@ import json
 import numpy as np
 import tensorflow as tf
 
-from ...metainfo import Models
-from ...utils.constant import Tasks
-from ..base import Model, Tensor
-from ..builder import MODELS
+from modelscope.metainfo import Models
+from modelscope.models.base import Model, Tensor
+from modelscope.models.builder import MODELS
+from modelscope.utils.constant import Tasks
 
 __all__ = ['CsanmtForTranslation']
 

modelscope/models/nlp/heads/sequence_classification_head.py

@@ -5,11 +5,11 @@ import torch
 import torch.nn.functional as F
 from torch import nn
 
-from ....metainfo import Heads
-from ....outputs import OutputKeys
-from ....utils.constant import Tasks
-from ...base import TorchHead
-from ...builder import HEADS
+from modelscope.metainfo import Heads
+from modelscope.models.base import TorchHead
+from modelscope.models.builder import HEADS
+from modelscope.outputs import OutputKeys
+from modelscope.utils.constant import Tasks
 
 
 @HEADS.register_module(

modelscope/models/nlp/masked_language.py

@@ -2,10 +2,10 @@ from typing import Any, Dict, Optional, Union
 
 import numpy as np
 
-from ...metainfo import Models
-from ...utils.constant import Tasks
-from ..base import Model, Tensor
-from ..builder import MODELS
+from modelscope.metainfo import Models
+from modelscope.models.base import Model, Tensor
+from modelscope.models.builder import MODELS
+from modelscope.utils.constant import Tasks
 
 __all__ = ['BertForMaskedLM', 'StructBertForMaskedLM', 'VecoForMaskedLM']
 

modelscope/models/nlp/nncrf_for_named_entity_recognition.py

@@ -8,10 +8,10 @@ import torch.nn as nn
 from torch.autograd import Variable
 from transformers import AutoConfig, AutoModel
 
-from ...metainfo import Models
-from ...utils.constant import ModelFile, Tasks
-from ..base import Model
-from ..builder import MODELS
+from modelscope.metainfo import Models
+from modelscope.models.base import Model
+from modelscope.models.builder import MODELS
+from modelscope.utils.constant import ModelFile, Tasks
 
 __all__ = ['TransformerCRFForNamedEntityRecognition']
 

modelscope/models/nlp/palm_for_text_generation.py

@@ -1,9 +1,9 @@
 from typing import Dict
 
-from ...metainfo import Models
-from ...utils.constant import Tasks
-from ..base import Tensor, TorchModel
-from ..builder import MODELS
+from modelscope.metainfo import Models
+from modelscope.models.base import Tensor, TorchModel
+from modelscope.models.builder import MODELS
+from modelscope.utils.constant import Tasks
 
 __all__ = ['PalmForTextGeneration']
 

modelscope/models/nlp/sbert_for_nli.py

@@ -1,6 +1,6 @@
-from ...metainfo import Models
-from ...utils.constant import Tasks
-from ..builder import MODELS
+from modelscope.metainfo import Models
+from modelscope.models.builder import MODELS
+from modelscope.utils.constant import Tasks
 from .sbert_for_sequence_classification import \
     SbertForSequenceClassificationBase
 

modelscope/models/nlp/sbert_for_sentence_similarity.py

@@ -1,6 +1,6 @@
-from ...metainfo import Models
-from ...utils.constant import Tasks
-from ..builder import MODELS
+from modelscope.metainfo import Models
+from modelscope.models.builder import MODELS
+from modelscope.utils.constant import Tasks
 from .sbert_for_sequence_classification import \
     SbertForSequenceClassificationBase
 

modelscope/models/nlp/sbert_for_sentiment_classification.py

@@ -1,6 +1,6 @@
-from ...metainfo import Models
-from ...utils.constant import Tasks
-from ..builder import MODELS
+from modelscope.metainfo import Models
+from modelscope.models.builder import MODELS
+from modelscope.utils.constant import Tasks
 from .sbert_for_sequence_classification import \
     SbertForSequenceClassificationBase
 

modelscope/models/nlp/sbert_for_sequence_classification.py

@@ -7,10 +7,7 @@ import torch
 from sofa.models.sbert.modeling_sbert import SbertModel, SbertPreTrainedModel
 from torch import nn
 
-from modelscope.metainfo import Models
-from modelscope.utils.constant import Tasks
-from ..base import Model
-from ..builder import MODELS
+from modelscope.models.base import Model
 
 
 class SbertTextClassfier(SbertPreTrainedModel):

modelscope/models/nlp/sbert_for_token_classification.py

@@ -3,10 +3,10 @@ from typing import Any, Dict, Union
 import numpy as np
 import torch
 
-from ...metainfo import Models
-from ...utils.constant import Tasks
-from ..base import Model, Tensor
-from ..builder import MODELS
+from modelscope.metainfo import Models
+from modelscope.models.base import Model, Tensor
+from modelscope.models.builder import MODELS
+from modelscope.utils.constant import Tasks
 
 __all__ = ['SbertForTokenClassification']
 

modelscope/models/nlp/sbert_for_zero_shot_classification.py

@@ -2,10 +2,10 @@ from typing import Any, Dict
 
 import numpy as np
 
+from modelscope.metainfo import Models
+from modelscope.models.base import Model
+from modelscope.models.builder import MODELS
 from modelscope.utils.constant import Tasks
-from ...metainfo import Models
-from ..base import Model
-from ..builder import MODELS
 
 __all__ = ['SbertForZeroShotClassification']
 

modelscope/models/nlp/sequence_classification.py

@@ -4,10 +4,10 @@ from typing import Any, Dict
 import json
 import numpy as np
 
-from ...metainfo import TaskModels
-from ...outputs import OutputKeys
-from ...utils.constant import Tasks
-from ..builder import MODELS
+from modelscope.metainfo import TaskModels
+from modelscope.models.builder import MODELS
+from modelscope.outputs import OutputKeys
+from modelscope.utils.constant import Tasks
 from .task_model import SingleBackboneTaskModelBase
 
 __all__ = ['SequenceClassificationModel']

modelscope/models/nlp/space_for_dialog_intent_prediction.py

@@ -4,13 +4,13 @@ import os
 from typing import Any, Dict
 
 from modelscope.metainfo import Models
-from modelscope.models.nlp.backbones.space import (SpaceGenerator,
-                                                   SpaceModelBase)
-from ...preprocessors.space.fields.intent_field import IntentBPETextField
-from ...utils.config import Config
-from ...utils.constant import ModelFile, Tasks
-from ..base import Model, Tensor
-from ..builder import MODELS
+from modelscope.models.base import Model, Tensor
+from modelscope.models.builder import MODELS
+from modelscope.preprocessors.space.fields.intent_field import \
+    IntentBPETextField
+from modelscope.utils.config import Config
+from modelscope.utils.constant import ModelFile, Tasks
+from .backbones import SpaceGenerator, SpaceModelBase
 
 __all__ = ['SpaceForDialogIntent']
 

modelscope/models/nlp/space_for_dialog_modeling.py

@@ -3,14 +3,14 @@
 import os
 from typing import Any, Dict, Optional
 
-from modelscope.models.nlp.backbones.space import (SpaceGenerator,
-                                                   SpaceModelBase)
-from ...metainfo import Models
-from ...preprocessors.space.fields.gen_field import MultiWOZBPETextField
-from ...utils.config import Config
-from ...utils.constant import ModelFile, Tasks
-from ..base import Model, Tensor
-from ..builder import MODELS
+from modelscope.metainfo import Models
+from modelscope.models.base import Model, Tensor
+from modelscope.models.builder import MODELS
+from modelscope.preprocessors.space.fields.gen_field import \
+    MultiWOZBPETextField
+from modelscope.utils.config import Config
+from modelscope.utils.constant import ModelFile, Tasks
+from .backbones import SpaceGenerator, SpaceModelBase
 
 __all__ = ['SpaceForDialogModeling']
 

modelscope/models/nlp/space_for_dialog_state_tracking.py

@@ -1,11 +1,11 @@
 import os
 from typing import Any, Dict
 
+from modelscope.metainfo import Models
+from modelscope.models.base import Model, Tensor
+from modelscope.models.builder import MODELS
 from modelscope.utils.constant import Tasks
-from ...metainfo import Models
-from ...utils.nlp.space.utils_dst import batch_to_device
-from ..base import Model, Tensor
-from ..builder import MODELS
+from modelscope.utils.nlp.space.utils_dst import batch_to_device
 
 __all__ = ['SpaceForDialogStateTracking']
 

modelscope/models/nlp/task_model.py

@@ -7,12 +7,12 @@ from typing import Any, Dict
 import torch
 from torch import nn
 
-from ...utils.config import ConfigDict
-from ...utils.constant import Fields, Tasks
-from ...utils.logger import get_logger
-from ...utils.utils import if_func_recieve_dict_inputs
-from ..base import TorchModel
-from ..builder import build_backbone, build_head
+from modelscope.models.base import TorchModel
+from modelscope.models.builder import build_backbone, build_head
+from modelscope.utils.config import ConfigDict
+from modelscope.utils.constant import Fields, Tasks
+from modelscope.utils.logger import get_logger
+from modelscope.utils.utils import if_func_receive_dict_inputs
 
 logger = get_logger(__name__)
 
@@ -424,7 +424,7 @@ class SingleBackboneTaskModelBase(BaseTaskModel):
 
     def forward(self, input: Dict[str, Any]) -> Dict[str, Any]:
         """default forward method is the backbone-only forward"""
-        if if_func_recieve_dict_inputs(self.backbone.forward, input):
+        if if_func_receive_dict_inputs(self.backbone.forward, input):
             outputs = self.backbone.forward(input)
         else:
             outputs = self.backbone.forward(**input)
@@ -472,13 +472,13 @@ class EncoderDecoderTaskModelBase(BaseTaskModel):
         return getattr(self, self._decoder_prefix)
 
     def forward(self, input: Dict[str, Any]) -> Dict[str, Any]:
-        if if_func_recieve_dict_inputs(self.encoder_.forward, input):
+        if if_func_receive_dict_inputs(self.encoder_.forward, input):
             encoder_outputs = self.encoder_.forward(input)
         else:
             encoder_outputs = self.encoder_.forward(**input)
         decoder_inputs = self.project_decoder_inputs_and_mediate(
             input, encoder_outputs)
-        if if_func_recieve_dict_inputs(self.decoder_.forward, input):
+        if if_func_receive_dict_inputs(self.decoder_.forward, input):
             outputs = self.decoder_.forward(decoder_inputs)
         else:
             outputs = self.decoder_.forward(**decoder_inputs)

modelscope/pipelines/audio/ans_pipeline.py

@@ -8,10 +8,10 @@ import torch
 
 from modelscope.metainfo import Pipelines
 from modelscope.outputs import OutputKeys
+from modelscope.pipelines.base import Input, Pipeline
+from modelscope.pipelines.builder import PIPELINES
 from modelscope.utils.constant import Tasks
 from modelscope.utils.torch_utils import create_device
-from ..base import Input, Pipeline
-from ..builder import PIPELINES
 
 
 def audio_norm(x):

modelscope/pipelines/audio/linear_aec_pipeline.py

@@ -10,11 +10,11 @@ import yaml
 from modelscope.fileio import File
 from modelscope.metainfo import Pipelines
 from modelscope.outputs import OutputKeys
+from modelscope.pipelines.base import Pipeline
+from modelscope.pipelines.builder import PIPELINES
 from modelscope.preprocessors.audio import LinearAECAndFbank
 from modelscope.utils.constant import ModelFile, Tasks
 from modelscope.utils.logger import get_logger
-from ..base import Pipeline
-from ..builder import PIPELINES
 
 logger = get_logger()
 

modelscope/pipelines/cv/action_recognition_pipeline.py

@@ -7,13 +7,12 @@ import torch
 from modelscope.metainfo import Pipelines
 from modelscope.models.cv.action_recognition.models import BaseVideoModel
 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.video import ReadVideoData
 from modelscope.utils.config import Config
 from modelscope.utils.constant import ModelFile, Tasks
 from modelscope.utils.logger import get_logger
-from ..base import Pipeline
-from ..builder import PIPELINES
 
 logger = get_logger()
 

modelscope/pipelines/cv/animal_recog_pipeline.py

@@ -11,12 +11,11 @@ from modelscope.hub.snapshot_download import snapshot_download
 from modelscope.metainfo import Pipelines
 from modelscope.models.cv.animal_recognition import resnet
 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 load_image
 from modelscope.utils.constant import Tasks
 from modelscope.utils.logger import get_logger
-from ..base import Pipeline
-from ..builder import PIPELINES
 
 logger = get_logger()
 

modelscope/pipelines/cv/cmdssl_video_embedding_pipleline.py

@@ -10,12 +10,11 @@ from modelscope.metainfo import Pipelines
 from modelscope.models.cv.cmdssl_video_embedding.resnet2p1d import \
     resnet26_2p1d
 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.utils.config import Config
 from modelscope.utils.constant import ModelFile, Tasks
 from modelscope.utils.logger import get_logger
-from ..base import Pipeline
-from ..builder import PIPELINES
 
 logger = get_logger()
 

modelscope/pipelines/cv/face_image_generation_pipeline.py

@@ -9,12 +9,11 @@ import torch
 from modelscope.metainfo import Pipelines
 from modelscope.models.cv.face_generation import stylegan2
 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 load_image
 from modelscope.utils.constant import ModelFile, Tasks
 from modelscope.utils.logger import get_logger
-from ..base import Pipeline
-from ..builder import PIPELINES
 
 logger = get_logger()
 

modelscope/pipelines/cv/image_cartoon_pipeline.py

@@ -12,12 +12,11 @@ from modelscope.models.cv.cartoon.mtcnn_pytorch.src.align_trans import (
     get_reference_facial_points, warp_and_crop_face)
 from modelscope.models.cv.cartoon.utils import get_f5p, padTo16x, resize_size
 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 load_image
 from modelscope.utils.constant import Tasks
 from modelscope.utils.logger import get_logger
-from ..base import Pipeline
-from ..builder import PIPELINES
 
 if tf.__version__ >= '2.0':
     tf = tf.compat.v1

modelscope/pipelines/cv/image_colorization_pipeline.py

@@ -10,12 +10,11 @@ from modelscope.metainfo import Pipelines
 from modelscope.models.cv.image_colorization import unet
 from modelscope.models.cv.image_colorization.utils import NormType
 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 load_image
 from modelscope.utils.constant import ModelFile, Tasks
 from modelscope.utils.logger import get_logger
-from ..base import Pipeline
-from ..builder import PIPELINES
 
 logger = get_logger()
 

modelscope/pipelines/cv/image_matting_pipeline.py

@@ -7,12 +7,11 @@ import PIL
 
 from modelscope.metainfo import Pipelines
 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 load_image
 from modelscope.utils.constant import ModelFile, Tasks
 from modelscope.utils.logger import get_logger
-from ..base import Pipeline
-from ..builder import PIPELINES
 
 logger = get_logger()
 

modelscope/pipelines/cv/image_super_resolution_pipeline.py

@@ -8,12 +8,11 @@ import torch
 from modelscope.metainfo import Pipelines
 from modelscope.models.cv.super_resolution import rrdbnet_arch
 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 load_image
 from modelscope.utils.constant import ModelFile, Tasks
 from modelscope.utils.logger import get_logger
-from ..base import Pipeline
-from ..builder import PIPELINES
 
 logger = get_logger()
 

modelscope/pipelines/cv/ocr_detection_pipeline.py

@@ -8,12 +8,11 @@ import tensorflow as tf
 
 from modelscope.metainfo import Pipelines
 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 load_image
 from modelscope.utils.constant import ModelFile, Tasks
 from modelscope.utils.logger import get_logger
-from ..base import Pipeline
-from ..builder import PIPELINES
 from .ocr_utils import model_resnet_mutex_v4_linewithchar, ops, utils
 
 if tf.__version__ >= '2.0':

modelscope/pipelines/multi_modal/image_captioning_pipeline.py

@@ -1,11 +1,11 @@
-from typing import Any, Dict, Union
+from typing import Any, Dict, Optional, Union
 
 from modelscope.metainfo import Pipelines
+from modelscope.pipelines.base import Model, Pipeline
+from modelscope.pipelines.builder import PIPELINES
 from modelscope.preprocessors import OfaImageCaptionPreprocessor, Preprocessor
 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()
 
@@ -16,7 +16,7 @@ class ImageCaptionPipeline(Pipeline):
 
     def __init__(self,
                  model: Union[Model, str],
-                 preprocessor: [Preprocessor] = None,
+                 preprocessor: Optional[Preprocessor] = None,
                  **kwargs):
         """
         use `model` and `preprocessor` to create a kws pipeline for prediction

modelscope/pipelines/multi_modal/multi_modal_embedding_pipeline.py

@@ -1,11 +1,10 @@
 from typing import Any, Dict
 
 from modelscope.metainfo import Pipelines
-from modelscope.pipelines.base import Input
+from modelscope.pipelines.base import Input, Model, 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()
 

modelscope/pipelines/multi_modal/text_to_image_synthesis_pipeline.py

@@ -4,11 +4,10 @@ import torch
 
 from modelscope.metainfo import Pipelines
 from modelscope.outputs import OutputKeys
-from modelscope.pipelines.base import Input
+from modelscope.pipelines.base import Input, Model, 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()
 

modelscope/pipelines/multi_modal/visual_question_answering_pipeline.py

@@ -2,13 +2,13 @@ from typing import Any, Dict, Optional, Union
 
 import torch
 
-from ...metainfo import Pipelines
-from ...models import Model
-from ...models.multi_modal import MPlugForVisualQuestionAnswering
-from ...preprocessors import MPlugVisualQuestionAnsweringPreprocessor
-from ...utils.constant import Tasks
-from ..base import Pipeline, Tensor
-from ..builder import PIPELINES
+from modelscope.metainfo import Pipelines
+from modelscope.models import Model
+from modelscope.models.multi_modal import MPlugForVisualQuestionAnswering
+from modelscope.pipelines.base import Pipeline, Tensor
+from modelscope.pipelines.builder import PIPELINES
+from modelscope.preprocessors import MPlugVisualQuestionAnsweringPreprocessor
+from modelscope.utils.constant import Tasks
 
 __all__ = ['VisualQuestionAnsweringPipeline']
 

modelscope/pipelines/nlp/dialog_intent_prediction_pipeline.py

@@ -2,14 +2,14 @@
 
 from typing import Any, Dict, Union
 
-from ...metainfo import Pipelines
-from ...models import Model
-from ...models.nlp import SpaceForDialogIntent
-from ...outputs import OutputKeys
-from ...preprocessors import DialogIntentPredictionPreprocessor
-from ...utils.constant import Tasks
-from ..base import Pipeline
-from ..builder import PIPELINES
+from modelscope.metainfo import Pipelines
+from modelscope.models import Model
+from modelscope.models.nlp import SpaceForDialogIntent
+from modelscope.outputs import OutputKeys
+from modelscope.pipelines.base import Pipeline
+from modelscope.pipelines.builder import PIPELINES
+from modelscope.preprocessors import DialogIntentPredictionPreprocessor
+from modelscope.utils.constant import Tasks
 
 __all__ = ['DialogIntentPredictionPipeline']
 

modelscope/pipelines/nlp/dialog_modeling_pipeline.py

@@ -2,14 +2,14 @@
 
 from typing import Dict, Union
 
-from ...metainfo import Pipelines
-from ...models import Model
-from ...models.nlp import SpaceForDialogModeling
-from ...outputs import OutputKeys
-from ...preprocessors import DialogModelingPreprocessor
-from ...utils.constant import Tasks
-from ..base import Pipeline, Tensor
-from ..builder import PIPELINES
+from modelscope.metainfo import Pipelines
+from modelscope.models import Model
+from modelscope.models.nlp import SpaceForDialogModeling
+from modelscope.outputs import OutputKeys
+from modelscope.pipelines.base import Pipeline, Tensor
+from modelscope.pipelines.builder import PIPELINES
+from modelscope.preprocessors import DialogModelingPreprocessor
+from modelscope.utils.constant import Tasks
 
 __all__ = ['DialogModelingPipeline']
 

modelscope/pipelines/nlp/dialog_state_tracking_pipeline.py

@@ -1,12 +1,12 @@
 from typing import Any, Dict, Union
 
-from ...metainfo import Pipelines
-from ...models import Model, SpaceForDialogStateTracking
-from ...outputs import OutputKeys
-from ...preprocessors import DialogStateTrackingPreprocessor
-from ...utils.constant import Tasks
-from ..base import Pipeline
-from ..builder import PIPELINES
+from modelscope.metainfo import Pipelines
+from modelscope.models import Model, SpaceForDialogStateTracking
+from modelscope.outputs import OutputKeys
+from modelscope.pipelines.base import Pipeline
+from modelscope.pipelines.builder import PIPELINES
+from modelscope.preprocessors import DialogStateTrackingPreprocessor
+from modelscope.utils.constant import Tasks
 
 __all__ = ['DialogStateTrackingPipeline']
 

modelscope/pipelines/nlp/fill_mask_pipeline.py

@@ -3,15 +3,15 @@ from typing import Any, Dict, Optional, Union
 
 import torch
 
+from modelscope.metainfo import Pipelines
+from modelscope.models import Model
+from modelscope.models.nlp.masked_language import MaskedLanguageModelBase
 from modelscope.outputs import OutputKeys
-from ...metainfo import Pipelines
-from ...models import Model
-from ...models.nlp.masked_language import MaskedLanguageModelBase
-from ...preprocessors import FillMaskPreprocessor
-from ...utils.config import Config
-from ...utils.constant import ModelFile, Tasks
-from ..base import Pipeline, Tensor
-from ..builder import PIPELINES
+from modelscope.pipelines.base import Pipeline, Tensor
+from modelscope.pipelines.builder import PIPELINES
+from modelscope.preprocessors import FillMaskPreprocessor
+from modelscope.utils.config import Config
+from modelscope.utils.constant import ModelFile, Tasks
 
 __all__ = ['FillMaskPipeline']
 _type_map = {'veco': 'roberta', 'sbert': 'bert'}

modelscope/pipelines/nlp/named_entity_recognition_pipeline.py

@@ -2,14 +2,14 @@ from typing import Any, Dict, Optional, Union
 
 import torch
 
-from ...metainfo import Pipelines
-from ...models import Model
-from ...models.nlp import TransformerCRFForNamedEntityRecognition
-from ...outputs import OutputKeys
-from ...preprocessors import NERPreprocessor
-from ...utils.constant import Tasks
-from ..base import Pipeline, Tensor
-from ..builder import PIPELINES
+from modelscope.metainfo import Pipelines
+from modelscope.models import Model
+from modelscope.models.nlp import TransformerCRFForNamedEntityRecognition
+from modelscope.outputs import OutputKeys
+from modelscope.pipelines.base import Pipeline, Tensor
+from modelscope.pipelines.builder import PIPELINES
+from modelscope.preprocessors import NERPreprocessor
+from modelscope.utils.constant import Tasks
 
 __all__ = ['NamedEntityRecognitionPipeline']
 

modelscope/pipelines/nlp/nli_pipeline.py

@@ -4,14 +4,14 @@ from typing import Any, Dict, Union
 import numpy as np
 import torch
 
+from modelscope.metainfo import Pipelines
+from modelscope.models import Model
+from modelscope.models.nlp import SbertForNLI
 from modelscope.outputs import OutputKeys
-from ...metainfo import Pipelines
-from ...models import Model
-from ...models.nlp import SbertForNLI
-from ...preprocessors import NLIPreprocessor
-from ...utils.constant import Tasks
-from ..base import Pipeline
-from ..builder import PIPELINES
+from modelscope.pipelines.base import Pipeline
+from modelscope.pipelines.builder import PIPELINES
+from modelscope.preprocessors import NLIPreprocessor
+from modelscope.utils.constant import Tasks
 
 __all__ = ['NLIPipeline']
 

modelscope/pipelines/nlp/sentence_similarity_pipeline.py

@@ -3,14 +3,14 @@ from typing import Any, Dict, Union
 import numpy as np
 import torch
 
+from modelscope.metainfo import Pipelines
+from modelscope.models import Model
+from modelscope.models.nlp import SbertForSentenceSimilarity
 from modelscope.outputs import OutputKeys
-from ...metainfo import Pipelines
-from ...models import Model
-from ...models.nlp import SbertForSentenceSimilarity
-from ...preprocessors import SentenceSimilarityPreprocessor
-from ...utils.constant import Tasks
-from ..base import Input, Pipeline
-from ..builder import PIPELINES
+from modelscope.pipelines.base import Input, Pipeline
+from modelscope.pipelines.builder import PIPELINES
+from modelscope.preprocessors import SentenceSimilarityPreprocessor
+from modelscope.utils.constant import Tasks
 
 __all__ = ['SentenceSimilarityPipeline']
 

modelscope/pipelines/nlp/sentiment_classification_pipeline.py

@@ -3,14 +3,14 @@ from typing import Any, Dict, Union
 import numpy as np
 import torch
 
+from modelscope.metainfo import Pipelines
+from modelscope.models import Model
+from modelscope.models.nlp import SequenceClassificationModel
 from modelscope.outputs import OutputKeys
-from ...metainfo import Pipelines
-from ...models import Model
-from ...models.nlp import SequenceClassificationModel
-from ...preprocessors import SentimentClassificationPreprocessor
-from ...utils.constant import Tasks
-from ..base import Pipeline
-from ..builder import PIPELINES
+from modelscope.pipelines.base import Pipeline
+from modelscope.pipelines.builder import PIPELINES
+from modelscope.preprocessors import SentimentClassificationPreprocessor
+from modelscope.utils.constant import Tasks
 
 __all__ = ['SentimentClassificationPipeline']
 

modelscope/pipelines/nlp/sequence_classification_pipeline.py

@@ -3,13 +3,13 @@ from typing import Any, Dict, Union
 import numpy as np
 
 from modelscope.metainfo import Pipelines
+from modelscope.models import Model
 from modelscope.models.nlp import BertForSequenceClassification
 from modelscope.outputs import OutputKeys
+from modelscope.pipelines.base import Input, Pipeline
+from modelscope.pipelines.builder import PIPELINES
 from modelscope.preprocessors import SequenceClassificationPreprocessor
 from modelscope.utils.constant import Tasks
-from ...models import Model
-from ..base import Input, Pipeline
-from ..builder import PIPELINES
 
 __all__ = ['SequenceClassificationPipeline']
 

modelscope/pipelines/nlp/text_generation_pipeline.py

@@ -2,14 +2,14 @@ from typing import Any, Dict, Optional, Union
 
 import torch
 
+from modelscope.metainfo import Pipelines
+from modelscope.models import Model
+from modelscope.models.nlp import PalmForTextGeneration
 from modelscope.outputs import OutputKeys
-from ...metainfo import Pipelines
-from ...models import Model
-from ...models.nlp import PalmForTextGeneration
-from ...preprocessors import TextGenerationPreprocessor
-from ...utils.constant import Tasks
-from ..base import Pipeline, Tensor
-from ..builder import PIPELINES
+from modelscope.pipelines.base import Pipeline, Tensor
+from modelscope.pipelines.builder import PIPELINES
+from modelscope.preprocessors import TextGenerationPreprocessor
+from modelscope.utils.constant import Tasks
 
 __all__ = ['TextGenerationPipeline']
 

modelscope/pipelines/nlp/translation_pipeline.py

@@ -4,14 +4,14 @@ from typing import Any, Dict
 import numpy as np
 import tensorflow as tf
 
+from modelscope.hub.snapshot_download import snapshot_download
+from modelscope.metainfo import Pipelines
+from modelscope.models.nlp import CsanmtForTranslation
 from modelscope.outputs import OutputKeys
-from ...hub.snapshot_download import snapshot_download
-from ...metainfo import Pipelines
-from ...models.nlp import CsanmtForTranslation
-from ...utils.constant import ModelFile, Tasks
-from ...utils.logger import get_logger
-from ..base import Pipeline, Tensor
-from ..builder import PIPELINES
+from modelscope.pipelines.base import Pipeline, Tensor
+from modelscope.pipelines.builder import PIPELINES
+from modelscope.utils.constant import ModelFile, Tasks
+from modelscope.utils.logger import get_logger
 
 if tf.__version__ >= '2.0':
     tf = tf.compat.v1

modelscope/pipelines/nlp/word_segmentation_pipeline.py

@@ -2,14 +2,14 @@ from typing import Any, Dict, Optional, Union
 
 import torch
 
+from modelscope.metainfo import Pipelines
+from modelscope.models import Model
+from modelscope.models.nlp import SbertForTokenClassification
 from modelscope.outputs import OutputKeys
-from ...metainfo import Pipelines
-from ...models import Model
-from ...models.nlp import SbertForTokenClassification
-from ...preprocessors import TokenClassificationPreprocessor
-from ...utils.constant import Tasks
-from ..base import Pipeline, Tensor
-from ..builder import PIPELINES
+from modelscope.pipelines.base import Pipeline, Tensor
+from modelscope.pipelines.builder import PIPELINES
+from modelscope.preprocessors import TokenClassificationPreprocessor
+from modelscope.utils.constant import Tasks
 
 __all__ = ['WordSegmentationPipeline']
 

modelscope/pipelines/nlp/zero_shot_classification_pipeline.py

@@ -3,14 +3,14 @@ from typing import Any, Dict, Union
 import torch
 from scipy.special import softmax
 
+from modelscope.metainfo import Pipelines
+from modelscope.models import Model
+from modelscope.models.nlp import SbertForZeroShotClassification
 from modelscope.outputs import OutputKeys
-from ...metainfo import Pipelines
-from ...models import Model
-from ...models.nlp import SbertForZeroShotClassification
-from ...preprocessors import ZeroShotClassificationPreprocessor
-from ...utils.constant import Tasks
-from ..base import Pipeline
-from ..builder import PIPELINES
+from modelscope.pipelines.base import Pipeline
+from modelscope.pipelines.builder import PIPELINES
+from modelscope.preprocessors import ZeroShotClassificationPreprocessor
+from modelscope.utils.constant import Tasks
 
 __all__ = ['ZeroShotClassificationPipeline']
 

modelscope/preprocessors/nlp.py

@@ -5,11 +5,11 @@ from typing import Any, Dict, Union
 
 from transformers import AutoTokenizer
 
-from ..metainfo import Preprocessors
-from ..models import Model
-from ..utils.constant import Fields, InputFields, ModeKeys
-from ..utils.hub import parse_label_mapping
-from ..utils.type_assert import type_assert
+from modelscope.metainfo import Preprocessors
+from modelscope.models import Model
+from modelscope.utils.constant import Fields, InputFields, ModeKeys
+from modelscope.utils.hub import parse_label_mapping
+from modelscope.utils.type_assert import type_assert
 from .base import Preprocessor
 from .builder import PREPROCESSORS
 

modelscope/trainers/trainer.py

@@ -33,7 +33,7 @@ from modelscope.utils.logger import get_logger
 from modelscope.utils.registry import build_from_cfg
 from modelscope.utils.tensor_utils import torch_default_data_collator
 from modelscope.utils.torch_utils import create_device, get_dist_info
-from modelscope.utils.utils import if_func_recieve_dict_inputs
+from modelscope.utils.utils import if_func_receive_dict_inputs
 from .base import BaseTrainer
 from .builder import TRAINERS
 from .default_config import DEFAULT_CONFIG
@@ -377,9 +377,8 @@ class EpochBasedTrainer(BaseTrainer):
         model.train()
         self._mode = ModeKeys.TRAIN
         inputs = self.collate_fn(inputs)
-
         # call model forward but not __call__ to skip postprocess
-        if isinstance(inputs, Mapping) and not if_func_recieve_dict_inputs(
+        if isinstance(inputs, Mapping) and not if_func_receive_dict_inputs(
                 model.forward, inputs):
             train_outputs = model.forward(**inputs)
         else:

modelscope/trainers/utils/inference.py

@@ -13,7 +13,7 @@ from tqdm import tqdm
 
 from modelscope.models.base import Model
 from modelscope.utils.torch_utils import get_dist_info
-from modelscope.utils.utils import if_func_recieve_dict_inputs
+from modelscope.utils.utils import if_func_receive_dict_inputs
 
 
 def single_gpu_test(model,
@@ -39,7 +39,7 @@ def single_gpu_test(model,
                 data = data_collate_fn(data)
             with torch.no_grad():
                 if isinstance(data,
-                              Mapping) and not if_func_recieve_dict_inputs(
+                              Mapping) and not if_func_receive_dict_inputs(
                                   model.forward, data):
 
                     result = model(**data)
@@ -93,7 +93,7 @@ def multi_gpu_test(model,
                 data = data_collate_fn(data)
             with torch.no_grad():
                 if isinstance(data,
-                              Mapping) and not if_func_recieve_dict_inputs(
+                              Mapping) and not if_func_receive_dict_inputs(
                                   model.forward, data):
                     result = model(**data)
                 else:

modelscope/utils/tensor_utils.py

@@ -67,7 +67,7 @@ def torch_default_data_collator(features):
                 elif isinstance(v, list):
                     batch[k] = torch.stack([d for f in features for d in f[k]])
                 else:
-                    batch[k] = torch.tensor([f[k] for f in features])
+                    batch[k] = torch.tensor(np.array([f[k] for f in features]))
     elif isinstance(first, tuple):
         batch = []
         for idx in range(len(first)):

modelscope/utils/utils.py

@@ -3,7 +3,7 @@
 import inspect
 
 
-def if_func_recieve_dict_inputs(func, inputs):
+def if_func_receive_dict_inputs(func, inputs):
     """to decide if a func could recieve dict inputs or not
 
     Args: