根据反馈 将用到的util_func 放入modelscope/utils/cv 下
Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/9759481
master
| @@ -0,0 +1,18 @@ | |||||
| import cv2 | |||||
| import numpy as np | |||||
| def numpy_to_cv2img(vis_img): | |||||
| """to convert a np.array Hotmap with shape(h, w) to cv2 img | |||||
| Args: | |||||
| vis_img (np.array): input data | |||||
| Returns: | |||||
| cv2 img | |||||
| """ | |||||
| vis_img = (vis_img - vis_img.min()) / ( | |||||
| vis_img.max() - vis_img.min() + 1e-5) | |||||
| vis_img = (vis_img * 255).astype(np.uint8) | |||||
| vis_img = cv2.applyColorMap(vis_img, cv2.COLORMAP_JET) | |||||
| return vis_img | |||||
| @@ -3,9 +3,6 @@ | |||||
| import inspect | import inspect | ||||
| import os | import os | ||||
| import cv2 | |||||
| import numpy as np | |||||
| # TODO: remove this api, unify to flattened args | # TODO: remove this api, unify to flattened args | ||||
| def func_receive_dict_inputs(func): | def func_receive_dict_inputs(func): | ||||
| @@ -39,19 +36,3 @@ def get_default_cache_dir(): | |||||
| default_cache_dir = os.path.expanduser( | default_cache_dir = os.path.expanduser( | ||||
| os.path.join('~/.cache', 'modelscope')) | os.path.join('~/.cache', 'modelscope')) | ||||
| return default_cache_dir | return default_cache_dir | ||||
| def numpy_to_cv2img(vis_img): | |||||
| """to convert a np.array Hotmap with shape(h, w) to cv2 img | |||||
| Args: | |||||
| vis_img (np.array): input data | |||||
| Returns: | |||||
| cv2 img | |||||
| """ | |||||
| vis_img = (vis_img - vis_img.min()) / ( | |||||
| vis_img.max() - vis_img.min() + 1e-5) | |||||
| vis_img = (vis_img * 255).astype(np.uint8) | |||||
| vis_img = cv2.applyColorMap(vis_img, cv2.COLORMAP_JET) | |||||
| return vis_img | |||||
| @@ -8,7 +8,7 @@ from PIL import Image | |||||
| from modelscope.outputs import OutputKeys | from modelscope.outputs import OutputKeys | ||||
| from modelscope.pipelines import pipeline | from modelscope.pipelines import pipeline | ||||
| from modelscope.utils.constant import Tasks | from modelscope.utils.constant import Tasks | ||||
| from modelscope.utils.file_utils import numpy_to_cv2img | |||||
| from modelscope.utils.cv.heatmap import numpy_to_cv2img | |||||
| from modelscope.utils.logger import get_logger | from modelscope.utils.logger import get_logger | ||||
| from modelscope.utils.test_utils import test_level | from modelscope.utils.test_utils import test_level | ||||