joonmyung 1.5.1__tar.gz → 1.5.2__tar.gz

{joonmyung-1.5.1 → joonmyung-1.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: joonmyung
-Version: 1.5.1
+Version: 1.5.2
 Summary: JoonMyung's Library
 Home-page: https://github.com/pizard/JoonMyung.git
 Author: JoonMyung Choi

{joonmyung-1.5.1 → joonmyung-1.5.2}/joonmyung/draw.py

@@ -225,20 +225,27 @@ def saliency(attentions=None, gradients=None, head_fusion="mean",
 
 
 def data2PIL(datas):
-    if type(datas) == torch.Tensor:
-        if len(datas.shape) == 2:
+    if type(datas) == torch.Tensor: # MAKE TO (..., H, W, 3)
+        if datas.shape[-1] == 3:
+            pils = datas
+        elif len(datas.shape) == 2:
             pils = datas.unsqueeze(-1).detach().cpu()
-        if len(datas.shape) == 3:
+        elif len(datas.shape) == 3:
             pils = datas.permute(1, 2, 0).detach().cpu()
         elif len(datas.shape) == 4:
             pils = datas.permute(0, 2, 3, 1).detach().cpu()
     elif type(datas) == np.ndarray:
-        if len(datas.shape) == 3: datas = np.expand_dims(datas, axis=0)
-        if datas.max() <= 1:
-            # image = Image.fromarray(image)                 # 0.32ms
-            pils = cv2.cvtColor(datas, cv2.COLOR_BGR2RGB)   # 0.29ms
-        else:
-            pils = datas
+        if len(datas.shape) == 2:
+            datas = np.expand_dims(datas, axis=-1)
+        # TODO NEED TO CHECK
+        # if datas.max() <= 1:
+        #     pils = cv2.cvtColor(datas, cv2.COLOR_BGR2RGB)  # 0.29ms
+        # else:
+        #     pils = datas
+
+        # image = Image.fromarray(image)                 # 0.32ms
+        pils = cv2.cvtColor(datas, cv2.COLOR_BGR2RGB)  # 0.29ms
+
     elif type(datas) == PIL.JpegImagePlugin.JpegImageFile \
          or type(datas) == PIL.Image.Image:
         pils = datas
@@ -246,6 +253,7 @@ def data2PIL(datas):
         raise ValueError
     return pils
 
+
 def drawImgPlot(datas:list, col=1, title:str=None, columns=None, showRows:list=None,
                 output_dir='./', save_name=None, show=True, fmt=1,
                 vis_x = False, vis_y = False, border=False, p=False):

{joonmyung-1.5.1 → joonmyung-1.5.2}/joonmyung.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: joonmyung
-Version: 1.5.1
+Version: 1.5.2
 Summary: JoonMyung's Library
 Home-page: https://github.com/pizard/JoonMyung.git
 Author: JoonMyung Choi

{joonmyung-1.5.1 → joonmyung-1.5.2}/setup.py

@@ -3,7 +3,7 @@ from setuptools import find_packages
 
 setuptools.setup(
     name="joonmyung",
-    version="1.5.1",
+    version="1.5.2",
     author="JoonMyung Choi",
     author_email="pizard@korea.ac.kr",
     description="JoonMyung's Library",
@@ -26,5 +26,4 @@ setuptools.setup(
 # rm -rf ./*.egg-info ./dist/*
 
 # python setup.py sdist; python -m twine upload dist/*
-# ID:JoonmyungChoi
-
+# ID:JoonmyungChoi