Support for convolution transforms

nengo · Dec 28, 2018 · e39c54b · e39c54b
1 parent 911bbc2
commit e39c54b
Show file tree

Hide file tree

Showing 6 changed files with 197 additions and 614 deletions.
diff --git a/nengo_loihi/__init__.py b/nengo_loihi/__init__.py
@@ -10,7 +10,6 @@
 
 from .simulator import Simulator
 from .config import add_params, set_defaults
-from .conv import Conv2D
 
 logger = logging.getLogger(__name__)
 try:

diff --git a/nengo_loihi/builder.py b/nengo_loihi/builder.py
@@ -511,7 +511,7 @@ def build_no_solver(model, solver, conn, rng, transform):
 
 @Builder.register(Connection)  # noqa: C901
 def build_connection(model, conn):
-    if isinstance(conn.transform, conv.Conv2D):
+    if isinstance(conn.transform, nengo.Convolution):
         # TODO: integrate these into the same function
         conv.build_conv2d_connection(model, conn)
         return