diff --git a/IPython/parallel/apps/baseapp.py b/IPython/parallel/apps/baseapp.py index a9458ae..3b03600 100755 --- a/IPython/parallel/apps/baseapp.py +++ b/IPython/parallel/apps/baseapp.py @@ -97,7 +97,6 @@ base_aliases = {} base_aliases.update(base_ip_aliases) base_aliases.update({ 'profile_dir' : 'ProfileDir.location', - 'log_level' : 'BaseParallelApplication.log_level', 'work_dir' : 'BaseParallelApplication.work_dir', 'log_to_file' : 'BaseParallelApplication.log_to_file', 'clean_logs' : 'BaseParallelApplication.clean_logs', diff --git a/IPython/parallel/apps/ipclusterapp.py b/IPython/parallel/apps/ipclusterapp.py index 193e1d0..29d9269 100755 --- a/IPython/parallel/apps/ipclusterapp.py +++ b/IPython/parallel/apps/ipclusterapp.py @@ -179,7 +179,7 @@ engine_aliases = {} engine_aliases.update(base_aliases) engine_aliases.update(dict( n='IPClusterEngines.n', - elauncher = 'IPClusterEngines.engine_launcher_class', + engines = 'IPClusterEngines.engine_launcher_class', daemonize = 'IPClusterEngines.daemonize', )) engine_flags = {} @@ -322,6 +322,7 @@ start_aliases.update(engine_aliases) start_aliases.update(dict( delay='IPClusterStart.delay', clean_logs='IPClusterStart.clean_logs', + controller = 'IPClusterStart.controller_launcher_class', )) class IPClusterStart(IPClusterEngines): diff --git a/IPython/parallel/apps/ipcontrollerapp.py b/IPython/parallel/apps/ipcontrollerapp.py index 3b18e7a..9ac1308 100755 --- a/IPython/parallel/apps/ipcontrollerapp.py +++ b/IPython/parallel/apps/ipcontrollerapp.py @@ -41,7 +41,8 @@ from IPython.core.profiledir import ProfileDir from IPython.parallel.apps.baseapp import ( BaseParallelApplication, - base_flags + base_aliases, + base_flags, ) from IPython.utils.importstring import import_item from IPython.utils.traitlets import Instance, Unicode, Bool, List, Dict @@ -109,6 +110,28 @@ flags.update(boolean_flag('secure', 'IPControllerApp.secure', "Use HMAC digests for authentication of messages.", "Don't authenticate messages." )) +aliases = dict( + reuse_files = 'IPControllerApp.reuse_files', + secure = 'IPControllerApp.secure', + ssh = 'IPControllerApp.ssh_server', + use_threads = 'IPControllerApp.use_threads', + location = 'IPControllerApp.location', + + ident = 'Session.session', + user = 'Session.username', + exec_key = 'Session.keyfile', + + url = 'HubFactory.url', + ip = 'HubFactory.ip', + transport = 'HubFactory.transport', + port = 'HubFactory.regport', + + ping = 'HeartMonitor.period', + + scheme = 'TaskScheduler.scheme_name', + hwm = 'TaskScheduler.hwm', +) +aliases.update(base_aliases) class IPControllerApp(BaseParallelApplication): @@ -151,35 +174,7 @@ class IPControllerApp(BaseParallelApplication): def _use_threads_changed(self, name, old, new): self.mq_class = 'zmq.devices.%sMonitoredQueue'%('Thread' if new else 'Process') - aliases = Dict(dict( - log_level = 'IPControllerApp.log_level', - log_url = 'IPControllerApp.log_url', - reuse_files = 'IPControllerApp.reuse_files', - secure = 'IPControllerApp.secure', - ssh = 'IPControllerApp.ssh_server', - use_threads = 'IPControllerApp.use_threads', - import_statements = 'IPControllerApp.import_statements', - location = 'IPControllerApp.location', - - ident = 'Session.session', - user = 'Session.username', - exec_key = 'Session.keyfile', - - url = 'HubFactory.url', - ip = 'HubFactory.ip', - transport = 'HubFactory.transport', - port = 'HubFactory.regport', - - ping = 'HeartMonitor.period', - - scheme = 'TaskScheduler.scheme_name', - hwm = 'TaskScheduler.hwm', - - - profile = "BaseIPythonApplication.profile", - profile_dir = 'ProfileDir.location', - - )) + aliases = Dict(aliases) flags = Dict(flags) diff --git a/IPython/parallel/apps/ipengineapp.py b/IPython/parallel/apps/ipengineapp.py index 12eab5b..876b3bc 100755 --- a/IPython/parallel/apps/ipengineapp.py +++ b/IPython/parallel/apps/ipengineapp.py @@ -29,7 +29,11 @@ import zmq from zmq.eventloop import ioloop from IPython.core.profiledir import ProfileDir -from IPython.parallel.apps.baseapp import BaseParallelApplication +from IPython.parallel.apps.baseapp import ( + BaseParallelApplication, + base_aliases, + base_flags, +) from IPython.zmq.log import EnginePUBHandler from IPython.config.configurable import Configurable @@ -99,7 +103,27 @@ class MPI(Configurable): #----------------------------------------------------------------------------- # Main application #----------------------------------------------------------------------------- +aliases = dict( + file = 'IPEngineApp.url_file', + c = 'IPEngineApp.startup_command', + s = 'IPEngineApp.startup_script', + ident = 'Session.session', + user = 'Session.username', + exec_key = 'Session.keyfile', + + url = 'EngineFactory.url', + ip = 'EngineFactory.ip', + transport = 'EngineFactory.transport', + port = 'EngineFactory.regport', + location = 'EngineFactory.location', + + timeout = 'EngineFactory.timeout', + + mpi = 'MPI.use', + +) +aliases.update(base_aliases) class IPEngineApp(BaseParallelApplication): @@ -125,31 +149,7 @@ class IPEngineApp(BaseParallelApplication): help="""The URL for the iploggerapp instance, for forwarding logging to a central location.""") - aliases = Dict(dict( - file = 'IPEngineApp.url_file', - c = 'IPEngineApp.startup_command', - s = 'IPEngineApp.startup_script', - - ident = 'Session.session', - user = 'Session.username', - exec_key = 'Session.keyfile', - - url = 'EngineFactory.url', - ip = 'EngineFactory.ip', - transport = 'EngineFactory.transport', - port = 'EngineFactory.regport', - location = 'EngineFactory.location', - - timeout = 'EngineFactory.timeout', - - profile = "IPEngineApp.profile", - profile_dir = 'ProfileDir.location', - - mpi = 'MPI.use', - - log_level = 'IPEngineApp.log_level', - log_url = 'IPEngineApp.log_url' - )) + aliases = Dict(aliases) # def find_key_file(self): # """Set the key file.