[API][Backend] Streaming and OpenCL Backends

.circleci/config.yml

@@ -11,6 +11,7 @@ test: &test
         key: v1.03-libhcl-
     - run: make build-python
     - run: pip install --user pytest 
+    - run: pip install --user future 
     - run: python -m pytest tests
     - run: pip install --user mxnet
     - run: python -m pytest samples

.gitignore

@@ -16,8 +16,6 @@ tags
 docs/source/samples
 docs/source/tutorials
 soda_*
-*.cpp
-*.h
 out
 
 # Downloaded files

HISTORY

@@ -0,0 +1,11 @@
+### 2019-12-09 
+  * fixed issue of zc706 simulation 
+    * remove kernel-name variable allocation before KernelDef
+    * change multi-dimension array access to row-major single-dimension access
+    * create local buffer for each on-device variable
+    * updated the `KernelUpdater` class (using position index instead of name)
+    * added `stream_arg_pos` map in `CodeGenC` to facilitate codegen with streaming
+  * fixed test cases 
+    * changed tvm `build` function to support legacy string type target 
+    * fixed opencl aocl data type mismatching issue
+    * fixed kernel def data type conversion issue

Makefile

@@ -12,15 +12,15 @@ build-tvm: build-pkgs
 
 build-hcl: build-tvm
 	cd python; \
-	python setup.py install --user; \
+	python setup.py develop --user; \
   cd ../hlib/python; \
-	python setup.py install --user;
+	python setup.py develop --user;
 
 build-python:
 	cd python; \
-	python setup.py install --user; \
+	python setup.py develop --user; \
   cd ../hlib/python; \
-	python setup.py install --user;
+	python setup.py develop --user;
 
 clean:
 	rm -rf build

Makefile.config

@@ -12,6 +12,9 @@ CMAKE_OK = no
 # set whether to use vivado hls runtime
 USE_VIVADO_HLS = 1
 
+# set whether to use sdaccel opencl runtime
+USE_SDACCEL_HLS = 1
+
 # Specify current directory level with respect to CLAY_ROOT
 ifndef LEVEL
 	LEVEL := .

hlib/python/hlib/nn.py

@@ -32,6 +32,17 @@ def _pad(*indices):
         return data[tuple(index_tuple)]
     return hcl.compute(out_shape, _pad, name='pad')
 
+def conv2d_nchw_imp(Input, Filter, Output, stride=[1,1], padding=[[0,0],[0,0]]):
+    with hcl.for_(0,Output.shape[0]) as n:
+      with hcl.for_(0,Output.shape[1]) as c:
+        with hcl.for_(0,Output.shape[2]) as h:
+          with hcl.for_(0,Output.shape[3]) as w:
+            partial = hcl.scalar(0)
+            with hcl.for_(0,Filter.shape[-2]) as x:
+              with hcl.for_(0,Filter.shape[-1]) as y:
+                partial.v += Input[n][c][h+x][w+y] * Filter[0][0][x][y] 
+            Output[n,c,h,w] = partial
+
 def conv2d_nchw(Input, Filter, name="conv2d", stride=[1,1], padding=[[0,0],[0,0]]):
     out_dtype = Input.dtype
     batch, in_channel, in_height, in_width = Input.shape

python/heterocl/__init__.py

@@ -3,6 +3,7 @@
 from .compute_api import *
 from .dsl import *
 from .types import *
+from .devices import *
 from .nparray import *
 from .debug import hcl_excepthook
 from .tvm.intrin import *

python/heterocl/api.py

@@ -2,9 +2,11 @@
 #pylint: disable=no-member
 from ordered_set import OrderedSet
 from .tvm.build_module import build as _build, lower as _lower
+from .tvm.api import convert
 from .tvm import _api_internal as tvm_api
 from .tvm import schedule as _schedule
 from .tvm import make as _make
+from .tvm import call_intrin
 from .tensor import Scalar, Tensor
 from .schedule import Stage, Schedule
 from .scheme import Scheme
@@ -51,7 +53,7 @@ def app2(A, B, C):
         # execute f2
     """
     # set the configurations
-    config.init_dtype = init_dtype
+    config.init_dtype  = init_dtype
     # initialize global variables
     Schedule.stage_ops = []
     Schedule.last_stages = OrderedSet([])
@@ -88,7 +90,7 @@ def placeholder(shape, name=None, dtype=None):
     """
     name = util.get_name("placeholder", name)
     dtype = util.get_dtype(dtype)
-
+    
     if shape == ():
         return Scalar(tvm_api._Var(name, dtype))
     tensor = Tensor(shape, dtype, name)
@@ -268,10 +270,11 @@ def lower(schedule):
             new_inputs.append(i.var)
     return _lower(schedule.sch, new_inputs, simple_mode=True)
 
-def build(schedule, target=None, name="default_function"):
+def build(schedule, target=None, name="default_function", stmt=None):
     """Build the executable according to the schedule and target.
 
-    The default target is `llvm` (i.e., CPU execution).
+    The default target is `llvm` (i.e., CPU execution). If stmt is specified,
+    the statements created by HeteroCL APIs will be ignored.
 
     Parameters
     ----------
@@ -284,6 +287,9 @@ def build(schedule, target=None, name="default_function"):
     name : str, optional
         The name of the generated function
 
+    stmt : Stmt, optional
+        The built statement
+
     Returns
     -------
     tvm.module.Module
@@ -294,7 +300,17 @@ def build(schedule, target=None, name="default_function"):
             new_inputs.append(i.tensor.op.output(0))
         else:
             new_inputs.append(i.var)
-    return _build(schedule.sch, new_inputs, target=target, name=name)
+    if stmt is not None:
+        for i in schedule.inputs:
+            if isinstance(i, Tensor):
+                shapes = []
+                for s in i.shape:
+                    shapes.append(0)
+                    shapes.append(s)
+                tpl = tuple(shapes)
+                stmt = _make.AttrStmt([i.buf, i.tensor], "buffer_bind_scope",
+                        call_intrin('handle', 'tvm_tuple', *tpl), stmt)
+    return _build(schedule.sch, new_inputs, target=target, name=name, stmt=stmt)
 
 ##############################################################################
 # Other useful APIs
@@ -342,4 +358,4 @@ def select(cond, true, false):
     -------
     Expr
     """
-    return _make.Select(cond, true, false)
+    return _make.Select(convert(cond), convert(true), convert(false))

python/heterocl/debug.py

@@ -45,6 +45,11 @@ class TensorError(HCLError):
     def __init__(self, msg):
         HCLError.__init__(self, msg, "\33[1;31m[Tensor]\33[0m ")
 
+class DeviceError(HCLError):
+    """A subclass for specifying device related exception"""
+    def __init__(self, msg):
+        HCLError.__init__(self, msg, "\33[1;31m[Device]\33[0m ")
+
 def hcl_excepthook(etype, value, tb):
     """Customized excepthook