joonmyung 1.5.23__tar.gz → 1.6.1__tar.gz

{joonmyung-1.5.23 → joonmyung-1.6.1}/PKG-INFO

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

{joonmyung-1.5.23 → joonmyung-1.6.1}/joonmyung/analysis/dataset.py

@@ -21,8 +21,8 @@ class JDataset():
                     "num_classes"   : 1000,
                     "data_types"    : ["val", "train"],
                     "label_name"    : imnet_label,
-                    # "distributions" : {"mean": [0.485, 0.456, 0.406], "std": [0.229, 0.224, 0.225]},
-                    "distributions" : {"mean": [0.48145466, 0.4578275, 0.40821073], "std": [0.26862954, 0.26130258, 0.27577711]},
+                    "distributions" : {"mean": [0.485, 0.456, 0.406], "std": [0.229, 0.224, 0.225]}, # DEIT PAPER
+                    # "distributions" : {"mean": [0.48145466, 0.4578275, 0.40821073], "std": [0.26862954, 0.26130258, 0.27577711]}, # CLIP
                     "size": (224, 224)
                     },
                 "cifar100" : {
@@ -45,8 +45,8 @@ class JDataset():
         size                = size if size else setting["size"]
 
         self.transform = [
-                transforms.Compose([transforms.Resize((256, 256), interpolation=InterpolationMode.BICUBIC), transforms.CenterCrop(size), transforms.ToTensor(), transforms.Normalize(self.distribution["mean"], self.distribution["std"])]),
-                transforms.Compose([transforms.Resize((256, 256), interpolation=InterpolationMode.BICUBIC), transforms.CenterCrop(size), transforms.ToTensor()]),
+                transforms.Compose([transforms.Resize(256, interpolation=InterpolationMode.BICUBIC), transforms.CenterCrop(size), transforms.ToTensor(), transforms.Normalize(self.distribution["mean"], self.distribution["std"])]), # DEIT PAPER
+                transforms.Compose([transforms.Resize(256, interpolation=InterpolationMode.BICUBIC), transforms.CenterCrop(size), transforms.ToTensor()]),
                 transforms.Compose([transforms.Resize(224, interpolation=InterpolationMode.BICUBIC), transforms.CenterCrop(size), transforms.ToTensor(), transforms.Normalize(self.distribution["mean"], self.distribution["std"])]),
                 transforms.Compose([transforms.Resize(224, interpolation=InterpolationMode.BICUBIC), transforms.CenterCrop(size), transforms.ToTensor()]),
                 transforms.Compose([transforms.ToTensor()])

{joonmyung-1.5.23 → joonmyung-1.6.1}/joonmyung/script.py

@@ -60,6 +60,7 @@ class GPU_Worker():
             if len(availGPUs) < self.need_gpu:
                 if self.p:
                     print(f"{count} | AVAIL/NEED/RUNNING GPUS : {list(availGPUs)}/{self.need_gpu}/{list(self.runGPUs.keys())}")
+                    # print(f"{count} | DONE/REMAIN GPUS : ")
                 time.sleep(self.waitTime)
             else:
                 break
@@ -88,16 +89,20 @@ class GPU_Worker():
             self.runGPUs[int(gpu)] = p
 
     def waitForEnd(self):
+        time.sleep(self.waitTimeInit)
+
         count = 0
-        while self.check_process():
+        while True:
+            self.check_process()
             if self.p:
                 count += 1
                 print(f"{count}  |  CURRENT RUNNING GPUS : {list(self.runGPUs.keys())}")
             time.sleep(self.waitTime)
+            if not len(self.runGPUs):
+                break
         return
 
-    def message(self, text):
-        url = "https://hooks.slack.com/services/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"
+    def message(self, text, url):
         payload = {"text": text}
         headers = {'Content-type': 'application/json'}
 
@@ -105,17 +110,22 @@ class GPU_Worker():
 
         return response
 
-def Process_Worker(processes, gpuWorker, m = None, p = False):
-    # TODO : 실험이 완전히 끝난 시간 체크할 필요가 존재함
+def Process_Worker(processes, gpuWorker, s = 0, url = None, server = None):
     start = time.localtime()
     print("------ Start Running!! : {} ------".format(time2str(start)))
+    if url:
+        gpuWorker.message(f"Experiments Start \n"  
+                          f"Server {server} \n",
+                          url = url)
 
     for i, process in enumerate(tqdm(processes)):
+        if type(process) == list:
+            process = " && ".join(process)
         gpus = gpuWorker.getGPU()
-        prefix = f"CUDA_VISIBLE_DEVICES={gpus} nohup sh -c \'"
-        suffix = f"\' > {i+1}:gpu{gpus}.log 2>&1 "
-        if p:
-            print("------ {}:GPU{}  {} ------".format(i + 1, gpus, prefix + process + suffix))
+        prefix = f"CUDA_VISIBLE_DEVICES={gpus} nohup bash -c '"
+        suffix = f"' > {s+i+1}:gpu{gpus}.log 2>&1 "
+
+        print(f"{i + 1}/{len(processes)} : GPU{gpus} {prefix + process + suffix}")
         session = subprocess.Popen(prefix + process + suffix, shell=True)
         gpuWorker.register_process(gpus, session)
     gpuWorker.waitForEnd()
@@ -124,10 +134,11 @@ def Process_Worker(processes, gpuWorker, m = None, p = False):
     print("------ End Running!!   : {} ------".format(time2str(end)))
     training_time = datetime.timedelta(seconds=time.mktime(end) - time.mktime(start))
     print(f"Time 1/all :  {training_time}/{training_time / len(processes)} ------")
-    if m:
-        gpuWorker.message(f"Experiments Finished {m} : "  
-                          f"Time 1/all : {training_time}/{training_time / len(processes)}"
-                          )
+    if url:
+        gpuWorker.message(f"Experiments Finished \n"  
+                          f"Server {server} \n"
+                          f"Time 1/all : {training_time / len(processes)} / {training_time}",
+                          url = url)
 
 
 if __name__ == '__main__':

{joonmyung-1.5.23 → joonmyung-1.6.1}/joonmyung.egg-info/PKG-INFO

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

{joonmyung-1.5.23 → joonmyung-1.6.1}/setup.py

@@ -7,7 +7,7 @@ def fetch_requirements(filename):
 
 setuptools.setup(
     name="joonmyung",
-    version="1.5.23",
+    version="1.6.1",
     author="JoonMyung Choi",
     author_email="pizard@korea.ac.kr",
     description="JoonMyung's Library",