yuanzhi.zyz yingda.chen 3 years ago
parent
commit
4b501dd44a
3 changed files with 9 additions and 5 deletions
  1. +3
    -0
      data/test/images/ocr_recognition_document.png
  2. +3
    -2
      modelscope/pipelines/builder.py
  3. +3
    -3
      tests/pipelines/test_ocr_recognition.py

+ 3
- 0
data/test/images/ocr_recognition_document.png View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:29f2ad929c852f6456367054d13e113078cf06b763fe54d73fd324f789331aa3
size 61611

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

@@ -124,8 +124,9 @@ DEFAULT_MODEL_FOR_PIPELINE = {
Tasks.image_classification: Tasks.image_classification:
(Pipelines.daily_image_classification, (Pipelines.daily_image_classification,
'damo/cv_vit-base_image-classification_Dailylife-labels'), 'damo/cv_vit-base_image-classification_Dailylife-labels'),
Tasks.ocr_recognition: (Pipelines.ocr_recognition,
'damo/cv_convnextTiny_ocr-recognition_damo'),
Tasks.ocr_recognition:
(Pipelines.ocr_recognition,
'damo/cv_convnextTiny_ocr-recognition-general_damo'),
Tasks.skin_retouching: (Pipelines.skin_retouching, Tasks.skin_retouching: (Pipelines.skin_retouching,
'damo/cv_unet_skin-retouching'), 'damo/cv_unet_skin-retouching'),
Tasks.crowd_counting: (Pipelines.crowd_counting, Tasks.crowd_counting: (Pipelines.crowd_counting,


+ 3
- 3
tests/pipelines/test_ocr_recognition.py View File

@@ -19,19 +19,19 @@ from modelscope.utils.test_utils import test_level
class OCRRecognitionTest(unittest.TestCase): class OCRRecognitionTest(unittest.TestCase):


def setUp(self) -> None: def setUp(self) -> None:
self.model_id = 'damo/cv_convnextTiny_ocr-recognition_damo'
self.model_id = 'damo/cv_convnextTiny_ocr-recognition-general_damo'
self.test_image = 'data/test/images/ocr_recognition.jpg' self.test_image = 'data/test/images/ocr_recognition.jpg'


def pipeline_inference(self, pipeline: Pipeline, input_location: str): def pipeline_inference(self, pipeline: Pipeline, input_location: str):
result = pipeline(input_location) result = pipeline(input_location)
print('ocr recognition results: ', result) print('ocr recognition results: ', result)


@unittest.skipUnless(test_level() >= 2, 'skip test in current test level')
@unittest.skipUnless(test_level() >= 0, 'skip test in current test level')
def test_run_with_model_from_modelhub(self): def test_run_with_model_from_modelhub(self):
ocr_recognition = pipeline(Tasks.ocr_recognition, model=self.model_id) ocr_recognition = pipeline(Tasks.ocr_recognition, model=self.model_id)
self.pipeline_inference(ocr_recognition, self.test_image) self.pipeline_inference(ocr_recognition, self.test_image)


@unittest.skipUnless(test_level() >= 2, 'skip test in current test level')
@unittest.skipUnless(test_level() >= 1, 'skip test in current test level')
def test_run_with_model_from_modelhub_PILinput(self): def test_run_with_model_from_modelhub_PILinput(self):
ocr_recognition = pipeline(Tasks.ocr_recognition, model=self.model_id) ocr_recognition = pipeline(Tasks.ocr_recognition, model=self.model_id)
imagePIL = PIL.Image.open(self.test_image) imagePIL = PIL.Image.open(self.test_image)


Loading…
Cancel
Save