Merge pull request #33 from pathomx/intelligent_queue

Merge branch development for improved Queue and Scheduling

pathomx/Pathomx.py

@@ -428,8 +428,6 @@ def do_open_demo(f):
         # IPython Widget for internal (user) console
         self.console = RichIPythonWidget()
         self.console._call_tip = lambda: None
-        self.console.kernel_manager = notebook_queue.in_process_runner.kernel_manager
-        self.console.kernel_client = notebook_queue.in_process_runner.kernel_client
 
         self.central = QTabWidget()
         self.central.setDocumentMode(True)
@@ -1191,7 +1189,6 @@ def main():
     app.installTranslator(translator_mp)
 
     # We've got a qApp instance going, set up timers
-    notebook_queue.create_user_kernel()
     notebook_queue.create_runners()
     notebook_queue.start_timers()
     '''

pathomx/globals.py

@@ -7,7 +7,7 @@
 from collections import defaultdict
 
 from .qt import *
-from .runqueue import RunManager
+from .runqueue import Queue
 from pyqtconfig import QSettingsManager
 from yapsy.PluginManager import PluginManagerSingleton
 
@@ -45,7 +45,7 @@
     # Manager objects
     logging.debug('Setting up managers...')
     styles = StylesManager()
-    notebook_queue = RunManager()
+    notebook_queue = Queue()
 
     settings = QSettingsManager()
     settings.set_defaults({

pathomx/kernel_helpers.py

@@ -44,10 +44,10 @@ def __init__(self, name, *args, **kwargs):
         self._name = name
 
 
-def pathomx_notebook_start(varsi, vars):
+def pathomx_notebook_start(vars):
 
-    for k, v in varsi.items():
-        vars[k] = v
+    #for k, v in varsi.items():
+    #    vars[k] = v
 
     # _keep_input_vars = ['styles']
     # vars['_pathomx_exclude_input_vars'] = [x for x in varsi.keys() if x not in _keep_input_vars]
@@ -60,16 +60,20 @@ def pathomx_notebook_start(varsi, vars):
             else:
                 vars[k] = None
 
-    if 'rcParams' in vars:
+    if '_rcParams' in vars:
         global rcParams
         from matplotlib import rcParams
 
         # Block warnings from deprecated rcParams here
         with warnings.catch_warnings():
             warnings.simplefilter("ignore")
-            for k, v in vars['rcParams'].items():
+            for k, v in vars['_rcParams'].items():
                 rcParams[k] = v
 
+    # Legacy shim
+    if '_styles' in vars:
+        vars['styles'] = vars['_styles']
+
 
 def pathomx_notebook_stop(vars):
     varso = {}