Skip to content

Commit

Permalink
Doc update
Browse files Browse the repository at this point in the history
  • Loading branch information
Fabian Pedregosa committed Aug 4, 2012
1 parent 4389d64 commit e07028e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ file ~/.ipython/ipy_user_conf.py to add the following lines::
# These two are the important ones.
import memory_profiler
ip.expose_magic('mprun', memory_profiler.magic_mprun)
ip.expose_magic('memit', memory_profiler.magic_memit)prun)
ip.expose_magic('memit', memory_profiler.magic_memit)

For IPython 0.11+, you have to edit the file
~/.ipython/extensions/memory_profiler_ext.py with the following content::
Expand Down
5 changes: 2 additions & 3 deletions memory_profiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ def memory_usage(proc=-1, num=-1, interval=.1):
interval : int, optional
num : int, optional
Number of samples to generate. In the case of
defaults to -1, meaning
Maximum number of retrievals. In the case of -1, meaning
to wait until the process has finished if proc is a string or
to get just one if proc is an integer.
Expand All @@ -67,7 +66,7 @@ def memory_usage(proc=-1, num=-1, interval=.1):
Returns
-------
mm : list of integers
mm : list of integers, size less than num
memory usage, in KB
"""
ret = []
Expand Down

0 comments on commit e07028e

Please sign in to comment.