From 9c2ca892ce727ca33896e747391471af4e76da5a Mon Sep 17 00:00:00 2001 From: zhk1425734486 <73321165+zhk1425734486@users.noreply.github.com> Date: Wed, 15 Mar 2023 21:21:24 +0800 Subject: [PATCH] Landing AI: tbs detetion pull request (revise image_open) (#184) * open image using load_image * format code --------- Co-authored-by: QZStudio <1643006760@qq.com> Co-authored-by: wenmeng.zwm --- modelscope/models/cv/ocr_recognition/preprocessor.py | 1 - modelscope/pipelines/cv/tbs_detection_utils/utils.py | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modelscope/models/cv/ocr_recognition/preprocessor.py b/modelscope/models/cv/ocr_recognition/preprocessor.py index 146b0184..6405e3e4 100644 --- a/modelscope/models/cv/ocr_recognition/preprocessor.py +++ b/modelscope/models/cv/ocr_recognition/preprocessor.py @@ -7,7 +7,6 @@ import cv2 import numpy as np import PIL import torch -import math from modelscope.metainfo import Preprocessors from modelscope.preprocessors import Preprocessor, load_image diff --git a/modelscope/pipelines/cv/tbs_detection_utils/utils.py b/modelscope/pipelines/cv/tbs_detection_utils/utils.py index ab2eb8cc..9562f89d 100644 --- a/modelscope/pipelines/cv/tbs_detection_utils/utils.py +++ b/modelscope/pipelines/cv/tbs_detection_utils/utils.py @@ -10,6 +10,8 @@ from matplotlib import pyplot as plt from PIL import Image from torchvision.ops.boxes import batched_nms, nms +from modelscope.preprocessors.image import load_image + plt.switch_backend('Agg') @@ -365,7 +367,7 @@ def post_process(self, outputs, img_path): except Exception: return - image = Image.open(img_path) + image = load_image(img_path) image_shape = np.array(np.shape(image)[0:2]) top_index = batch_detection[:, 4] * batch_detection[:,