Move layout implementations into separate folder

4 files changed, 5 insertions, 4 deletions

diff --git a/boltzgen/kernel/generator.py b/boltzgen/kernel/generator.py
index 04b0a64..ebe1018 100644
--- a/boltzgen/kernel/generator.py
+++ b/boltzgen/kernel/generator.py
@@ -3,8 +3,7 @@ import sympy
 from mako.template import Template
 from pathlib import Path
 
-import kernel.target.cl
-import kernel.target.cpp
+import kernel.target.layout
 
 class Generator:
     def __init__(self, descriptor, moments, collision):
@@ -33,8 +32,8 @@ class Generator:
             extras = extras
         )
 
-    def kernel(self, target, precision, layout, geometry, functions = ['collide_and_stream'], extras = []):
-        layout_impl = eval("kernel.target.%s.%s" % (target, layout))
+    def kernel(self, target, precision, layout, geometry, functions, extras = []):
+        layout_impl = eval("kernel.target.layout.%s.%s" % (target, layout))
         if layout_impl is None:
             raise Exception("Target '%s' doesn't support layout '%s'" % (target, layout))
         else:
diff --git a/boltzgen/kernel/target/layout/__init__.py b/boltzgen/kernel/target/layout/__init__.py
new file mode 100644
index 0000000..3887e07
--- /dev/null
+++ b/boltzgen/kernel/target/layout/__init__.py
@@ -0,0 +1,2 @@
+import kernel.target.layout.cl
+import kernel.target.layout.cpp
diff --git a/boltzgen/kernel/target/cl.py b/boltzgen/kernel/target/layout/cl.py
index 9707cb3..9707cb3 100644
--- a/boltzgen/kernel/target/cl.py
+++ b/boltzgen/kernel/target/layout/cl.py
diff --git a/boltzgen/kernel/target/cpp.py b/boltzgen/kernel/target/layout/cpp.py
index bb5dba0..bb5dba0 100644
--- a/boltzgen/kernel/target/cpp.py
+++ b/boltzgen/kernel/target/layout/cpp.py