Merge branch 'master' of github.com:neurokernel/neurokernel

neurokernel · Sep 8, 2015 · fc6bacd · fc6bacd
2 parents 22405c0 + e2d8e45
commit fc6bacd
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/docs/source/reference_emulation.rst b/docs/source/reference_emulation.rst
@@ -9,8 +9,6 @@ Construction and Execution
    :toctree: generated/
    :nosignatures:
 
-   neurokernel.base.Manager
-   neurokernel.base_gpu.Manager
    neurokernel.core.Manager
    neurokernel.core_gpu.Manager
 

diff --git a/examples/multi/multi_demo.py b/examples/multi/multi_demo.py
@@ -180,5 +180,5 @@
     man.connect(id_0, id_1, pat, 0, 1, compat_check=False)
 
 man.spawn()
-man.start(steps=steps)
+man.start(steps=args.steps)
 man.wait()
diff --git a/neurokernel/tools/graph.py b/neurokernel/tools/graph.py
@@ -21,7 +21,6 @@
 
 import pandas
 
-from .. import base
 from .. import core
 
 def graph_to_df(g):