joonmyung 1.4.0__tar.gz → 1.4.2__tar.gz

{joonmyung-1.4.0 → joonmyung-1.4.2}/PKG-INFO

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

{joonmyung-1.4.0 → joonmyung-1.4.2}/README.md

@@ -14,6 +14,12 @@ JoonMyung Choi's Package
 
 
 # 3. Previous
+## Version 1.4.1
+1. joonmyung/log
+ - [X] wandb table 저장 오류 수정
+2. joonmyung/utils
+ - [X] str2list 띄어쓰기 오류 수정
+
 ## Version 1.4.0
 1. joonmyung/app.py
  - [X] 실험 도중 스크립트 추가 기능

{joonmyung-1.4.0 → joonmyung-1.4.2}/joonmyung/draw.py

@@ -168,8 +168,6 @@ def rollout(attentions=None, gradients=None, head_fusion="mean", discard_ratios
         attentions = attentions.min(axis=2)[0]
     elif head_fusion == "median":
         attentions = attentions.median(axis=2)[0]
-    else:
-        raise "Attention head fusion type Not supported"
 
     if bs is not None:
         attentions = attentions[:, bs]

{joonmyung-1.4.0 → joonmyung-1.4.2}/joonmyung/log.py

@@ -72,21 +72,31 @@ class Logger():
     def resetLog(self):
         self.loggers = {k:AverageMeter() if type(v) == AverageMeter else v for k, v in self.loggers.items()}
 
-    def addLog(self, datas:dict, epoch=None, mae_task_type = None, bs = 1):
-        for k, v in datas.items():
-            data_type = v[0]
-            if data_type == 0:  # Values
-                self.loggers[k] = v[1]
-            elif data_type == 1: # AverageMeter
-                if k not in self.loggers.keys():
-                    self.loggers[k] = AverageMeter()
-                self.loggers[k].update(v[1], bs)
-            elif data_type == 2: # Table
-                columns = list(v[1].keys())
-                data_num = len(list(v[1].values())[0])
-                self.loggers[k] = wandb.Table(columns=["epoch", "MTT"] + columns)
-                for idx in range(data_num):
-                    self.loggers[k].add_data(str(epoch), str(mae_task_type), *[wandb.Image(to_np(data2PIL(v[1][k][idx]))) if len(v[1][k].shape) == 4 else to_np(v[1][k])[idx] for k in columns])
+    def addLog(self, datas:dict, epoch=None, bs = 1):
+        if self.validation():
+            for k, v in datas.items():
+                data_type = v[0]
+                if data_type == 0:  # Values
+                    self.loggers[k] = v[1]
+                elif data_type == 1: # AverageMeter
+                    if k not in self.loggers.keys():
+                        self.loggers[k] = AverageMeter()
+                    self.loggers[k].update(v[1], bs)
+                elif data_type == 2: # Table
+                    columns = list(v[1].keys())
+                    data_num = len(list(v[1].values())[0])
+                    self.loggers[k] = wandb.Table(columns=["epoch"] + columns)
+                    for idx in range(data_num):
+                        results = []
+                        for c in columns:
+                            if type(v[1][c]) == torch.Tensor:
+                                result = wandb.Image(to_np(data2PIL(v[1][c][idx]))) if len(v[1][c].shape) == 4 else to_np(v[1][c])[idx]
+                            elif type(v[1][c]) == list:
+                                result = v[1][c][idx]
+                            else:
+                                raise ValueError
+                            results.append(result)
+                        self.loggers[k].add_data(str(epoch), *results)
         return True
 
     def getPath(self):
@@ -109,6 +119,7 @@ class Logger():
     def validation(self):
         return True if self.use_wandb else False
 
+
 if __name__ == "__main__":
     from playground.analysis.lib_import import *
     dataset_name, server, device = "imagenet", "148", "cuda"

{joonmyung-1.4.0 → joonmyung-1.4.2}/joonmyung/utils.py

@@ -24,7 +24,7 @@ def to_tensor(vs):
 
 
 def str2list(s):
-    v = ast.literal_eval(s.replace(" ", ",").replace(",,", ","))
+    v = ast.literal_eval(s.replace(" ", ""))
     if type(v) is not list:
         raise argparse.ArgumentTypeError("Argument \"%s\" is not a list" % (s))
     return v

{joonmyung-1.4.0 → joonmyung-1.4.2}/joonmyung.egg-info/PKG-INFO

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

{joonmyung-1.4.0 → joonmyung-1.4.2}/setup.py

@@ -2,7 +2,7 @@ import setuptools
 from setuptools import find_packages
 setuptools.setup(
     name="joonmyung",
-    version="1.4.0",
+    version="1.4.2",
     author="JoonMyung Choi",
     author_email="pizard@korea.ac.kr",
     description="JoonMyung's Library",