Browse Source

[to #42322933] change image matting to portrait matting

master
Yingda Chen 3 years ago
parent
commit
21d3531de6
5 changed files with 3 additions and 7 deletions
  1. +1
    -1
      modelscope/metainfo.py
  2. +0
    -1
      modelscope/outputs.py
  3. +2
    -2
      modelscope/pipelines/builder.py
  4. +0
    -2
      modelscope/pipelines/cv/image_matting_pipeline.py
  5. +0
    -1
      modelscope/utils/constant.py

+ 1
- 1
modelscope/metainfo.py View File

@@ -70,7 +70,7 @@ class Pipelines(object):
For pipeline which suuport only one model, we should use ${Model}-${Task} as its name. For pipeline which suuport only one model, we should use ${Model}-${Task} as its name.
""" """
# vision tasks # vision tasks
image_matting = 'unet-image-matting'
portrait_matting = 'unet-image-matting'
image_denoise = 'nafnet-image-denoise' image_denoise = 'nafnet-image-denoise'
person_image_cartoon = 'unet-person-image-cartoon' person_image_cartoon = 'unet-person-image-cartoon'
ocr_detection = 'resnet18-ocr-detection' ocr_detection = 'resnet18-ocr-detection'


+ 0
- 1
modelscope/outputs.py View File

@@ -127,7 +127,6 @@ TASK_OUTPUTS = {
# { # {
# "output_img": np.array with shape(h, w, 4) # "output_img": np.array with shape(h, w, 4)
# } # }
Tasks.image_matting: [OutputKeys.OUTPUT_IMG],
Tasks.portrait_matting: [OutputKeys.OUTPUT_IMG], Tasks.portrait_matting: [OutputKeys.OUTPUT_IMG],


# image editing task result for a single image # image editing task result for a single image


+ 2
- 2
modelscope/pipelines/builder.py View File

@@ -33,8 +33,8 @@ DEFAULT_MODEL_FOR_PIPELINE = {
(Pipelines.sentiment_classification, (Pipelines.sentiment_classification,
'damo/nlp_structbert_sentiment-classification_chinese-base' 'damo/nlp_structbert_sentiment-classification_chinese-base'
), # TODO: revise back after passing the pr ), # 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, Tasks.human_detection: (Pipelines.human_detection,
'damo/cv_resnet18_human-detection'), 'damo/cv_resnet18_human-detection'),
Tasks.image_object_detection: (Pipelines.object_detection, Tasks.image_object_detection: (Pipelines.object_detection,


+ 0
- 2
modelscope/pipelines/cv/image_matting_pipeline.py View File

@@ -17,8 +17,6 @@ logger = get_logger()


@PIPELINES.register_module( @PIPELINES.register_module(
Tasks.portrait_matting, module_name=Pipelines.image_matting) Tasks.portrait_matting, module_name=Pipelines.image_matting)
@PIPELINES.register_module(
Tasks.image_matting, module_name=Pipelines.image_matting)
class ImageMattingPipeline(Pipeline): class ImageMattingPipeline(Pipeline):


def __init__(self, model: str, **kwargs): def __init__(self, model: str, **kwargs):


+ 0
- 1
modelscope/utils/constant.py View File

@@ -31,7 +31,6 @@ class CVTasks(object):
image_object_detection = 'image-object-detection' image_object_detection = 'image-object-detection'


image_segmentation = 'image-segmentation' image_segmentation = 'image-segmentation'
image_matting = 'image-matting'
portrait_matting = 'portrait-matting' portrait_matting = 'portrait-matting'


# image editing # image editing


Loading…
Cancel
Save