joonmyung 1.5.8__tar.gz → 1.5.10__tar.gz

{joonmyung-1.5.8 → joonmyung-1.5.10}/PKG-INFO

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

{joonmyung-1.5.8 → joonmyung-1.5.10}/joonmyung/analysis/analysis.py

@@ -14,17 +14,12 @@ import cv2
 
 def anaModel(transformer_class):
     class VisionTransformer(transformer_class):
-        def has_parameter(self, parameter_name):
-            return parameter_name in self.__init__.__code__.co_varnames
-
         def forward_features(self, x):
             x = self.patch_embed(x)
-            if self.has_parameter("cls_token"):
+            if hasattr(self, "cls_token"):
                 cls_token = self.cls_token.expand(x.shape[0], -1, -1)  # stole cls_tokens impl from Phil Wang, thanks
                 x = torch.cat((cls_token, x), dim=1)
 
-
-
             if self.analysis[0] == 1:   # PATCH
                 x = x # (8, 197, 192)
             elif self.analysis[0] == 2: # POS
@@ -39,27 +34,27 @@ def anaModel(transformer_class):
 
             x = self.blocks(x)
             x = self.norm(x)
-            if self.has_parameter("cls_token") and self.has_parameter("dist_token"):
+            if hasattr(self, "cls_token") and hasattr(self, "cls_token"):
                 return x[:, 0], x[:, 1]
-            elif self.has_parameter("cls_token"):
+            elif hasattr(self, "cls_token"):
                 return self.pre_logits(x[:, 0])
             else:
                 return self.pre_logits(x.mean(dim=1))
 
-
     return VisionTransformer
 
 class Analysis:
     def __init__(self, model, analysis = [0], activate = [True, False, False, False], detach=True, key_name=None, num_classes = 1000
-                 , cls_start=0, cls_end=1, patch_start=1, patch_end=None
+                 , cls_start=0, cls_end=1, patch_start=1, patch_end=None, wrapping=False
                  , amp_autocast=suppress, device="cuda"):
         # Section A. Model
         self.num_classes = num_classes
         self.key_name = key_name
+        if wrapping:
+            model_ = anaModel(model.__class__)
+            model.__class__ = model_
+            model.analysis = analysis
 
-        model_ = anaModel(model.__class__)
-        model.__class__ = model_
-        model.analysis = analysis
         self.model = model
         self.detach = detach
 

{joonmyung-1.5.8 → joonmyung-1.5.10}/joonmyung/analysis/dataset.py

@@ -66,7 +66,7 @@ class JDataset():
         sample = default_loader(img_path)
         sample = self.transform[self.transform_type](sample)
 
-        return sample[None].to(self.device), torch.tensor(label_num).to(self.device), self.label_name[label_num]
+        return sample[None].to(self.device), torch.tensor(label_num).to(self.device), self.label_name[int(label_num)]
 
     def getItems(self, indexs):
         ds, ls, lns = [], [], []
@@ -126,7 +126,7 @@ class JDataset():
 if __name__ == "__main__":
     root_path = "/hub_data1/joonmyung/data/imagenet"
     dataset = "imagenet"
-    dataset = JDataset(root_path, dataset, train=True, )
+    dataset = JDataset(root_path, dataset, train=False)
     d, l, l_n  = dataset[[10, 3]]
     # samples = dataset.getitems([[0,1], [0,2], [0,3]])
     print(1)

{joonmyung-1.5.8 → joonmyung-1.5.10}/joonmyung/script.py

@@ -97,7 +97,7 @@ class GPU_Worker():
         return
 
     def message(self, text):
-        url = "https://hooks.slack.com/services/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"
+        url = "https://hooks.slack.com/services/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"
         payload = {"text": text}
         headers = {'Content-type': 'application/json'}
 

{joonmyung-1.5.8 → joonmyung-1.5.10}/joonmyung.egg-info/PKG-INFO

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

{joonmyung-1.5.8 → joonmyung-1.5.10}/setup.py

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