From 8ce641fd0c56ed442fd74354aa9f61a65c2e63c7 Mon Sep 17 00:00:00 2001
From: "ashui.cbh" <ashui.cbh@alibaba-inc.com>
Date: Mon, 15 Aug 2022 18:14:11 +0800
Subject: [PATCH] [to #42322933]create utils/cv/heatmap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

根据反馈 将用到的util_func 放入modelscope/utils/cv 下
        Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/9759481
---
 modelscope/utils/cv/__init__.py        |  0
 modelscope/utils/cv/heatmap.py         | 18 ++++++++++++++++++
 modelscope/utils/file_utils.py         | 19 -------------------
 tests/pipelines/test_crowd_counting.py |  2 +-
 4 files changed, 19 insertions(+), 20 deletions(-)
 create mode 100644 modelscope/utils/cv/__init__.py
 create mode 100644 modelscope/utils/cv/heatmap.py

diff --git a/modelscope/utils/cv/__init__.py b/modelscope/utils/cv/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/modelscope/utils/cv/heatmap.py b/modelscope/utils/cv/heatmap.py
new file mode 100644
index 00000000..4d248a92
--- /dev/null
+++ b/modelscope/utils/cv/heatmap.py
@@ -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
diff --git a/modelscope/utils/file_utils.py b/modelscope/utils/file_utils.py
index 6d4fcc59..a04d890f 100644
--- a/modelscope/utils/file_utils.py
+++ b/modelscope/utils/file_utils.py
@@ -3,9 +3,6 @@
 import inspect
 import os
 
-import cv2
-import numpy as np
-
 
 # TODO: remove this api, unify to flattened args
 def func_receive_dict_inputs(func):
@@ -39,19 +36,3 @@ def get_default_cache_dir():
     default_cache_dir = os.path.expanduser(
         os.path.join('~/.cache', 'modelscope'))
     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
diff --git a/tests/pipelines/test_crowd_counting.py b/tests/pipelines/test_crowd_counting.py
index a3c59378..1bd5a0dd 100644
--- a/tests/pipelines/test_crowd_counting.py
+++ b/tests/pipelines/test_crowd_counting.py
@@ -8,7 +8,7 @@ from PIL import Image
 from modelscope.outputs import OutputKeys
 from modelscope.pipelines import pipeline
 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.test_utils import test_level