##// END OF EJS Templates
cleanup aliases in parallel apps...
MinRK -
Show More
@@ -97,7 +97,6 b' base_aliases = {}'
97 97 base_aliases.update(base_ip_aliases)
98 98 base_aliases.update({
99 99 'profile_dir' : 'ProfileDir.location',
100 'log_level' : 'BaseParallelApplication.log_level',
101 100 'work_dir' : 'BaseParallelApplication.work_dir',
102 101 'log_to_file' : 'BaseParallelApplication.log_to_file',
103 102 'clean_logs' : 'BaseParallelApplication.clean_logs',
@@ -179,7 +179,7 b' engine_aliases = {}'
179 179 engine_aliases.update(base_aliases)
180 180 engine_aliases.update(dict(
181 181 n='IPClusterEngines.n',
182 elauncher = 'IPClusterEngines.engine_launcher_class',
182 engines = 'IPClusterEngines.engine_launcher_class',
183 183 daemonize = 'IPClusterEngines.daemonize',
184 184 ))
185 185 engine_flags = {}
@@ -322,6 +322,7 b' start_aliases.update(engine_aliases)'
322 322 start_aliases.update(dict(
323 323 delay='IPClusterStart.delay',
324 324 clean_logs='IPClusterStart.clean_logs',
325 controller = 'IPClusterStart.controller_launcher_class',
325 326 ))
326 327
327 328 class IPClusterStart(IPClusterEngines):
@@ -41,7 +41,8 b' from IPython.core.profiledir import ProfileDir'
41 41
42 42 from IPython.parallel.apps.baseapp import (
43 43 BaseParallelApplication,
44 base_flags
44 base_aliases,
45 base_flags,
45 46 )
46 47 from IPython.utils.importstring import import_item
47 48 from IPython.utils.traitlets import Instance, Unicode, Bool, List, Dict
@@ -109,6 +110,28 b" flags.update(boolean_flag('secure', 'IPControllerApp.secure',"
109 110 "Use HMAC digests for authentication of messages.",
110 111 "Don't authenticate messages."
111 112 ))
113 aliases = dict(
114 reuse_files = 'IPControllerApp.reuse_files',
115 secure = 'IPControllerApp.secure',
116 ssh = 'IPControllerApp.ssh_server',
117 use_threads = 'IPControllerApp.use_threads',
118 location = 'IPControllerApp.location',
119
120 ident = 'Session.session',
121 user = 'Session.username',
122 exec_key = 'Session.keyfile',
123
124 url = 'HubFactory.url',
125 ip = 'HubFactory.ip',
126 transport = 'HubFactory.transport',
127 port = 'HubFactory.regport',
128
129 ping = 'HeartMonitor.period',
130
131 scheme = 'TaskScheduler.scheme_name',
132 hwm = 'TaskScheduler.hwm',
133 )
134 aliases.update(base_aliases)
112 135
113 136 class IPControllerApp(BaseParallelApplication):
114 137
@@ -151,35 +174,7 b' class IPControllerApp(BaseParallelApplication):'
151 174 def _use_threads_changed(self, name, old, new):
152 175 self.mq_class = 'zmq.devices.%sMonitoredQueue'%('Thread' if new else 'Process')
153 176
154 aliases = Dict(dict(
155 log_level = 'IPControllerApp.log_level',
156 log_url = 'IPControllerApp.log_url',
157 reuse_files = 'IPControllerApp.reuse_files',
158 secure = 'IPControllerApp.secure',
159 ssh = 'IPControllerApp.ssh_server',
160 use_threads = 'IPControllerApp.use_threads',
161 import_statements = 'IPControllerApp.import_statements',
162 location = 'IPControllerApp.location',
163
164 ident = 'Session.session',
165 user = 'Session.username',
166 exec_key = 'Session.keyfile',
167
168 url = 'HubFactory.url',
169 ip = 'HubFactory.ip',
170 transport = 'HubFactory.transport',
171 port = 'HubFactory.regport',
172
173 ping = 'HeartMonitor.period',
174
175 scheme = 'TaskScheduler.scheme_name',
176 hwm = 'TaskScheduler.hwm',
177
178
179 profile = "BaseIPythonApplication.profile",
180 profile_dir = 'ProfileDir.location',
181
182 ))
177 aliases = Dict(aliases)
183 178 flags = Dict(flags)
184 179
185 180
@@ -29,7 +29,11 b' import zmq'
29 29 from zmq.eventloop import ioloop
30 30
31 31 from IPython.core.profiledir import ProfileDir
32 from IPython.parallel.apps.baseapp import BaseParallelApplication
32 from IPython.parallel.apps.baseapp import (
33 BaseParallelApplication,
34 base_aliases,
35 base_flags,
36 )
33 37 from IPython.zmq.log import EnginePUBHandler
34 38
35 39 from IPython.config.configurable import Configurable
@@ -99,7 +103,27 b' class MPI(Configurable):'
99 103 #-----------------------------------------------------------------------------
100 104 # Main application
101 105 #-----------------------------------------------------------------------------
106 aliases = dict(
107 file = 'IPEngineApp.url_file',
108 c = 'IPEngineApp.startup_command',
109 s = 'IPEngineApp.startup_script',
102 110
111 ident = 'Session.session',
112 user = 'Session.username',
113 exec_key = 'Session.keyfile',
114
115 url = 'EngineFactory.url',
116 ip = 'EngineFactory.ip',
117 transport = 'EngineFactory.transport',
118 port = 'EngineFactory.regport',
119 location = 'EngineFactory.location',
120
121 timeout = 'EngineFactory.timeout',
122
123 mpi = 'MPI.use',
124
125 )
126 aliases.update(base_aliases)
103 127
104 128 class IPEngineApp(BaseParallelApplication):
105 129
@@ -125,31 +149,7 b' class IPEngineApp(BaseParallelApplication):'
125 149 help="""The URL for the iploggerapp instance, for forwarding
126 150 logging to a central location.""")
127 151
128 aliases = Dict(dict(
129 file = 'IPEngineApp.url_file',
130 c = 'IPEngineApp.startup_command',
131 s = 'IPEngineApp.startup_script',
132
133 ident = 'Session.session',
134 user = 'Session.username',
135 exec_key = 'Session.keyfile',
136
137 url = 'EngineFactory.url',
138 ip = 'EngineFactory.ip',
139 transport = 'EngineFactory.transport',
140 port = 'EngineFactory.regport',
141 location = 'EngineFactory.location',
142
143 timeout = 'EngineFactory.timeout',
144
145 profile = "IPEngineApp.profile",
146 profile_dir = 'ProfileDir.location',
147
148 mpi = 'MPI.use',
149
150 log_level = 'IPEngineApp.log_level',
151 log_url = 'IPEngineApp.log_url'
152 ))
152 aliases = Dict(aliases)
153 153
154 154 # def find_key_file(self):
155 155 # """Set the key file.
General Comments 0
You need to be logged in to leave comments. Login now