diff --git a/IPython/parallel/apps/ipclusterapp.py b/IPython/parallel/apps/ipclusterapp.py index 96a9e6a..f03c1f4 100755 --- a/IPython/parallel/apps/ipclusterapp.py +++ b/IPython/parallel/apps/ipclusterapp.py @@ -59,8 +59,8 @@ default_config_file_name = u'ipcluster_config.py' _description = """Start an IPython cluster for parallel computing. An IPython cluster consists of 1 controller and 1 or more engines. -This command automates the startup of these processes using a wide -range of startup methods (SSH, local processes, PBS, mpiexec, +This command automates the startup of these processes using a wide range of +startup methods (SSH, local processes, PBS, mpiexec, SGE, LSF, Condor, Windows HPC Server 2008). To start a cluster with 4 engines on your local host simply do 'ipcluster start --n=4'. For more complex usage you will typically do 'ipython profile create mycluster --parallel', then edit @@ -116,7 +116,7 @@ def find_launcher_class(clsname, kind): ========== clsname : str The full name of the launcher class, either with or without the - module path, or an abbreviation (MPI, SSH, SGE, PBS, LSF, + module path, or an abbreviation (MPI, SSH, SGE, PBS, LSF, Condor WindowsHPC). kind : str Either 'EngineSet' or 'Controller'. @@ -125,7 +125,7 @@ def find_launcher_class(clsname, kind): # not a module, presume it's the raw name in apps.launcher if kind and kind not in clsname: # doesn't match necessary full class name, assume it's - # just 'PBS' or 'MPI' prefix: + # just 'PBS' or 'MPI' etc prefix: clsname = clsname + kind + 'Launcher' clsname = 'IPython.parallel.apps.launcher.'+clsname klass = import_item(clsname) @@ -287,6 +287,7 @@ class IPClusterEngines(BaseParallelApplication): Note that SSH does *not* move the connection files around, so you will likely have to do this manually unless the machines are on a shared file system. + Condor : use HTCondor to submit engines to a batch queue WindowsHPC : use Windows HPC If you are using one of IPython's builtin launchers, you can specify just the