Merge branch 'master' into devel

Author: pavanky

CHANGELOG.md

@@ -1,3 +1,7 @@
+### v3.3.20161126
+- Fixing memory leak in array creation.
+- Supporting 16 bit integer types in interop.
+
 ### v3.4.20160925
 - Feature parity with ArrayFire 3.4 libs
 

arrayfire/array.py

@@ -54,6 +54,9 @@ def _create_strided_array(buf, numdims, idims, dtype, is_device, offset, strides
 
 def _create_empty_array(numdims, idims, dtype):
     out_arr = c_void_ptr_t(0)
+
+    if numdims == 0: return out_arr
+
     c_dims = dim4(idims[0], idims[1], idims[2], idims[3])
     safe_call(backend.get().af_create_handle(c_pointer(out_arr),
                                              numdims, c_pointer(c_dims), dtype.value))
@@ -160,19 +163,18 @@ def _slice_to_length(key, dim):
 
 def _get_info(dims, buf_len):
     elements = 1
-    numdims = len(dims)
-    idims = [1]*4
-
-    for i in range(numdims):
-        elements *= dims[i]
-        idims[i] = dims[i]
-
-    if (elements == 0):
-        if (buf_len != 0):
-            idims = [buf_len, 1, 1, 1]
-            numdims = 1
-        else:
-            raise RuntimeError("Invalid size")
+    numdims = 0
+    if dims:
+        numdims = len(dims)
+        idims = [1]*4
+        for i in range(numdims):
+            elements *= dims[i]
+            idims[i] = dims[i]
+    elif (buf_len != 0):
+        idims = [buf_len, 1, 1, 1]
+        numdims = 1
+    else:
+        raise RuntimeError("Invalid size")
 
     return numdims, idims
 
@@ -382,7 +384,7 @@ class Array(BaseArray):
     # arrayfire's __radd__() instead of numpy's __add__()
     __array_priority__ = 30
 
-    def __init__(self, src=None, dims=(0,), dtype=None, is_device=False, offset=None, strides=None):
+    def __init__(self, src=None, dims=None, dtype=None, is_device=False, offset=None, strides=None):
 
         super(Array, self).__init__()
 
@@ -449,10 +451,12 @@ def __init__(self, src=None, dims=(0,), dtype=None, is_device=False, offset=None
             if type_char is None:
                 type_char = 'f'
 
-            numdims = len(dims)
+            numdims = len(dims) if dims else 0
+
             idims = [1] * 4
             for n in range(numdims):
                 idims[n] = dims[n]
+
             self.arr = _create_empty_array(numdims, idims, to_dtype[type_char])
 
     def as_type(self, ty):

setup.py

@@ -19,7 +19,7 @@
     author="Pavan Yalamanchili",
     author_email="[email protected]",
     name="arrayfire",
-    version="3.4.0",
+    version="3.5.0",
     description="Python bindings for ArrayFire",
     license="BSD",
     url="http://arrayfire.com",