Revert "[API][Backend] Streaming and OpenCL Backends (cornell-zhang#138…

…)" (cornell-zhang#139)

This reverts commit 2c75344.

.circleci/config.yml

@@ -12,7 +12,6 @@ test: &test
     - run: make build-python
     - run: source .circleci/install_tvm.sh
     - 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,6 +16,8 @@ tags
 docs/source/samples
 docs/source/tutorials
 soda_*
+*.cpp
+*.h
 out
 
 # Downloaded files

Makefile

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

Makefile.config

@@ -12,9 +12,6 @@ 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,17 +32,6 @@ 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,7 +3,6 @@
 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

@@ -53,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([])

python/heterocl/debug.py

@@ -45,11 +45,6 @@ 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
 

python/heterocl/dsl.py

@@ -421,9 +421,7 @@ def decorator(fmodule, shapes=shapes, dtypes=dtypes, ret_dtype=ret_dtype, name=n
                     var_ = placeholder((), name_, dtype)
                     inputs.append(var_)
                     inputs_tvm.append(var_.var)
-                    arg_shapes.append([1])
-                    arg_dtypes.append(dtype)
-                else: # tensor inputs (new bufs)
+                else:
                     placeholder_ = placeholder(shape, name_, dtype)
                     inputs.append(placeholder_)
                     inputs_tvm.append(placeholder_.buf.data)