From 06186d4829d0a93f133e9bca7172109e27a4dcde Mon Sep 17 00:00:00 2001 From: "baishuai.bs" Date: Tue, 2 Aug 2022 14:36:44 +0800 Subject: [PATCH] [to #43133921] change name(virtual-tryon to virtual-try-on) replace virtual-tryon with virtual-try-on Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/9600141 --- modelscope/metainfo.py | 2 +- modelscope/outputs.py | 4 ++-- modelscope/pipelines/builder.py | 4 ++-- modelscope/pipelines/cv/__init__.py | 4 ++-- ...al_tryon_pipeline.py => virtual_try_on_pipeline.py} | 2 +- modelscope/utils/constant.py | 2 +- .../{test_virtual_tryon.py => test_virtual_try_on.py} | 10 +++++----- 7 files changed, 14 insertions(+), 14 deletions(-) rename modelscope/pipelines/cv/{virtual_tryon_pipeline.py => virtual_try_on_pipeline.py} (98%) rename tests/pipelines/{test_virtual_tryon.py => test_virtual_try_on.py} (82%) diff --git a/modelscope/metainfo.py b/modelscope/metainfo.py index a0ae7252..d35d6e86 100644 --- a/modelscope/metainfo.py +++ b/modelscope/metainfo.py @@ -80,7 +80,7 @@ class Pipelines(object): general_image_classification = 'vit-base_image-classification_ImageNet-labels' daily_image_classification = 'vit-base_image-classification_Dailylife-labels' image_color_enhance = 'csrnet-image-color-enhance' - virtual_tryon = 'virtual_tryon' + virtual_try_on = 'virtual-try-on' image_colorization = 'unet-image-colorization' image_style_transfer = 'AAMS-style-transfer' image_super_resolution = 'rrdb-image-super-resolution' diff --git a/modelscope/outputs.py b/modelscope/outputs.py index 4d596472..c28f2fb9 100644 --- a/modelscope/outputs.py +++ b/modelscope/outputs.py @@ -350,11 +350,11 @@ TASK_OUTPUTS = { # "output_pcm": {"input_label" : np.ndarray with shape [D]} # } Tasks.text_to_speech: [OutputKeys.OUTPUT_PCM], - # virtual_tryon result for a single sample + # virtual_try_on result for a single sample # { # "output_img": np.ndarray with shape [height, width, 3] # } - Tasks.virtual_tryon: [OutputKeys.OUTPUT_IMG], + Tasks.virtual_try_on: [OutputKeys.OUTPUT_IMG], # visual_question_answering result for a single sample # { # "text": "this is the text generated by a model." diff --git a/modelscope/pipelines/builder.py b/modelscope/pipelines/builder.py index 7ab77d98..d5cfba3d 100644 --- a/modelscope/pipelines/builder.py +++ b/modelscope/pipelines/builder.py @@ -96,8 +96,8 @@ DEFAULT_MODEL_FOR_PIPELINE = { 'damo/multi_modal_clip_vtretrival_msrvtt_53'), Tasks.image_color_enhance: (Pipelines.image_color_enhance, 'damo/cv_csrnet_image-color-enhance-models'), - Tasks.virtual_tryon: (Pipelines.virtual_tryon, - 'damo/cv_daflow_virtual-tryon_base'), + Tasks.virtual_try_on: (Pipelines.virtual_try_on, + 'damo/cv_daflow_virtual-try-on_base'), Tasks.image_colorization: (Pipelines.image_colorization, 'damo/cv_unet_image-colorization'), Tasks.image_segmentation: diff --git a/modelscope/pipelines/cv/__init__.py b/modelscope/pipelines/cv/__init__.py index ee081fee..e675fe81 100644 --- a/modelscope/pipelines/cv/__init__.py +++ b/modelscope/pipelines/cv/__init__.py @@ -27,7 +27,7 @@ if TYPE_CHECKING: from .live_category_pipeline import LiveCategoryPipeline from .ocr_detection_pipeline import OCRDetectionPipeline from .video_category_pipeline import VideoCategoryPipeline - from .virtual_tryon_pipeline import VirtualTryonPipeline + from .virtual_try_on_pipeline import VirtualTryonPipeline else: _import_structure = { 'action_recognition_pipeline': ['ActionRecognitionPipeline'], @@ -57,7 +57,7 @@ else: ['Image2ImageGenerationePipeline'], 'ocr_detection_pipeline': ['OCRDetectionPipeline'], 'video_category_pipeline': ['VideoCategoryPipeline'], - 'virtual_tryon_pipeline': ['VirtualTryonPipeline'], + 'virtual_try_on_pipeline': ['VirtualTryonPipeline'], } import sys diff --git a/modelscope/pipelines/cv/virtual_tryon_pipeline.py b/modelscope/pipelines/cv/virtual_try_on_pipeline.py similarity index 98% rename from modelscope/pipelines/cv/virtual_tryon_pipeline.py rename to modelscope/pipelines/cv/virtual_try_on_pipeline.py index b779e062..cd6e7046 100644 --- a/modelscope/pipelines/cv/virtual_tryon_pipeline.py +++ b/modelscope/pipelines/cv/virtual_try_on_pipeline.py @@ -20,7 +20,7 @@ from modelscope.utils.constant import ModelFile, Tasks @PIPELINES.register_module( - Tasks.virtual_tryon, module_name=Pipelines.virtual_tryon) + Tasks.virtual_try_on, module_name=Pipelines.virtual_try_on) class VirtualTryonPipeline(Pipeline): def __init__(self, model: str, **kwargs): diff --git a/modelscope/utils/constant.py b/modelscope/utils/constant.py index dd402101..73c55152 100644 --- a/modelscope/utils/constant.py +++ b/modelscope/utils/constant.py @@ -33,7 +33,7 @@ class CVTasks(object): face_detection = 'face-detection' face_recognition = 'face-recognition' image_color_enhance = 'image-color-enhance' - virtual_tryon = 'virtual-tryon' + virtual_try_on = 'virtual-try-on' image_colorization = 'image-colorization' face_image_generation = 'face-image-generation' image_style_transfer = 'image-style-transfer' diff --git a/tests/pipelines/test_virtual_tryon.py b/tests/pipelines/test_virtual_try_on.py similarity index 82% rename from tests/pipelines/test_virtual_tryon.py rename to tests/pipelines/test_virtual_try_on.py index a81f27a9..5c6cef51 100644 --- a/tests/pipelines/test_virtual_tryon.py +++ b/tests/pipelines/test_virtual_try_on.py @@ -12,7 +12,7 @@ from modelscope.utils.test_utils import test_level class VirtualTryonTest(unittest.TestCase): - model_id = 'damo/cv_daflow_virtual-tryon_base' + model_id = 'damo/cv_daflow_virtual-try-on_base' masked_model = Image.open('data/test/images/virtual_tryon_model.jpg') pose = Image.open('data/test/images/virtual_tryon_pose.jpg') cloth = Image.open('data/test/images/virtual_tryon_cloth.jpg') @@ -20,14 +20,14 @@ class VirtualTryonTest(unittest.TestCase): @unittest.skipUnless(test_level() >= 1, 'skip test in current test level') def test_run_with_model_name(self): - pipeline_virtual_tryon = pipeline( - task=Tasks.virtual_tryon, model=self.model_id) - img = pipeline_virtual_tryon(self.input_imgs)[OutputKeys.OUTPUT_IMG] + pipeline_virtual_try_on = pipeline( + task=Tasks.virtual_try_on, model=self.model_id) + img = pipeline_virtual_try_on(self.input_imgs)[OutputKeys.OUTPUT_IMG] cv2.imwrite('demo.jpg', img[:, :, ::-1]) @unittest.skipUnless(test_level() >= 2, 'skip test in current test level') def test_run_with_model_name_default_model(self): - pipeline_virtual_tryon = pipeline(task=Tasks.virtual_tryon) + pipeline_virtual_tryon = pipeline(task=Tasks.virtual_try_on) img = pipeline_virtual_tryon(self.input_imgs)[OutputKeys.OUTPUT_IMG] cv2.imwrite('demo.jpg', img[:, :, ::-1])