From 4b501dd44a44ab2c8f72450161d112525636fea8 Mon Sep 17 00:00:00 2001 From: "yuanzhi.zyz" Date: Fri, 19 Aug 2022 19:02:27 +0800 Subject: [PATCH] [to #42322933]ocr-recognition re-upload Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/9826159 --- data/test/images/ocr_recognition_document.png | 3 +++ modelscope/pipelines/builder.py | 5 +++-- tests/pipelines/test_ocr_recognition.py | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 data/test/images/ocr_recognition_document.png diff --git a/data/test/images/ocr_recognition_document.png b/data/test/images/ocr_recognition_document.png new file mode 100644 index 00000000..d74018bb --- /dev/null +++ b/data/test/images/ocr_recognition_document.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29f2ad929c852f6456367054d13e113078cf06b763fe54d73fd324f789331aa3 +size 61611 diff --git a/modelscope/pipelines/builder.py b/modelscope/pipelines/builder.py index 22afc9e6..4105e28b 100644 --- a/modelscope/pipelines/builder.py +++ b/modelscope/pipelines/builder.py @@ -124,8 +124,9 @@ DEFAULT_MODEL_FOR_PIPELINE = { Tasks.image_classification: (Pipelines.daily_image_classification, '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, 'damo/cv_unet_skin-retouching'), Tasks.crowd_counting: (Pipelines.crowd_counting, diff --git a/tests/pipelines/test_ocr_recognition.py b/tests/pipelines/test_ocr_recognition.py index 29acaced..a2e5ba8e 100644 --- a/tests/pipelines/test_ocr_recognition.py +++ b/tests/pipelines/test_ocr_recognition.py @@ -19,19 +19,19 @@ from modelscope.utils.test_utils import test_level class OCRRecognitionTest(unittest.TestCase): 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' def pipeline_inference(self, pipeline: Pipeline, input_location: str): result = pipeline(input_location) 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): ocr_recognition = pipeline(Tasks.ocr_recognition, model=self.model_id) 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): ocr_recognition = pipeline(Tasks.ocr_recognition, model=self.model_id) imagePIL = PIL.Image.open(self.test_image)