From 7659b64cdca47164da16b1f77f8de01735bbfe0c Mon Sep 17 00:00:00 2001 From: "xingjun.wxj" Date: Mon, 13 Mar 2023 16:00:33 +0800 Subject: [PATCH] downward compatible with v1.3.x and lower version for task_datasets, to fix import errors: 1. gopro_image_deblurring_dataset 2. reds_image_deblurring_dataset 3. sidd_image_denoising 4. video_summarization_dataset 5. ASRDataset --- modelscope/msdatasets/audio/__init__.py | 1 + modelscope/msdatasets/audio/asr_dataset.py | 10 ++++++++++ .../dataset_cls/custom_datasets/__init__.py | 5 +++-- .../dataset_cls/custom_datasets/audio/__init__.py | 2 ++ modelscope/msdatasets/task_datasets/__init__.py | 6 ++++++ .../task_datasets/gopro_image_deblurring_dataset.py | 12 ++++++++++++ .../task_datasets/reds_image_deblurring_dataset.py | 11 +++++++++++ .../msdatasets/task_datasets/sidd_image_denoising.py | 11 +++++++++++ .../task_datasets/video_summarization_dataset.py | 12 ++++++++++++ 9 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 modelscope/msdatasets/audio/__init__.py create mode 100644 modelscope/msdatasets/audio/asr_dataset.py create mode 100644 modelscope/msdatasets/task_datasets/__init__.py create mode 100644 modelscope/msdatasets/task_datasets/gopro_image_deblurring_dataset.py create mode 100644 modelscope/msdatasets/task_datasets/reds_image_deblurring_dataset.py create mode 100644 modelscope/msdatasets/task_datasets/sidd_image_denoising.py create mode 100644 modelscope/msdatasets/task_datasets/video_summarization_dataset.py diff --git a/modelscope/msdatasets/audio/__init__.py b/modelscope/msdatasets/audio/__init__.py new file mode 100644 index 00000000..b937315b --- /dev/null +++ b/modelscope/msdatasets/audio/__init__.py @@ -0,0 +1 @@ +# Copyright (c) Alibaba, Inc. and its affiliates. diff --git a/modelscope/msdatasets/audio/asr_dataset.py b/modelscope/msdatasets/audio/asr_dataset.py new file mode 100644 index 00000000..a7a344e9 --- /dev/null +++ b/modelscope/msdatasets/audio/asr_dataset.py @@ -0,0 +1,10 @@ +# Copyright (c) Alibaba, Inc. and its affiliates. + +from modelscope.msdatasets.dataset_cls.custom_datasets import ASRDataset +from modelscope.utils.logger import get_logger + +logger = get_logger() +logger.warning( + 'The reference has been Deprecated, ' + 'please use `from modelscope.msdatasets.dataset_cls.custom_datasets import ASRDataset`' +) diff --git a/modelscope/msdatasets/dataset_cls/custom_datasets/__init__.py b/modelscope/msdatasets/dataset_cls/custom_datasets/__init__.py index 81a8a6c9..9eb62168 100644 --- a/modelscope/msdatasets/dataset_cls/custom_datasets/__init__.py +++ b/modelscope/msdatasets/dataset_cls/custom_datasets/__init__.py @@ -16,7 +16,7 @@ if TYPE_CHECKING: from .text_ranking_dataset import TextRankingDataset from .veco_dataset import VecoDataset from .video_summarization_dataset import VideoSummarizationDataset - from .audio import KWSDataset, KWSDataLoader, kws_nearfield_dataset + from .audio import KWSDataset, KWSDataLoader, kws_nearfield_dataset, ASRDataset from .bad_image_detecting import BadImageDetectingDataset from .image_inpainting import ImageInpaintingDataset from .image_portrait_enhancement import ImagePortraitEnhancementDataset @@ -52,7 +52,8 @@ else: 'text_ranking_dataset': ['TextRankingDataset'], 'veco_dataset': ['VecoDataset'], 'video_summarization_dataset': ['VideoSummarizationDataset'], - 'audio': ['KWSDataset', 'KWSDataLoader', 'kws_nearfield_dataset'], + 'audio': + ['KWSDataset', 'KWSDataLoader', 'kws_nearfield_dataset', 'ASRDataset'], 'bad_image_detecting': ['BadImageDetectingDataset'], 'image_inpainting': ['ImageInpaintingDataset'], 'image_portrait_enhancement': ['ImagePortraitEnhancementDataset'], diff --git a/modelscope/msdatasets/dataset_cls/custom_datasets/audio/__init__.py b/modelscope/msdatasets/dataset_cls/custom_datasets/audio/__init__.py index dc66bd8d..7291bb7f 100644 --- a/modelscope/msdatasets/dataset_cls/custom_datasets/audio/__init__.py +++ b/modelscope/msdatasets/dataset_cls/custom_datasets/audio/__init__.py @@ -6,11 +6,13 @@ from modelscope.utils.import_utils import LazyImportModule if TYPE_CHECKING: from .kws_farfield_dataset import KWSDataset, KWSDataLoader from .kws_nearfield_dataset import kws_nearfield_dataset + from .asr_dataset import ASRDataset else: _import_structure = { 'kws_farfield_dataset': ['KWSDataset', 'KWSDataLoader'], 'kws_nearfield_dataset': ['kws_nearfield_dataset'], + 'asr_dataset': ['ASRDataset'], } import sys diff --git a/modelscope/msdatasets/task_datasets/__init__.py b/modelscope/msdatasets/task_datasets/__init__.py new file mode 100644 index 00000000..71d9a943 --- /dev/null +++ b/modelscope/msdatasets/task_datasets/__init__.py @@ -0,0 +1,6 @@ +# Copyright (c) Alibaba, Inc. and its affiliates. + +from .gopro_image_deblurring_dataset import GoproImageDeblurringDataset +from .reds_image_deblurring_dataset import RedsImageDeblurringDataset +from .sidd_image_denoising import SiddImageDenoisingDataset +from .video_summarization_dataset import VideoSummarizationDataset diff --git a/modelscope/msdatasets/task_datasets/gopro_image_deblurring_dataset.py b/modelscope/msdatasets/task_datasets/gopro_image_deblurring_dataset.py new file mode 100644 index 00000000..0836f5dc --- /dev/null +++ b/modelscope/msdatasets/task_datasets/gopro_image_deblurring_dataset.py @@ -0,0 +1,12 @@ +# Copyright (c) Alibaba, Inc. and its affiliates. + +from modelscope.msdatasets.dataset_cls.custom_datasets.gopro_image_deblurring_dataset import \ + GoproImageDeblurringDataset +from modelscope.utils.logger import get_logger + +logger = get_logger() +logger.warning( + 'The reference has been Deprecated, ' + 'please use `from modelscope.msdatasets.dataset_cls.' + 'custom_datasets.gopro_image_deblurring_dataset import GoproImageDeblurringDataset`' +) diff --git a/modelscope/msdatasets/task_datasets/reds_image_deblurring_dataset.py b/modelscope/msdatasets/task_datasets/reds_image_deblurring_dataset.py new file mode 100644 index 00000000..d6179d90 --- /dev/null +++ b/modelscope/msdatasets/task_datasets/reds_image_deblurring_dataset.py @@ -0,0 +1,11 @@ +# Copyright (c) Alibaba, Inc. and its affiliates. + +from modelscope.msdatasets.dataset_cls.custom_datasets.reds_image_deblurring_dataset import \ + RedsImageDeblurringDataset +from modelscope.utils.logger import get_logger + +logger = get_logger() +logger.warning( + 'The reference has been Deprecated, ' + 'please use `modelscope.msdatasets.dataset_cls.custom_datasets.' + 'reds_image_deblurring_dataset import RedsImageDeblurringDataset`') diff --git a/modelscope/msdatasets/task_datasets/sidd_image_denoising.py b/modelscope/msdatasets/task_datasets/sidd_image_denoising.py new file mode 100644 index 00000000..f1100723 --- /dev/null +++ b/modelscope/msdatasets/task_datasets/sidd_image_denoising.py @@ -0,0 +1,11 @@ +# Copyright (c) Alibaba, Inc. and its affiliates. + +from modelscope.msdatasets.dataset_cls.custom_datasets.sidd_image_denoising import \ + SiddImageDenoisingDataset +from modelscope.utils.logger import get_logger + +logger = get_logger() +logger.warning( + 'The reference has been Deprecated, ' + 'please use `from modelscope.msdatasets.dataset_cls.' + 'custom_datasets.sidd_image_denoising import SiddImageDenoisingDataset`') diff --git a/modelscope/msdatasets/task_datasets/video_summarization_dataset.py b/modelscope/msdatasets/task_datasets/video_summarization_dataset.py new file mode 100644 index 00000000..710466c3 --- /dev/null +++ b/modelscope/msdatasets/task_datasets/video_summarization_dataset.py @@ -0,0 +1,12 @@ +# Copyright (c) Alibaba, Inc. and its affiliates. + +from modelscope.msdatasets.dataset_cls.custom_datasets.video_summarization_dataset import \ + VideoSummarizationDataset +from modelscope.utils.logger import get_logger + +logger = get_logger() +logger.warning( + 'The reference has been Deprecated, ' + 'please use `from modelscope.msdatasets.dataset_cls.' + 'custom_datasets.video_summarization_dataset import VideoSummarizationDataset`' +)