From 016d22d8fb46ccbee4a9c9501e448880ed36d71f Mon Sep 17 00:00:00 2001 From: "zhangzhicheng.zzc" Date: Mon, 25 Jul 2022 13:29:26 +0800 Subject: [PATCH] [to #43259593]update abs paths typo Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/9491629 --- modelscope/hub/api.py | 7 ++++--- modelscope/hub/file_download.py | 2 +- modelscope/hub/repository.py | 2 +- modelscope/hub/snapshot_download.py | 2 +- modelscope/metrics/builder.py | 8 ++++---- .../metrics/sequence_classification_metric.py | 7 ++++--- modelscope/metrics/text_generation_metric.py | 4 ++-- modelscope/models/audio/ans/frcrn.py | 2 +- .../multi_modal/image_captioning_model.py | 4 ++-- .../mplug_for_visual_question_answering.py | 8 ++++---- .../ofa_for_image_captioning_model.py | 4 ++-- .../space/model/intent_unified_transformer.py | 2 +- .../nlp/backbones/space/model/model_base.py | 2 +- .../nlp/backbones/structbert/adv_utils.py | 2 +- .../structbert/configuration_sbert.py | 2 +- .../nlp/backbones/structbert/modeling_sbert.py | 10 +++++----- .../nlp/bert_for_sequence_classification.py | 8 ++++---- .../models/nlp/csanmt_for_translation.py | 8 ++++---- .../nlp/heads/sequence_classification_head.py | 10 +++++----- modelscope/models/nlp/masked_language.py | 8 ++++---- .../nlp/nncrf_for_named_entity_recognition.py | 8 ++++---- .../models/nlp/palm_for_text_generation.py | 8 ++++---- modelscope/models/nlp/sbert_for_nli.py | 6 +++--- .../nlp/sbert_for_sentence_similarity.py | 6 +++--- .../nlp/sbert_for_sentiment_classification.py | 6 +++--- .../nlp/sbert_for_sequence_classification.py | 5 +---- .../nlp/sbert_for_token_classification.py | 8 ++++---- .../nlp/sbert_for_zero_shot_classification.py | 6 +++--- .../models/nlp/sequence_classification.py | 8 ++++---- .../nlp/space_for_dialog_intent_prediction.py | 14 +++++++------- .../models/nlp/space_for_dialog_modeling.py | 16 ++++++++-------- .../nlp/space_for_dialog_state_tracking.py | 8 ++++---- modelscope/models/nlp/task_model.py | 18 +++++++++--------- modelscope/pipelines/audio/ans_pipeline.py | 4 ++-- .../pipelines/audio/linear_aec_pipeline.py | 4 ++-- .../cv/action_recognition_pipeline.py | 5 ++--- .../pipelines/cv/animal_recog_pipeline.py | 5 ++--- .../cv/cmdssl_video_embedding_pipleline.py | 5 ++--- .../cv/face_image_generation_pipeline.py | 5 ++--- .../pipelines/cv/image_cartoon_pipeline.py | 5 ++--- .../cv/image_colorization_pipeline.py | 5 ++--- .../pipelines/cv/image_matting_pipeline.py | 5 ++--- .../cv/image_super_resolution_pipeline.py | 5 ++--- .../pipelines/cv/ocr_detection_pipeline.py | 5 ++--- .../multi_modal/image_captioning_pipeline.py | 8 ++++---- .../multi_modal_embedding_pipeline.py | 5 ++--- .../text_to_image_synthesis_pipeline.py | 5 ++--- .../visual_question_answering_pipeline.py | 14 +++++++------- .../nlp/dialog_intent_prediction_pipeline.py | 16 ++++++++-------- .../pipelines/nlp/dialog_modeling_pipeline.py | 16 ++++++++-------- .../nlp/dialog_state_tracking_pipeline.py | 14 +++++++------- modelscope/pipelines/nlp/fill_mask_pipeline.py | 16 ++++++++-------- .../nlp/named_entity_recognition_pipeline.py | 16 ++++++++-------- modelscope/pipelines/nlp/nli_pipeline.py | 14 +++++++------- .../nlp/sentence_similarity_pipeline.py | 14 +++++++------- .../nlp/sentiment_classification_pipeline.py | 14 +++++++------- .../nlp/sequence_classification_pipeline.py | 6 +++--- .../pipelines/nlp/text_generation_pipeline.py | 14 +++++++------- .../pipelines/nlp/translation_pipeline.py | 14 +++++++------- .../nlp/word_segmentation_pipeline.py | 14 +++++++------- .../nlp/zero_shot_classification_pipeline.py | 14 +++++++------- modelscope/preprocessors/nlp.py | 10 +++++----- modelscope/trainers/trainer.py | 5 ++--- modelscope/trainers/utils/inference.py | 6 +++--- modelscope/utils/tensor_utils.py | 2 +- modelscope/utils/utils.py | 2 +- 66 files changed, 249 insertions(+), 262 deletions(-) diff --git a/modelscope/hub/api.py b/modelscope/hub/api.py index 016b8ae3..1998858c 100644 --- a/modelscope/hub/api.py +++ b/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) diff --git a/modelscope/hub/file_download.py b/modelscope/hub/file_download.py index d294ed9a..8f0f8e1a 100644 --- a/modelscope/hub/file_download.py +++ b/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) diff --git a/modelscope/hub/repository.py b/modelscope/hub/repository.py index ee2b8da3..65cb6bf0 100644 --- a/modelscope/hub/repository.py +++ b/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 diff --git a/modelscope/hub/snapshot_download.py b/modelscope/hub/snapshot_download.py index 56ee0917..99c4ff5d 100644 --- a/modelscope/hub/snapshot_download.py +++ b/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, diff --git a/modelscope/metrics/builder.py b/modelscope/metrics/builder.py index 1738b464..2d60f9b9 100644 --- a/modelscope/metrics/builder.py +++ b/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') diff --git a/modelscope/metrics/sequence_classification_metric.py b/modelscope/metrics/sequence_classification_metric.py index e41c7851..f9b246c3 100644 --- a/modelscope/metrics/sequence_classification_metric.py +++ b/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 diff --git a/modelscope/metrics/text_generation_metric.py b/modelscope/metrics/text_generation_metric.py index 3e5c1f93..6390d33b 100644 --- a/modelscope/metrics/text_generation_metric.py +++ b/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 diff --git a/modelscope/models/audio/ans/frcrn.py b/modelscope/models/audio/ans/frcrn.py index 5ca0d736..0ed18d6a 100644 --- a/modelscope/models/audio/ans/frcrn.py +++ b/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 diff --git a/modelscope/models/multi_modal/image_captioning_model.py b/modelscope/models/multi_modal/image_captioning_model.py index a0d0ce17..3e638a05 100644 --- a/modelscope/models/multi_modal/image_captioning_model.py +++ b/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'] diff --git a/modelscope/models/multi_modal/mplug_for_visual_question_answering.py b/modelscope/models/multi_modal/mplug_for_visual_question_answering.py index 2682c048..0f69cc2d 100644 --- a/modelscope/models/multi_modal/mplug_for_visual_question_answering.py +++ b/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'] diff --git a/modelscope/models/multi_modal/ofa_for_image_captioning_model.py b/modelscope/models/multi_modal/ofa_for_image_captioning_model.py index d560852c..5d646143 100644 --- a/modelscope/models/multi_modal/ofa_for_image_captioning_model.py +++ b/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 diff --git a/modelscope/models/nlp/backbones/space/model/intent_unified_transformer.py b/modelscope/models/nlp/backbones/space/model/intent_unified_transformer.py index 8d08e7ad..11385a6f 100644 --- a/modelscope/models/nlp/backbones/space/model/intent_unified_transformer.py +++ b/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 diff --git a/modelscope/models/nlp/backbones/space/model/model_base.py b/modelscope/models/nlp/backbones/space/model/model_base.py index c0c2da95..d3d0baa4 100644 --- a/modelscope/models/nlp/backbones/space/model/model_base.py +++ b/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): diff --git a/modelscope/models/nlp/backbones/structbert/adv_utils.py b/modelscope/models/nlp/backbones/structbert/adv_utils.py index 8e2bd0bf..9864148f 100644 --- a/modelscope/models/nlp/backbones/structbert/adv_utils.py +++ b/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__) diff --git a/modelscope/models/nlp/backbones/structbert/configuration_sbert.py b/modelscope/models/nlp/backbones/structbert/configuration_sbert.py index e8605091..878b2216 100644 --- a/modelscope/models/nlp/backbones/structbert/configuration_sbert.py +++ b/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__) diff --git a/modelscope/models/nlp/backbones/structbert/modeling_sbert.py b/modelscope/models/nlp/backbones/structbert/modeling_sbert.py index 1b3cc218..2e67a652 100644 --- a/modelscope/models/nlp/backbones/structbert/modeling_sbert.py +++ b/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__) diff --git a/modelscope/models/nlp/bert_for_sequence_classification.py b/modelscope/models/nlp/bert_for_sequence_classification.py index 6eb27f03..1a843129 100644 --- a/modelscope/models/nlp/bert_for_sequence_classification.py +++ b/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'] diff --git a/modelscope/models/nlp/csanmt_for_translation.py b/modelscope/models/nlp/csanmt_for_translation.py index 97f14c6d..1af5b8ce 100644 --- a/modelscope/models/nlp/csanmt_for_translation.py +++ b/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'] diff --git a/modelscope/models/nlp/heads/sequence_classification_head.py b/modelscope/models/nlp/heads/sequence_classification_head.py index 78ff18d3..8c6e2188 100644 --- a/modelscope/models/nlp/heads/sequence_classification_head.py +++ b/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( diff --git a/modelscope/models/nlp/masked_language.py b/modelscope/models/nlp/masked_language.py index 0410f73c..8f3ba0f7 100644 --- a/modelscope/models/nlp/masked_language.py +++ b/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'] diff --git a/modelscope/models/nlp/nncrf_for_named_entity_recognition.py b/modelscope/models/nlp/nncrf_for_named_entity_recognition.py index efb68642..de16f8bf 100644 --- a/modelscope/models/nlp/nncrf_for_named_entity_recognition.py +++ b/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'] diff --git a/modelscope/models/nlp/palm_for_text_generation.py b/modelscope/models/nlp/palm_for_text_generation.py index e37dec7e..9e387e87 100644 --- a/modelscope/models/nlp/palm_for_text_generation.py +++ b/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'] diff --git a/modelscope/models/nlp/sbert_for_nli.py b/modelscope/models/nlp/sbert_for_nli.py index a5a76b34..ea62a8bd 100644 --- a/modelscope/models/nlp/sbert_for_nli.py +++ b/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 diff --git a/modelscope/models/nlp/sbert_for_sentence_similarity.py b/modelscope/models/nlp/sbert_for_sentence_similarity.py index 5fa487e5..00b612ea 100644 --- a/modelscope/models/nlp/sbert_for_sentence_similarity.py +++ b/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 diff --git a/modelscope/models/nlp/sbert_for_sentiment_classification.py b/modelscope/models/nlp/sbert_for_sentiment_classification.py index 73143077..83ac93c5 100644 --- a/modelscope/models/nlp/sbert_for_sentiment_classification.py +++ b/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 diff --git a/modelscope/models/nlp/sbert_for_sequence_classification.py b/modelscope/models/nlp/sbert_for_sequence_classification.py index 284edf02..20ccdb83 100644 --- a/modelscope/models/nlp/sbert_for_sequence_classification.py +++ b/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): diff --git a/modelscope/models/nlp/sbert_for_token_classification.py b/modelscope/models/nlp/sbert_for_token_classification.py index 3b966534..784d2bd1 100644 --- a/modelscope/models/nlp/sbert_for_token_classification.py +++ b/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'] diff --git a/modelscope/models/nlp/sbert_for_zero_shot_classification.py b/modelscope/models/nlp/sbert_for_zero_shot_classification.py index 5f652321..e9ee2026 100644 --- a/modelscope/models/nlp/sbert_for_zero_shot_classification.py +++ b/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'] diff --git a/modelscope/models/nlp/sequence_classification.py b/modelscope/models/nlp/sequence_classification.py index b867f130..4920c6ff 100644 --- a/modelscope/models/nlp/sequence_classification.py +++ b/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'] diff --git a/modelscope/models/nlp/space_for_dialog_intent_prediction.py b/modelscope/models/nlp/space_for_dialog_intent_prediction.py index e0b802c4..247d0cc7 100644 --- a/modelscope/models/nlp/space_for_dialog_intent_prediction.py +++ b/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'] diff --git a/modelscope/models/nlp/space_for_dialog_modeling.py b/modelscope/models/nlp/space_for_dialog_modeling.py index 2368766e..64eaab37 100644 --- a/modelscope/models/nlp/space_for_dialog_modeling.py +++ b/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'] diff --git a/modelscope/models/nlp/space_for_dialog_state_tracking.py b/modelscope/models/nlp/space_for_dialog_state_tracking.py index 636addf5..2587d2fd 100644 --- a/modelscope/models/nlp/space_for_dialog_state_tracking.py +++ b/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'] diff --git a/modelscope/models/nlp/task_model.py b/modelscope/models/nlp/task_model.py index 2effd6c6..ee66a3e5 100644 --- a/modelscope/models/nlp/task_model.py +++ b/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) diff --git a/modelscope/pipelines/audio/ans_pipeline.py b/modelscope/pipelines/audio/ans_pipeline.py index 2a5174ac..298f8bd8 100644 --- a/modelscope/pipelines/audio/ans_pipeline.py +++ b/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): diff --git a/modelscope/pipelines/audio/linear_aec_pipeline.py b/modelscope/pipelines/audio/linear_aec_pipeline.py index e3e5e1a4..a130f43e 100644 --- a/modelscope/pipelines/audio/linear_aec_pipeline.py +++ b/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() diff --git a/modelscope/pipelines/cv/action_recognition_pipeline.py b/modelscope/pipelines/cv/action_recognition_pipeline.py index 7d7d7ff2..c6e454ec 100644 --- a/modelscope/pipelines/cv/action_recognition_pipeline.py +++ b/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() diff --git a/modelscope/pipelines/cv/animal_recog_pipeline.py b/modelscope/pipelines/cv/animal_recog_pipeline.py index cb4aab4f..5cb752b5 100644 --- a/modelscope/pipelines/cv/animal_recog_pipeline.py +++ b/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() diff --git a/modelscope/pipelines/cv/cmdssl_video_embedding_pipleline.py b/modelscope/pipelines/cv/cmdssl_video_embedding_pipleline.py index 16cc9f08..04836264 100644 --- a/modelscope/pipelines/cv/cmdssl_video_embedding_pipleline.py +++ b/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() diff --git a/modelscope/pipelines/cv/face_image_generation_pipeline.py b/modelscope/pipelines/cv/face_image_generation_pipeline.py index 7fef7a71..d063d9af 100644 --- a/modelscope/pipelines/cv/face_image_generation_pipeline.py +++ b/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() diff --git a/modelscope/pipelines/cv/image_cartoon_pipeline.py b/modelscope/pipelines/cv/image_cartoon_pipeline.py index b4be18a7..2ea19d70 100644 --- a/modelscope/pipelines/cv/image_cartoon_pipeline.py +++ b/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 diff --git a/modelscope/pipelines/cv/image_colorization_pipeline.py b/modelscope/pipelines/cv/image_colorization_pipeline.py index b634c7e8..0e5cc3e1 100644 --- a/modelscope/pipelines/cv/image_colorization_pipeline.py +++ b/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() diff --git a/modelscope/pipelines/cv/image_matting_pipeline.py b/modelscope/pipelines/cv/image_matting_pipeline.py index 04ce76be..91d3c515 100644 --- a/modelscope/pipelines/cv/image_matting_pipeline.py +++ b/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() diff --git a/modelscope/pipelines/cv/image_super_resolution_pipeline.py b/modelscope/pipelines/cv/image_super_resolution_pipeline.py index 4147a175..9f1dab62 100644 --- a/modelscope/pipelines/cv/image_super_resolution_pipeline.py +++ b/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() diff --git a/modelscope/pipelines/cv/ocr_detection_pipeline.py b/modelscope/pipelines/cv/ocr_detection_pipeline.py index 5412e987..4d842fbe 100644 --- a/modelscope/pipelines/cv/ocr_detection_pipeline.py +++ b/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': diff --git a/modelscope/pipelines/multi_modal/image_captioning_pipeline.py b/modelscope/pipelines/multi_modal/image_captioning_pipeline.py index 62226ff5..90b1dec0 100644 --- a/modelscope/pipelines/multi_modal/image_captioning_pipeline.py +++ b/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 diff --git a/modelscope/pipelines/multi_modal/multi_modal_embedding_pipeline.py b/modelscope/pipelines/multi_modal/multi_modal_embedding_pipeline.py index ae00e275..43046e8c 100644 --- a/modelscope/pipelines/multi_modal/multi_modal_embedding_pipeline.py +++ b/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() diff --git a/modelscope/pipelines/multi_modal/text_to_image_synthesis_pipeline.py b/modelscope/pipelines/multi_modal/text_to_image_synthesis_pipeline.py index d78cb5c7..44625b0a 100644 --- a/modelscope/pipelines/multi_modal/text_to_image_synthesis_pipeline.py +++ b/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() diff --git a/modelscope/pipelines/multi_modal/visual_question_answering_pipeline.py b/modelscope/pipelines/multi_modal/visual_question_answering_pipeline.py index 97c8cf7b..9b51efa0 100644 --- a/modelscope/pipelines/multi_modal/visual_question_answering_pipeline.py +++ b/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'] diff --git a/modelscope/pipelines/nlp/dialog_intent_prediction_pipeline.py b/modelscope/pipelines/nlp/dialog_intent_prediction_pipeline.py index d5869ddd..a425f21a 100644 --- a/modelscope/pipelines/nlp/dialog_intent_prediction_pipeline.py +++ b/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'] diff --git a/modelscope/pipelines/nlp/dialog_modeling_pipeline.py b/modelscope/pipelines/nlp/dialog_modeling_pipeline.py index 09d09b64..7cbfa5bf 100644 --- a/modelscope/pipelines/nlp/dialog_modeling_pipeline.py +++ b/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'] diff --git a/modelscope/pipelines/nlp/dialog_state_tracking_pipeline.py b/modelscope/pipelines/nlp/dialog_state_tracking_pipeline.py index 541b0529..182be655 100644 --- a/modelscope/pipelines/nlp/dialog_state_tracking_pipeline.py +++ b/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'] diff --git a/modelscope/pipelines/nlp/fill_mask_pipeline.py b/modelscope/pipelines/nlp/fill_mask_pipeline.py index 9c98bbf8..27c34817 100644 --- a/modelscope/pipelines/nlp/fill_mask_pipeline.py +++ b/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'} diff --git a/modelscope/pipelines/nlp/named_entity_recognition_pipeline.py b/modelscope/pipelines/nlp/named_entity_recognition_pipeline.py index 744bad2d..65334144 100644 --- a/modelscope/pipelines/nlp/named_entity_recognition_pipeline.py +++ b/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'] diff --git a/modelscope/pipelines/nlp/nli_pipeline.py b/modelscope/pipelines/nlp/nli_pipeline.py index 6c4d9135..200f44e4 100644 --- a/modelscope/pipelines/nlp/nli_pipeline.py +++ b/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'] diff --git a/modelscope/pipelines/nlp/sentence_similarity_pipeline.py b/modelscope/pipelines/nlp/sentence_similarity_pipeline.py index 8ed7d0f9..c09e2115 100644 --- a/modelscope/pipelines/nlp/sentence_similarity_pipeline.py +++ b/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'] diff --git a/modelscope/pipelines/nlp/sentiment_classification_pipeline.py b/modelscope/pipelines/nlp/sentiment_classification_pipeline.py index e98a74c5..8e57d77b 100644 --- a/modelscope/pipelines/nlp/sentiment_classification_pipeline.py +++ b/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'] diff --git a/modelscope/pipelines/nlp/sequence_classification_pipeline.py b/modelscope/pipelines/nlp/sequence_classification_pipeline.py index 3ade16e9..5273ddc6 100644 --- a/modelscope/pipelines/nlp/sequence_classification_pipeline.py +++ b/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'] diff --git a/modelscope/pipelines/nlp/text_generation_pipeline.py b/modelscope/pipelines/nlp/text_generation_pipeline.py index d68f0039..5cf75314 100644 --- a/modelscope/pipelines/nlp/text_generation_pipeline.py +++ b/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'] diff --git a/modelscope/pipelines/nlp/translation_pipeline.py b/modelscope/pipelines/nlp/translation_pipeline.py index 1beedae3..fdf9be64 100644 --- a/modelscope/pipelines/nlp/translation_pipeline.py +++ b/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 diff --git a/modelscope/pipelines/nlp/word_segmentation_pipeline.py b/modelscope/pipelines/nlp/word_segmentation_pipeline.py index 65f28e7b..73d0c278 100644 --- a/modelscope/pipelines/nlp/word_segmentation_pipeline.py +++ b/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'] diff --git a/modelscope/pipelines/nlp/zero_shot_classification_pipeline.py b/modelscope/pipelines/nlp/zero_shot_classification_pipeline.py index 2cd788bc..642d4870 100644 --- a/modelscope/pipelines/nlp/zero_shot_classification_pipeline.py +++ b/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'] diff --git a/modelscope/preprocessors/nlp.py b/modelscope/preprocessors/nlp.py index 52560142..e92a3e52 100644 --- a/modelscope/preprocessors/nlp.py +++ b/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 diff --git a/modelscope/trainers/trainer.py b/modelscope/trainers/trainer.py index 825d7abc..eeef722a 100644 --- a/modelscope/trainers/trainer.py +++ b/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: diff --git a/modelscope/trainers/utils/inference.py b/modelscope/trainers/utils/inference.py index ac828fe5..e2e1f5ba 100644 --- a/modelscope/trainers/utils/inference.py +++ b/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: diff --git a/modelscope/utils/tensor_utils.py b/modelscope/utils/tensor_utils.py index d9e4d040..3e6075f0 100644 --- a/modelscope/utils/tensor_utils.py +++ b/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)): diff --git a/modelscope/utils/utils.py b/modelscope/utils/utils.py index d5c275d3..993e6222 100644 --- a/modelscope/utils/utils.py +++ b/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: