Merge 75d7896 into cd5161a

ledatelescope · Oct 10, 2017 · 7bedad4 · 7bedad4
2 parents cd5161a + 75d7896
commit 7bedad4
Show file tree

Hide file tree

Showing 12 changed files with 1,891 additions and 22 deletions.
diff --git a/python/bifrost/DataType.py b/python/bifrost/DataType.py
@@ -132,9 +132,10 @@ def __init__(self, t=None):
             self._kind, self._nbit, self._veclen = t
         else:
             t = np.dtype(t) # Raises TypeError if t is invalid
-            if t.ndim == 0:
+            ndim = getattr(t, 'ndim', len(t.shape))
+            if ndim == 0:
                 self._veclen = 1
-            elif t.ndim == 1:
+            elif ndim == 1:
                 self._veclen = t.shape[0]
                 t = t.base
             else:

diff --git a/src/Makefile b/src/Makefile
@@ -30,7 +30,9 @@ ifndef NOCUDA
   trace.o \
   linalg.o \
   linalg_kernels.o \
-  reduce.o
+  reduce.o \
+  guantize.o \
+  gunpack.o
 endif
 
 JIT_SOURCES ?= \