joonmyung 1.5.7__tar.gz → 1.5.9__tar.gz

{joonmyung-1.5.7 → joonmyung-1.5.9}/PKG-INFO

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

{joonmyung-1.5.7 → joonmyung-1.5.9}/joonmyung/analysis/__init__.py

@@ -1,5 +1,4 @@
 from .analysis import *
 from .dataset import *
 from .metric import *
-from .model import *
-from .hook import *
+from .model import *

{joonmyung-1.5.7 → joonmyung-1.5.9}/joonmyung/analysis/analysis.py

@@ -1,20 +1,14 @@
-import os
-os.environ["CUDA_VISIBLE_DEVICES"] = "1"
 from joonmyung.analysis.dataset import JDataset
 from joonmyung.analysis.model import JModel
-from joonmyung.draw import saliency, overlay, drawImgPlot, drawHeatmap, unNormalize
+from joonmyung.draw import saliency, overlay, drawImgPlot, unNormalize
 from joonmyung.meta_data import data2path
-from joonmyung.data import getTransform
 from joonmyung.metric import targetPred, accuracy
 from joonmyung.log import AverageMeter
-from joonmyung.utils import to_leaf, to_np
 from tqdm import tqdm
 from contextlib import suppress
-import matplotlib.pyplot as plt
 import torch.nn.functional as F
 import numpy as np
 import torch
-import PIL
 import cv2
 
 

{joonmyung-1.5.7 → joonmyung-1.5.9}/joonmyung/analysis/dataset.py

@@ -1,13 +1,12 @@
-from torchvision.transforms import InterpolationMode
 from joonmyung.meta_data.label import imnet_label, cifar_label
 from torchvision.datasets.folder import default_loader
+from torchvision.transforms import InterpolationMode
 from timm.data import create_dataset, create_loader
 from torchvision import transforms
 from joonmyung.utils import getDir
 import torch
 import copy
 import glob
-import PIL
 import os
 
 
@@ -34,7 +33,7 @@ class JDataset():
                     }
     }
 
-    def __init__(self, data_path="/hub_data1/joonmyung/data", dataset="imagenet", train=False, transform_type = 0,
+    def __init__(self, data_path="/hub_data1/joonmyung/data/imagenet", dataset="imagenet", train=False, transform_type = 0,
                  distribution = None, size = None, device="cuda"):
         self.dataset = dataset.lower()
         setting = self.settings[self.dataset]
@@ -56,21 +55,18 @@ class JDataset():
         self.label_paths = sorted(getDir(os.path.join(self.data_path, self.data_type)))
 
         # self.img_paths   = [sorted(glob.glob(os.path.join(self.data_path, self.data_type, "*", "*")))]
-        self.img_paths   = [[path, idx] for idx, label_path in enumerate(self.label_paths) for path in sorted(glob.glob(os.path.join(self.data_path, self.data_type, label_path, "*")))]
+        # self.img_paths   = [[path, idx] for idx, label_path in enumerate(self.label_paths) for path in sorted(glob.glob(os.path.join(self.data_path, self.data_type, label_path, "*")))]
+        self.img_paths = [sorted(glob.glob(os.path.join(self.data_path, self.data_type, label_path, "*"))) for label_path in self.label_paths]
 
 
     def __getitem__(self, idx):
-        if type(idx) == tuple:
-            idx, transform_type = idx
-        else:
-            transform_type = self.transform_type
-
-        [img_path, targets] = [idx, 0] if type(idx) == str else self.img_paths[idx]
+        label_num, img_num = idx
+        img_path = self.img_paths[label_num][img_num]
 
         sample = default_loader(img_path)
-        sample = self.transform[transform_type](sample)
+        sample = self.transform[self.transform_type](sample)
 
-        return sample[None].to(self.device), torch.tensor(targets).to(self.device), self.label_name[targets]
+        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 = [], [], []
@@ -81,16 +77,6 @@ class JDataset():
             lns.append(ln)
         return torch.cat(ds, dim=0), torch.stack(ls, dim=0), lns
 
-    def getIndex(self, c: list = [0, 1000], i: list = [0, 50]):
-        [c_s, c_e], [i_s, i_e] = c, i
-        c = torch.arange(c_s, c_e).reshape(-1, 1).repeat(1, i_e - i_s).reshape(-1)
-        i = torch.arange(i_s, i_e).reshape(1, -1).repeat(c_e - c_s, 1).reshape(-1)
-        c_i = torch.stack([c, i], dim=-1)
-        return c_i
-
-    def __len__(self):
-        return
-
     def getAllItems(self, batch_size=32):
         dataset = create_dataset(
             root=self.data_path, name="IMNET"
@@ -111,6 +97,17 @@ class JDataset():
             tf_preprocessing=False)
         return loader
 
+    def getIndex(self, c: list = [0, 1000], i: list = [0, 50]):
+        [c_s, c_e], [i_s, i_e] = c, i
+        c = torch.arange(c_s, c_e).reshape(-1, 1).repeat(1, i_e - i_s).reshape(-1)
+        i = torch.arange(i_s, i_e).reshape(1, -1).repeat(c_e - c_s, 1).reshape(-1)
+        c_i = torch.stack([c, i], dim=-1)
+        return c_i
+
+    def __len__(self):
+        return
+
+
     def validation(self, data):
         return data.lower()
 
@@ -127,9 +124,9 @@ class JDataset():
         return result
 
 if __name__ == "__main__":
-    root_path = "/hub_data1/joonmyung/data"
+    root_path = "/hub_data1/joonmyung/data/imagenet"
     dataset = "imagenet"
-    dataset = JDataset(root_path, dataset, train=True, )
-    d, l, l_n  = dataset[0, 1]
-    samples = dataset.getitems([[0,1], [0,2], [0,3]])
+    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.7 → joonmyung-1.5.9}/joonmyung/analysis/metric.py

@@ -1,7 +1,6 @@
-import torch
-
 from joonmyung.log import MetricLogger
 from joonmyung.metric import accuracy
+import torch
 
 
 @torch.no_grad()

{joonmyung-1.5.7 → joonmyung-1.5.9}/joonmyung/analysis/model.py

@@ -1,7 +1,5 @@
 from collections import OrderedDict
-from joonmyung.utils import isDir
 from timm import create_model
-import models.deit
 import torch
 import os
 

{joonmyung-1.5.7 → joonmyung-1.5.9}/joonmyung/analysis/utils.py

@@ -1,6 +1,3 @@
-
-
-
 def get_update_param(model):
     return [k for k, v in model.named_parameters() if v.requires_grad == True]
 

{joonmyung-1.5.7 → joonmyung-1.5.9}/joonmyung.egg-info/PKG-INFO

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

{joonmyung-1.5.7 → joonmyung-1.5.9}/setup.py

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