Show More
@@ -0,0 +1,12 b'' | |||||
|
1 | .. _parallel_index: | |||
|
2 | ||||
|
3 | ==================================== | |||
|
4 | Using IPython for parallel computing | |||
|
5 | ==================================== | |||
|
6 | ||||
|
7 | The twisted-based :mod:`IPython.kernel` has been removed, in favor of | |||
|
8 | the new 0MQ-based :mod:`IPython.parallel`, whose merge into master is imminent. | |||
|
9 | ||||
|
10 | Until that code is merged, it can be found in the `newparallel branch | |||
|
11 | <https://github.com/ipython/ipython/tree/newparallel>`_, and its draft documentation can be | |||
|
12 | found `here <http://minrk.github.com/ipython-doc/newparallel>`_. No newline at end of file |
@@ -35,7 +35,7 b' class NotificationCenter(object):' | |||||
35 | -------- |
|
35 | -------- | |
36 | Here is a simple example of how to use this:: |
|
36 | Here is a simple example of how to use this:: | |
37 |
|
37 | |||
38 |
import IPython. |
|
38 | import IPython.util.notification as notification | |
39 | def callback(ntype, theSender, args={}): |
|
39 | def callback(ntype, theSender, args={}): | |
40 | print ntype,theSender,args |
|
40 | print ntype,theSender,args | |
41 |
|
41 |
@@ -19,6 +19,7 b' Contents' | |||||
19 | whatsnew/index.txt |
|
19 | whatsnew/index.txt | |
20 | install/index.txt |
|
20 | install/index.txt | |
21 | interactive/index.txt |
|
21 | interactive/index.txt | |
|
22 | parallel/index.txt | |||
22 | config/index.txt |
|
23 | config/index.txt | |
23 | development/index.txt |
|
24 | development/index.txt | |
24 | api/index.txt |
|
25 | api/index.txt |
@@ -215,9 +215,9 b" if 'setuptools' in sys.modules:" | |||||
215 | 'ipython = IPython.frontend.terminal.ipapp:launch_new_instance', |
|
215 | 'ipython = IPython.frontend.terminal.ipapp:launch_new_instance', | |
216 | 'ipython-qtconsole = IPython.frontend.qt.console.ipythonqt:main', |
|
216 | 'ipython-qtconsole = IPython.frontend.qt.console.ipythonqt:main', | |
217 | 'pycolor = IPython.utils.PyColorize:main', |
|
217 | 'pycolor = IPython.utils.PyColorize:main', | |
218 | 'ipcontroller = IPython.kernel.ipcontrollerapp:launch_new_instance', |
|
218 | # 'ipcontroller = IPython.kernel.ipcontrollerapp:launch_new_instance', | |
219 | 'ipengine = IPython.kernel.ipengineapp:launch_new_instance', |
|
219 | # 'ipengine = IPython.kernel.ipengineapp:launch_new_instance', | |
220 | 'ipcluster = IPython.kernel.ipclusterapp:launch_new_instance', |
|
220 | # 'ipcluster = IPython.kernel.ipclusterapp:launch_new_instance', | |
221 | 'iptest = IPython.testing.iptest:main', |
|
221 | 'iptest = IPython.testing.iptest:main', | |
222 | 'irunner = IPython.lib.irunner:main' |
|
222 | 'irunner = IPython.lib.irunner:main' | |
223 | ] |
|
223 | ] |
@@ -120,6 +120,7 b' def find_packages():' | |||||
120 | add_package(packages, 'external.pyparsing') |
|
120 | add_package(packages, 'external.pyparsing') | |
121 | add_package(packages, 'external.simplegeneric') |
|
121 | add_package(packages, 'external.simplegeneric') | |
122 | add_package(packages, 'external.validate') |
|
122 | add_package(packages, 'external.validate') | |
|
123 | add_package(packages, 'kernel') | |||
123 | add_package(packages, 'frontend') |
|
124 | add_package(packages, 'frontend') | |
124 | add_package(packages, 'frontend.qt') |
|
125 | add_package(packages, 'frontend.qt') | |
125 | add_package(packages, 'frontend.qt.console', tests=True) |
|
126 | add_package(packages, 'frontend.qt.console', tests=True) | |
@@ -259,11 +260,11 b' def find_scripts():' | |||||
259 | """ |
|
260 | """ | |
260 | Find IPython's scripts. |
|
261 | Find IPython's scripts. | |
261 | """ |
|
262 | """ | |
262 | kernel_scripts = pjoin('IPython','kernel','scripts') |
|
263 | # kernel_scripts = pjoin('IPython','kernel','scripts') | |
263 | main_scripts = pjoin('IPython','scripts') |
|
264 | main_scripts = pjoin('IPython','scripts') | |
264 | scripts = [pjoin(kernel_scripts, 'ipengine'), |
|
265 | scripts = [# pjoin(kernel_scripts, 'ipengine'), | |
265 | pjoin(kernel_scripts, 'ipcontroller'), |
|
266 | # pjoin(kernel_scripts, 'ipcontroller'), | |
266 | pjoin(kernel_scripts, 'ipcluster'), |
|
267 | # pjoin(kernel_scripts, 'ipcluster'), | |
267 | pjoin(main_scripts, 'ipython'), |
|
268 | pjoin(main_scripts, 'ipython'), | |
268 | pjoin(main_scripts, 'ipython-qtconsole'), |
|
269 | pjoin(main_scripts, 'ipython-qtconsole'), | |
269 | pjoin(main_scripts, 'pycolor'), |
|
270 | pjoin(main_scripts, 'pycolor'), | |
@@ -296,8 +297,6 b' def check_for_dependencies():' | |||||
296 | """ |
|
297 | """ | |
297 | from setupext.setupext import ( |
|
298 | from setupext.setupext import ( | |
298 | print_line, print_raw, print_status, |
|
299 | print_line, print_raw, print_status, | |
299 | check_for_zopeinterface, check_for_twisted, |
|
|||
300 | check_for_foolscap, check_for_pyopenssl, |
|
|||
301 | check_for_sphinx, check_for_pygments, |
|
300 | check_for_sphinx, check_for_pygments, | |
302 | check_for_nose, check_for_pexpect |
|
301 | check_for_nose, check_for_pexpect | |
303 | ) |
|
302 | ) | |
@@ -311,10 +310,6 b' def check_for_dependencies():' | |||||
311 | print_raw("") |
|
310 | print_raw("") | |
312 | print_raw("OPTIONAL DEPENDENCIES") |
|
311 | print_raw("OPTIONAL DEPENDENCIES") | |
313 |
|
312 | |||
314 | check_for_zopeinterface() |
|
|||
315 | check_for_twisted() |
|
|||
316 | check_for_foolscap() |
|
|||
317 | check_for_pyopenssl() |
|
|||
318 | check_for_sphinx() |
|
313 | check_for_sphinx() | |
319 | check_for_pygments() |
|
314 | check_for_pygments() | |
320 | check_for_nose() |
|
315 | check_for_nose() |
General Comments 0
You need to be logged in to leave comments.
Login now