mg-pso-gui 0.0.207__tar.gz → 0.0.209__tar.gz

{mg-pso-gui-0.0.207 → mg-pso-gui-0.0.209}/PKG-INFO

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

{mg-pso-gui-0.0.207 → mg-pso-gui-0.0.209}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.0.207 → mg-pso-gui-0.0.209}/mgpsogui/util/PSORunner.py

@@ -78,25 +78,35 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder):
     
     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'])
-                },
-        )  
+    import threading
+
+    def run_optimizer_thread(steps, calibration_map, args, options, oh_strategy, results_queue):
+        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'])
+                    },
+            )
+        results_queue.put((optimizer, trace))
+
+    results_queue = Queue()
+    optimizer_thread = threading.Thread(target=run_optimizer_thread, args=(steps, calibration_map, args, options, oh_strategy, results_queue))
+    optimizer_thread.start()
+    optimizer_thread.join()
+    optimizer, trace = results_queue.get()
     
     stdour_thread.join()
     stderr_thread.join()

{mg-pso-gui-0.0.207 → mg-pso-gui-0.0.209}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = '0.0.207'
+VERSION = '0.0.209'
 DESCRIPTION = 'GUI for MG-PSO'
 LONG_DESCRIPTION = open('../README.md').read()