diff --git a/modelscope/metainfo.py b/modelscope/metainfo.py index a3b0bd67..da0cb0e8 100644 --- a/modelscope/metainfo.py +++ b/modelscope/metainfo.py @@ -70,7 +70,7 @@ class Pipelines(object): For pipeline which suuport only one model, we should use ${Model}-${Task} as its name. """ # vision tasks - image_matting = 'unet-image-matting' + portrait_matting = 'unet-image-matting' image_denoise = 'nafnet-image-denoise' person_image_cartoon = 'unet-person-image-cartoon' ocr_detection = 'resnet18-ocr-detection' diff --git a/modelscope/outputs.py b/modelscope/outputs.py index 932d8abf..55f47ba3 100644 --- a/modelscope/outputs.py +++ b/modelscope/outputs.py @@ -127,7 +127,6 @@ TASK_OUTPUTS = { # { # "output_img": np.array with shape(h, w, 4) # } - Tasks.image_matting: [OutputKeys.OUTPUT_IMG], Tasks.portrait_matting: [OutputKeys.OUTPUT_IMG], # image editing task result for a single image diff --git a/modelscope/pipelines/builder.py b/modelscope/pipelines/builder.py index 7c0a408f..21bdd36c 100644 --- a/modelscope/pipelines/builder.py +++ b/modelscope/pipelines/builder.py @@ -33,8 +33,8 @@ DEFAULT_MODEL_FOR_PIPELINE = { (Pipelines.sentiment_classification, 'damo/nlp_structbert_sentiment-classification_chinese-base' ), # TODO: revise back after passing the pr - Tasks.image_matting: (Pipelines.image_matting, - 'damo/cv_unet_image-matting'), + Tasks.portrait_matting: (Pipelines.portrait_matting, + 'damo/cv_unet_image-matting'), Tasks.human_detection: (Pipelines.human_detection, 'damo/cv_resnet18_human-detection'), Tasks.image_object_detection: (Pipelines.object_detection, diff --git a/modelscope/pipelines/cv/image_matting_pipeline.py b/modelscope/pipelines/cv/image_matting_pipeline.py index 2f9d39c3..5991a6a9 100644 --- a/modelscope/pipelines/cv/image_matting_pipeline.py +++ b/modelscope/pipelines/cv/image_matting_pipeline.py @@ -17,8 +17,6 @@ logger = get_logger() @PIPELINES.register_module( Tasks.portrait_matting, module_name=Pipelines.image_matting) -@PIPELINES.register_module( - Tasks.image_matting, module_name=Pipelines.image_matting) class ImageMattingPipeline(Pipeline): def __init__(self, model: str, **kwargs): diff --git a/modelscope/utils/constant.py b/modelscope/utils/constant.py index d0941903..f11546b1 100644 --- a/modelscope/utils/constant.py +++ b/modelscope/utils/constant.py @@ -31,7 +31,6 @@ class CVTasks(object): image_object_detection = 'image-object-detection' image_segmentation = 'image-segmentation' - image_matting = 'image-matting' portrait_matting = 'portrait-matting' # image editing