From e9f42798c45f841e68aa449ce6aba41b468b2a30 Mon Sep 17 00:00:00 2001
From: Satrajit Ghosh <satra@ba5.mit.edu>
Date: Fri, 16 Jul 2010 23:20:35 -0400
Subject: [PATCH] firt pass to support sge

---
 IPython/kernel/scripts/ipcluster.py       | 13 +++++++++++--
 docs/source/parallel/parallel_process.txt | 22 +++++++++++-----------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/IPython/kernel/scripts/ipcluster.py b/IPython/kernel/scripts/ipcluster.py
index 83518ee91b7..ba9c7864288 100644
--- a/IPython/kernel/scripts/ipcluster.py
+++ b/IPython/kernel/scripts/ipcluster.py
@@ -339,6 +339,15 @@ class SGEEngineSet(BatchEngineSet):
     def __init__(self, template_file, **kwargs):
         BatchEngineSet.__init__(self, template_file, **kwargs)
 
+    def parse_job_id(self, output):
+        m = re.search(self.job_id_regexp, output)
+        if m is not None:
+            job_id = m.group()
+        else:
+            raise Exception("job id couldn't be determined: %s" % output)
+        self.job_id = job_id
+        log.msg('Job started with job id: %r' % job_id)
+        return job_id
 
 sshx_template="""#!/bin/sh
 "$@" &> /dev/null &
@@ -820,7 +829,7 @@ def get_args():
     
     parser_sge = subparsers.add_parser(
         'sge', 
-        help='run a sge cluster',
+        help='run an sge cluster',
         parents=[base_parser]
     )
     parser_sge.add_argument(
@@ -828,7 +837,7 @@ def get_args():
         type=str, 
         dest='sgescript',
         help='SGE script template',
-        default='sge.template'
+        default='template.sge'
     )
     parser_sge.set_defaults(func=main_sge)
     
diff --git a/docs/source/parallel/parallel_process.txt b/docs/source/parallel/parallel_process.txt
index d00aa481f87..cdbe51f369f 100644
--- a/docs/source/parallel/parallel_process.txt
+++ b/docs/source/parallel/parallel_process.txt
@@ -177,17 +177,17 @@ The SGE mode uses the Sun Grid Engine [SGE]_ to start the engines.  To use this
 
 .. sourcecode:: bash
 
-   #!/bin/bash
-   #$ -V
-   #$ -cwd
-   #$ -M joe@gmail.com
-   #$ -m beas
-   #$ -N ipython
-   #$ -r y
-   #$ -S /bin/bash
-
-   cd $$HOME/sge
-   /usr/local/bin/mpiexec -n ${n} ipengine --logfile=$$HOME/sge/ipengine
+    #!/bin/bash
+    #$ -V
+    #$ -cwd
+    #$ -m n
+    #$ -N satra-ipython
+    #$ -r y
+    #$ -q sub
+    #$ -S /bin/bash
+
+    cd $$HOME/sge
+    ipengine --logfile=ipengine
 
 There are a few important points about this template: