mg-pso-gui 0.0.193__py3-none-any.whl → 0.0.194__py3-none-any.whl

{mg_pso_gui-0.0.193.dist-info → mg_pso_gui-0.0.194.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mg-pso-gui
-Version: 0.0.193
+Version: 0.0.194
 Summary: GUI for MG-PSO
 Author: Robert Cordingly
 Author-email: <rcording@uw.ed>

{mg_pso_gui-0.0.193.dist-info → mg_pso_gui-0.0.194.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mgpsogui/__init__.py,sha256=q7AfBjeJABnFtbsZnsObpUwaXKPDVYtz46G6MKXLF74,42
 mgpsogui/mgpsogui.py,sha256=NIZmyNcbwC8EgSwf1ubdMUSJscrIEgoD4jLYziqHQ-k,148
 mgpsogui/start.yaml,sha256=ZjCVLb-MLqAxrGRm9kA7_SDpa-45EuKIELNQ2QqCAiU,4713
-mgpsogui/gui/HomePage.py,sha256=Zd6g8URhhScwr6lmgz3c-1SK4aylDT-dK1HFB0opl90,24760
+mgpsogui/gui/HomePage.py,sha256=5bPiprgGXbEYfCS4Da0xHUectF1z8RfKu1w6fa7MCRQ,24969
 mgpsogui/gui/OptionManager.py,sha256=bFN2jWJbx1Din3waOFLmbWGt0BXD_KthGJ8Mgue_FEE,11712
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=KyIoHlMKD9nfQqHeGJwRDA4RCoe4UykjB2l6xMTKK_M,10486
@@ -28,13 +28,13 @@ mgpsogui/gui/images/refresh_hd.png,sha256=lprZtCNZ9JUm20SPwfaslr-VV4yzzmCPEB6oFf
 mgpsogui/gui/images/stop.png,sha256=JPuxXQerCGpLikcp7cAj3iLCOjULMYYZ2sZe0lArh68,2153
 mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ,2958
 mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
-mgpsogui/util/GraphGenerator.py,sha256=hEPhka0ZKQJ9DSSywDfwoXFQMsk3RHyG8QyTLOQnN4M,7851
-mgpsogui/util/PSORunner.py,sha256=6dx8kz_fODGKhG--oDW3gr9jNr_RAK311Cp1OY1jyuA,2983
+mgpsogui/util/GraphGenerator.py,sha256=_YCZRzB8f4qzj5LRhOLTFS9SZMUceRPBjdBTqm0JkbI,7850
+mgpsogui/util/PSORunner.py,sha256=s8ISdXe7VEYL4K4OXNpSk3pwde09pWYelgUfgmSwddA,6860
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/CTkToolTip/__init__.py,sha256=G1jxV55hGtGgwyC1sR-uUUdasDdh0XZgcI-aILgGYA0,225
 mgpsogui/util/CTkToolTip/ctk_tooltip.py,sha256=SZMovpQIGvdpDRbqCKl9SHs92DrFCO2MOYL2ifolvOE,6329
-mg_pso_gui-0.0.193.dist-info/METADATA,sha256=Z7EmvVSsFfbuu2BsiwZykqelGlGd6pZ5A88l4Mrygmk,9459
-mg_pso_gui-0.0.193.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-mg_pso_gui-0.0.193.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.0.193.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.0.193.dist-info/RECORD,,
+mg_pso_gui-0.0.194.dist-info/METADATA,sha256=qj_4-I6oxQP9hhPaAJIgi6BPA1FtDO1mG1z3YgKKnuw,9459
+mg_pso_gui-0.0.194.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+mg_pso_gui-0.0.194.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.0.194.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.0.194.dist-info/RECORD,,

mgpsogui/gui/HomePage.py

@@ -48,6 +48,10 @@ from ..util.CTkToolTip import CTkToolTip as ctt
 customtkinter.set_appearance_mode("Dark")  # Modes: "System" (standard), "Dark", "Light"
 customtkinter.set_default_color_theme("blue")  # Themes: "blue" (standard), "green", "dark-blue"
 
+results_queue = Queue()
+stdout_queue = Queue()
+stderr_queue = Queue()
+
 class App(customtkinter.CTk):
     def __init__(self):
         super().__init__()
@@ -341,8 +345,7 @@ class App(customtkinter.CTk):
             info = self.option_manager.get_project_data()
             folder = os.path.join(info['path'], info['name'])
             
-            self.process_queue = Queue()
-            self.train_process = Process(target=PSORunner.run_process, args=(self.process_queue, metrics, folder))
+            self.train_process = Process(target=PSORunner.run_process, args=(stdout_queue, stderr_queue, results_queue, metrics, folder))
             self.train_process.daemon = True
             self.train_process.start()
             self.after(1000, self.watch_loop)
@@ -403,6 +406,11 @@ class App(customtkinter.CTk):
             
         if not os.path.exists(folder):
             os.makedirs(folder)
+            
+        if (stdout_queue.qsize() > 0):
+            val = stdout_queue.get()
+            self.textbox.insert("0.0", val)
+            print(val)
         
         if (os.path.exists(os.path.join(folder, 'output.txt'))):
             with open(os.path.join(folder, 'output.txt'), 'r') as f:

mgpsogui/util/GraphGenerator.py

@@ -4,7 +4,7 @@ import pandas as pd
 import numpy as np
 import os
 
-def best_cost_stacked(config, dataframe, option_manager):
+def best_coststacked(config, dataframe, option_manager):
     fig = go.Figure()
         
     total_steps = len(config)

mgpsogui/util/PSORunner.py

@@ -1,6 +1,110 @@
 import csip
 import cosu
 import sys
+from multiprocessing import Process, Queue
+from queue import Empty
+import threading
+import time
+import os
+
+from cosu.pso import global_best
+
+def enqueue_output(out, queue):
+    for line in iter(out.readline, b''):
+        queue.put(line)
+    out.close()
+
+def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
+    steps = data['steps']
+    args = data['arguments']
+    calib = data['calibration_parameters']
+    
+    calibration_map = {}
+    for param in calib:
+        param_name = param['name']
+        param_value = param['value']
+        calibration_map[param_name] = param_value
+        
+    if not os.path.exists(folder):
+        os.makedirs(folder)
+
+    if (os.path.exists(os.path.join(folder, 'output.txt'))):
+        os.remove(os.path.join(folder, 'output.txt'))
+        
+    if (os.path.exists(os.path.join(folder, 'error.txt'))):
+        os.remove(os.path.join(folder, 'error.txt'))
+
+    #sys.stdout = open(os.path.join(folder, 'output.txt'), 'w', buffering=1)
+    #sys.stderr = open(os.path.join(folder, 'error.txt'), 'w', buffering=1)
+    
+    old_stdout = sys.stdout
+    old_stderr = sys.stderr
+    
+    read_stdout, write_stdout = os.pipe()
+    read_stderr, write_stderr = os.pipe()
+    
+    sys.stdout = os.fdopen(write_stdout, 'w')
+    sys.stderr = os.fdopen(write_stderr, 'w')
+    
+    stdour_thread = threading.Thread(target=enqueue_output, args=(os.fdopen(read_stdout, 'r'), stdout_queue))
+    stderr_thread = threading.Thread(target=enqueue_output, args=(os.fdopen(read_stderr, 'r'), stderr_queue))
+    stdour_thread.daemon = True
+    stderr_thread.daemon = True
+    stdour_thread.start()
+    stderr_thread.start()
+    
+    options = {}
+    oh_strategy = {}
+    
+    for key in calibration_map.keys():
+        if "options_" in key:
+            options[key.replace("options_", "")] = float(calibration_map[key])
+        if "strategy_" in key:
+            oh_strategy[key.replace("strategy_", "")] = calibration_map[key]
+
+    print("\n")
+    print(calibration_map)
+    print("\n")
+    print(options)
+    print("\n")
+    print(oh_strategy)
+    print("\n")
+    
+    print("Running global_best...\n")
+
+    optimizer, trace = global_best(steps,                 # step definition
+            rounds=(int(calibration_map['min_rounds']), int(calibration_map['max_rounds'])),                              # min/max number of rounds
+            args=args,                                  # static arguments    
+            n_particles=int(calibration_map['n_particles']),                             # number of particle candidates for each param
+            iters=int(calibration_map['iters']),                                   # max # of iterations
+            n_threads=int(calibration_map['n_threads']),                               # number of threads to use
+            # ftol=0.00000001,                          # min cost function delta for convergence
+            options=options,       # hyperparameter
+            oh_strategy=oh_strategy,   # adaptive hyperparameter adjustments based on current and max # of iterations 
+            conf={
+                'service_timeout': int(calibration_map['service_timeout']),
+                'http_retry': int(calibration_map['http_retry']),
+                'http_allow_redirects': True if calibration_map['allow_redirects'] == "True" else False,
+                'async_call': True if calibration_map['async_call'] == "True" else False,
+                'http_conn_timeout': int(calibration_map['conn_timeout']),
+                'http_read_timeout': int(calibration_map['read_timeout']),
+                'particles_fail': int(calibration_map['particles_fail'])
+                },
+        )  
+    
+    stdour_thread.join()
+    stderr_thread.join()
+    
+    sys.stdout = old_stdout
+    sys.stderr = old_stderr
+    results_queue.put((optimizer, trace))
+
+
+
+
+"""import csip
+import cosu
+import sys
 import multiprocessing
 import threading
 import time
@@ -50,7 +154,7 @@ def run_process(process_queue, data, folder):
     
     print("Running global_best...\n")
 
-    optimizer, trace  = global_best(steps,                 # step definition
+    optimizer, trace = global_best(steps,                 # step definition
             rounds=(int(calibration_map['min_rounds']), int(calibration_map['max_rounds'])),                              # min/max number of rounds
             args=args,                                  # static arguments    
             n_particles=int(calibration_map['n_particles']),                             # number of particle candidates for each param
@@ -72,3 +176,4 @@ def run_process(process_queue, data, folder):
     
     process_queue.put((optimizer, trace))
 
+"""