replace virtual-tryon with virtual-try-on Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/9600141master
| @@ -80,7 +80,7 @@ class Pipelines(object): | |||||
| general_image_classification = 'vit-base_image-classification_ImageNet-labels' | general_image_classification = 'vit-base_image-classification_ImageNet-labels' | ||||
| daily_image_classification = 'vit-base_image-classification_Dailylife-labels' | daily_image_classification = 'vit-base_image-classification_Dailylife-labels' | ||||
| image_color_enhance = 'csrnet-image-color-enhance' | image_color_enhance = 'csrnet-image-color-enhance' | ||||
| virtual_tryon = 'virtual_tryon' | |||||
| virtual_try_on = 'virtual-try-on' | |||||
| image_colorization = 'unet-image-colorization' | image_colorization = 'unet-image-colorization' | ||||
| image_style_transfer = 'AAMS-style-transfer' | image_style_transfer = 'AAMS-style-transfer' | ||||
| image_super_resolution = 'rrdb-image-super-resolution' | image_super_resolution = 'rrdb-image-super-resolution' | ||||
| @@ -350,11 +350,11 @@ TASK_OUTPUTS = { | |||||
| # "output_pcm": {"input_label" : np.ndarray with shape [D]} | # "output_pcm": {"input_label" : np.ndarray with shape [D]} | ||||
| # } | # } | ||||
| Tasks.text_to_speech: [OutputKeys.OUTPUT_PCM], | 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] | # "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 | # visual_question_answering result for a single sample | ||||
| # { | # { | ||||
| # "text": "this is the text generated by a model." | # "text": "this is the text generated by a model." | ||||
| @@ -96,8 +96,8 @@ DEFAULT_MODEL_FOR_PIPELINE = { | |||||
| 'damo/multi_modal_clip_vtretrival_msrvtt_53'), | 'damo/multi_modal_clip_vtretrival_msrvtt_53'), | ||||
| Tasks.image_color_enhance: (Pipelines.image_color_enhance, | Tasks.image_color_enhance: (Pipelines.image_color_enhance, | ||||
| 'damo/cv_csrnet_image-color-enhance-models'), | '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, | Tasks.image_colorization: (Pipelines.image_colorization, | ||||
| 'damo/cv_unet_image-colorization'), | 'damo/cv_unet_image-colorization'), | ||||
| Tasks.image_segmentation: | Tasks.image_segmentation: | ||||
| @@ -27,7 +27,7 @@ if TYPE_CHECKING: | |||||
| from .live_category_pipeline import LiveCategoryPipeline | from .live_category_pipeline import LiveCategoryPipeline | ||||
| from .ocr_detection_pipeline import OCRDetectionPipeline | from .ocr_detection_pipeline import OCRDetectionPipeline | ||||
| from .video_category_pipeline import VideoCategoryPipeline | from .video_category_pipeline import VideoCategoryPipeline | ||||
| from .virtual_tryon_pipeline import VirtualTryonPipeline | |||||
| from .virtual_try_on_pipeline import VirtualTryonPipeline | |||||
| else: | else: | ||||
| _import_structure = { | _import_structure = { | ||||
| 'action_recognition_pipeline': ['ActionRecognitionPipeline'], | 'action_recognition_pipeline': ['ActionRecognitionPipeline'], | ||||
| @@ -57,7 +57,7 @@ else: | |||||
| ['Image2ImageGenerationePipeline'], | ['Image2ImageGenerationePipeline'], | ||||
| 'ocr_detection_pipeline': ['OCRDetectionPipeline'], | 'ocr_detection_pipeline': ['OCRDetectionPipeline'], | ||||
| 'video_category_pipeline': ['VideoCategoryPipeline'], | 'video_category_pipeline': ['VideoCategoryPipeline'], | ||||
| 'virtual_tryon_pipeline': ['VirtualTryonPipeline'], | |||||
| 'virtual_try_on_pipeline': ['VirtualTryonPipeline'], | |||||
| } | } | ||||
| import sys | import sys | ||||
| @@ -20,7 +20,7 @@ from modelscope.utils.constant import ModelFile, Tasks | |||||
| @PIPELINES.register_module( | @PIPELINES.register_module( | ||||
| Tasks.virtual_tryon, module_name=Pipelines.virtual_tryon) | |||||
| Tasks.virtual_try_on, module_name=Pipelines.virtual_try_on) | |||||
| class VirtualTryonPipeline(Pipeline): | class VirtualTryonPipeline(Pipeline): | ||||
| def __init__(self, model: str, **kwargs): | def __init__(self, model: str, **kwargs): | ||||
| @@ -33,7 +33,7 @@ class CVTasks(object): | |||||
| face_detection = 'face-detection' | face_detection = 'face-detection' | ||||
| face_recognition = 'face-recognition' | face_recognition = 'face-recognition' | ||||
| image_color_enhance = 'image-color-enhance' | image_color_enhance = 'image-color-enhance' | ||||
| virtual_tryon = 'virtual-tryon' | |||||
| virtual_try_on = 'virtual-try-on' | |||||
| image_colorization = 'image-colorization' | image_colorization = 'image-colorization' | ||||
| face_image_generation = 'face-image-generation' | face_image_generation = 'face-image-generation' | ||||
| image_style_transfer = 'image-style-transfer' | image_style_transfer = 'image-style-transfer' | ||||
| @@ -12,7 +12,7 @@ from modelscope.utils.test_utils import test_level | |||||
| class VirtualTryonTest(unittest.TestCase): | 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') | masked_model = Image.open('data/test/images/virtual_tryon_model.jpg') | ||||
| pose = Image.open('data/test/images/virtual_tryon_pose.jpg') | pose = Image.open('data/test/images/virtual_tryon_pose.jpg') | ||||
| cloth = Image.open('data/test/images/virtual_tryon_cloth.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') | @unittest.skipUnless(test_level() >= 1, 'skip test in current test level') | ||||
| def test_run_with_model_name(self): | 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]) | cv2.imwrite('demo.jpg', img[:, :, ::-1]) | ||||
| @unittest.skipUnless(test_level() >= 2, 'skip test in current test level') | @unittest.skipUnless(test_level() >= 2, 'skip test in current test level') | ||||
| def test_run_with_model_name_default_model(self): | 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] | img = pipeline_virtual_tryon(self.input_imgs)[OutputKeys.OUTPUT_IMG] | ||||
| cv2.imwrite('demo.jpg', img[:, :, ::-1]) | cv2.imwrite('demo.jpg', img[:, :, ::-1]) | ||||