Browse Source

[to #42322933] support text to image synthesis default model

Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/9253639
master
yingda.chen 3 years ago
parent
commit
d78d944246
4 changed files with 6 additions and 10 deletions
  1. +3
    -0
      modelscope/pipelines/builder.py
  2. +0
    -3
      modelscope/pipelines/cv/action_recognition_pipeline.py
  3. +2
    -2
      modelscope/pipelines/multi_modal/text_to_image_synthesis_pipeline.py
  4. +1
    -5
      tests/pipelines/test_action_recognition.py

+ 3
- 0
modelscope/pipelines/builder.py View File

@@ -57,6 +57,9 @@ DEFAULT_MODEL_FOR_PIPELINE = {
Tasks.visual_question_answering: Tasks.visual_question_answering:
(Pipelines.visual_question_answering, (Pipelines.visual_question_answering,
'damo/mplug_visual-question-answering_coco_large_en'), 'damo/mplug_visual-question-answering_coco_large_en'),
Tasks.text_to_image_synthesis:
(Pipelines.text_to_image_synthesis,
'damo/cv_imagen_text-to-image-synthesis_tiny')
} }






+ 0
- 3
modelscope/pipelines/cv/action_recognition_pipeline.py View File

@@ -2,9 +2,6 @@ import math
import os.path as osp import os.path as osp
from typing import Any, Dict from typing import Any, Dict


import cv2
import numpy as np
import PIL
import torch import torch


from modelscope.metainfo import Pipelines from modelscope.metainfo import Pipelines


+ 2
- 2
modelscope/pipelines/multi_modal/text_to_image_synthesis_pipeline.py View File

@@ -1,4 +1,4 @@
from typing import Any, Dict, Union
from typing import Any, Dict


from modelscope.metainfo import Pipelines from modelscope.metainfo import Pipelines
from modelscope.pipelines.base import Input from modelscope.pipelines.base import Input
@@ -23,7 +23,7 @@ class TextToImageSynthesisPipeline(Pipeline):
pipe_model = model pipe_model = model
else: else:
raise NotImplementedError( raise NotImplementedError(
f'execpting a Model instance or str, but get {type(model)}.')
f'expecting a Model instance or str, but get {type(model)}.')


super().__init__(model=pipe_model) super().__init__(model=pipe_model)




+ 1
- 5
tests/pipelines/test_action_recognition.py View File

@@ -1,14 +1,10 @@
# Copyright (c) Alibaba, Inc. and its affiliates. # Copyright (c) Alibaba, Inc. and its affiliates.
# !/usr/bin/env python # !/usr/bin/env python
import os.path as osp import os.path as osp
import shutil
import tempfile import tempfile
import unittest import unittest


import cv2

from modelscope.fileio import File from modelscope.fileio import File
from modelscope.msdatasets import MsDataset
from modelscope.pipelines import pipeline from modelscope.pipelines import pipeline
from modelscope.utils.constant import ModelFile, Tasks from modelscope.utils.constant import ModelFile, Tasks
from modelscope.utils.test_utils import test_level from modelscope.utils.test_utils import test_level
@@ -45,7 +41,7 @@ class ActionRecognitionTest(unittest.TestCase):


print(f'recognition output: {result}.') print(f'recognition output: {result}.')


@unittest.skipUnless(test_level() >= 0, 'skip test in current test level')
@unittest.skipUnless(test_level() >= 2, 'skip test in current test level')
def test_run_modelhub_default_model(self): def test_run_modelhub_default_model(self):
recognition_pipeline = pipeline(Tasks.action_recognition) recognition_pipeline = pipeline(Tasks.action_recognition)
result = recognition_pipeline( result = recognition_pipeline(


Loading…
Cancel
Save