##// END OF EJS Templates
Merge pull request #1490 from minrk/raw...
Merge pull request #1490 from minrk/raw rename plaintext cell -> raw cell Raw cells should be *untransformed* when writing various output formats, as the point of them is to let users pass through IPython to their rendered document format (rst, latex, etc.). This is different from what is the logical meaning of 'plaintext', which would suggest that the contents should be preserved as unformatted plaintext (e.g. in a `<pre>` tag, or literal block). In the UI, these cells will be displayed as 'Raw Text'. WARNING: any existing v3 notebooks which use plaintext cells, when read in by versions after this merge, will silently rename those cells to 'raw'. But if such a notebook is uploaded into a pre-merge IPython, cells labeled as 'raw' will simply *not be displayed*.

File last commit:

r6447:d13bbaf3 merge
r6480:a0e0f391 merge
Show More
clustermanager.py
174 lines | 5.8 KiB | text/x-python | PythonLexer
Brian Granger
First version of cluster web service....
r6191 """Manage IPython.parallel clusters in the notebook.
Authors:
* Brian Granger
"""
#-----------------------------------------------------------------------------
# Copyright (C) 2008-2011 The IPython Development Team
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
import os
from tornado import web
from zmq.eventloop import ioloop
from IPython.config.configurable import LoggingConfigurable
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 from IPython.config.loader import load_pyconfig_files
from IPython.utils.traitlets import Dict, Instance, CFloat
MinRK
use DummyIPClusterStart to load config in notebook ClusterManager...
r6202 from IPython.parallel.apps.ipclusterapp import IPClusterStart
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 from IPython.core.profileapp import list_profiles_in
from IPython.core.profiledir import ProfileDir
from IPython.utils.path import get_ipython_dir
from IPython.utils.sysinfo import num_cpus
Brian Granger
First version of cluster web service....
r6191
#-----------------------------------------------------------------------------
# Classes
#-----------------------------------------------------------------------------
MinRK
use DummyIPClusterStart to load config in notebook ClusterManager...
r6202
class DummyIPClusterStart(IPClusterStart):
"""Dummy subclass to skip init steps that conflict with global app.
Instantiating and initializing this class should result in fully configured
launchers, but no other side effects or state.
"""
def init_signal(self):
pass
def init_logging(self):
pass
def reinit_logging(self):
pass
Brian Granger
First version of cluster web service....
r6191 class ClusterManager(LoggingConfigurable):
profiles = Dict()
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 delay = CFloat(1., config=True,
help="delay (in s) between starting the controller and the engines")
loop = Instance('zmq.eventloop.ioloop.IOLoop')
def _loop_default(self):
from zmq.eventloop.ioloop import IOLoop
return IOLoop.instance()
def build_launchers(self, profile_dir):
MinRK
use DummyIPClusterStart to load config in notebook ClusterManager...
r6202 starter = DummyIPClusterStart(log=self.log)
starter.initialize(['--profile-dir', profile_dir])
cl = starter.controller_launcher
esl = starter.engine_launcher
n = starter.n
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 return cl, esl, n
def get_profile_dir(self, name, path):
p = ProfileDir.find_profile_dir_by_name(path,name=name)
return p.location
def update_profiles(self):
Brian Granger
First version of cluster web service....
r6191 """List all profiles in the ipython_dir and cwd.
"""
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 for path in [get_ipython_dir(), os.getcwdu()]:
for profile in list_profiles_in(path):
pd = self.get_profile_dir(profile, path)
if profile not in self.profiles:
self.log.debug("Overwriting profile %s" % profile)
self.profiles[profile] = {
'profile': profile,
'profile_dir': pd,
'status': 'stopped'
}
Brian Granger
First version of cluster web service....
r6191
def list_profiles(self):
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 self.update_profiles()
MinRK
fix sorting profiles in clustermanager
r6271 result = [self.profile_info(p) for p in sorted(self.profiles.keys())]
Brian Granger
First version of cluster web service....
r6191 return result
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 def check_profile(self, profile):
if profile not in self.profiles:
raise web.HTTPError(404, u'profile not found')
Brian Granger
First version of cluster web service....
r6191
def profile_info(self, profile):
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 self.check_profile(profile)
result = {}
Brian Granger
First version of cluster web service....
r6191 data = self.profiles.get(profile)
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 result['profile'] = profile
result['profile_dir'] = data['profile_dir']
result['status'] = data['status']
if 'n' in data:
Brian Granger
First version of cluster web service....
r6191 result['n'] = data['n']
return result
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 def start_cluster(self, profile, n=None):
Brian Granger
First version of cluster web service....
r6191 """Start a cluster for a given profile."""
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 self.check_profile(profile)
data = self.profiles[profile]
if data['status'] == 'running':
Brian Granger
First version of cluster web service....
r6191 raise web.HTTPError(409, u'cluster already running')
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 cl, esl, default_n = self.build_launchers(data['profile_dir'])
n = n if n is not None else default_n
def clean_data():
data.pop('controller_launcher',None)
data.pop('engine_set_launcher',None)
data.pop('n',None)
data['status'] = 'stopped'
def engines_stopped(r):
self.log.debug('Engines stopped')
if cl.running:
cl.stop()
clean_data()
esl.on_stop(engines_stopped)
def controller_stopped(r):
self.log.debug('Controller stopped')
if esl.running:
esl.stop()
clean_data()
cl.on_stop(controller_stopped)
dc = ioloop.DelayedCallback(lambda: cl.start(), 0, self.loop)
dc.start()
dc = ioloop.DelayedCallback(lambda: esl.start(n), 1000*self.delay, self.loop)
dc.start()
self.log.debug('Cluster started')
data['controller_launcher'] = cl
data['engine_set_launcher'] = esl
data['n'] = n
data['status'] = 'running'
Brian Granger
Cluster management is now working....
r6197 return self.profile_info(profile)
Brian Granger
First version of cluster web service....
r6191
def stop_cluster(self, profile):
"""Stop a cluster for a given profile."""
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 self.check_profile(profile)
data = self.profiles[profile]
if data['status'] == 'stopped':
Brian Granger
First version of cluster web service....
r6191 raise web.HTTPError(409, u'cluster not running')
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 data = self.profiles[profile]
cl = data['controller_launcher']
esl = data['engine_set_launcher']
if cl.running:
cl.stop()
if esl.running:
esl.stop()
# Return a temp info dict, the real one is updated in the on_stop
# logic above.
result = {
'profile': data['profile'],
'profile_dir': data['profile_dir'],
'status': 'stopped'
}
return result
Brian Granger
First version of cluster web service....
r6191
def stop_all_clusters(self):
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 for p in self.profiles.keys():
MinRK
small changes in response to pyflakes pass...
r6270 self.stop_cluster(p)