joonmyung 1.5.22__tar.gz → 1.6.0__tar.gz

{joonmyung-1.5.22 → joonmyung-1.6.0}/PKG-INFO

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

{joonmyung-1.5.22 → joonmyung-1.6.0}/joonmyung/draw.py

@@ -27,7 +27,7 @@ def drawHeatmap(matrixes, col=1, title=[], fmt=1, p=False,
                 linecolor=None, linewidths=0.1, fontsize=30, r=[1,1],
                 cmap="Greys", cbar=True, border=False,
                 output_dir='./result', save_name=None, show=True,
-                vis_x= False, vis_y =  False):
+                vis_x= False, vis_y =  False, tqdm_disable=True):
     row = (len(matrixes) - 1) // col + 1
     annot = True if fmt > 0 else False
     if p:
@@ -59,7 +59,7 @@ def drawHeatmap(matrixes, col=1, title=[], fmt=1, p=False,
     fig.set_size_inches(col * 8 * r[1], row * 8 * r[0])
     # fig.set_size_inches(8, 8)
     fig.patch.set_facecolor('white')
-    for e, matrix in enumerate(tqdm(matrixes)):
+    for e, matrix in enumerate(tqdm(matrixes, desc="drawHeatmap", disable=tqdm_disable)):
         if type(matrix) == torch.Tensor:
             matrix = matrix.detach().cpu().numpy()
         ax = axes[e // col][e % col]
@@ -89,7 +89,7 @@ def drawHeatmap(matrixes, col=1, title=[], fmt=1, p=False,
         plt.show()
 
 
-def drawLinePlot(datas, index, col=1, title=[], xlabels=None, ylabels=None, markers=False, columns=None, p=False):
+def drawLinePlot(datas, index, col=1, title=[], xlabels=None, ylabels=None, markers=False, columns=None, p=False, ):
     row = (len(datas) - 1) // col + 1
     title = title + list(range(len(title), len(datas) - len(title)))
     fig, axes = plt.subplots(nrows=row, ncols=col, squeeze=False)
@@ -131,7 +131,7 @@ def drawLinePlot(datas, index, col=1, title=[], xlabels=None, ylabels=None, mark
     plt.tight_layout()
     plt.show()
 
-def drawBarChart(df, x, y, splitColName, col=1, title=[], fmt=1, p=False, c=False, c_sites={}, showfliers=True):
+def drawBarChart(df, x, y, splitColName, col=1, title=[], fmt=1, p=False, c=False, c_sites={}, showfliers=True, tqdm_disable=True):
     d2s = df[splitColName].unique()
     d1 = df['d1'].unique()[0]
     d2s = [d2 for d2 in d2s for c_site in c_sites[d1].keys() if c_site in d2]
@@ -140,7 +140,7 @@ def drawBarChart(df, x, y, splitColName, col=1, title=[], fmt=1, p=False, c=Fals
 
     fig, axes = plt.subplots(nrows=row, ncols=col, squeeze=False)
     fig.set_size_inches(col * 12, row * 12)
-    for e, d2 in enumerate(tqdm(d2s)):
+    for e, d2 in enumerate(tqdm(d2s, desc="drawBarChart", disable=tqdm_disable)):
         plt.title(d2, fontsize=20)
         ax = axes[e // col][e % col]
         temp = df.loc[df['d2'].isin([d2])]

{joonmyung-1.5.22 → joonmyung-1.6.0}/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.22 → joonmyung-1.6.0}/joonmyung.egg-info/PKG-INFO

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

{joonmyung-1.5.22 → joonmyung-1.6.0}/setup.py

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