Merge pull request arrayfire#21 from FilipeMaia/array_fixes

pavanky · pavanky · commit dd7715274aae · 2015-08-27T17:02:40.000-04:00
Bugfixes to ArrayFire
diff --git a/arrayfire/arith.py b/arrayfire/arith.py
@@ -18,24 +18,24 @@ def arith_binary_func(lhs, rhs, c_func):
     is_right_array = isinstance(rhs, array)
 
     if not (is_left_array or is_right_array):
-        TypeError("Atleast one input needs to be of type arrayfire.array")
+        raise TypeError("Atleast one input needs to be of type arrayfire.array")
 
     elif (is_left_array and is_right_array):
         safe_call(c_func(ct.pointer(out.arr), lhs.arr, rhs.arr, bcast.get()))
 
     elif (is_number(rhs)):
         ldims = dim4_tuple(lhs.dims())
-        lty = lhs.type()
+        rty = number_dtype(rhs)
         other = array()
-        other.arr = constant_array(rhs, ldims[0], ldims[1], ldims[2], ldims[3], lty)
+        other.arr = constant_array(rhs, ldims[0], ldims[1], ldims[2], ldims[3], rty)
         safe_call(c_func(ct.pointer(out.arr), lhs.arr, other.arr, bcast.get()))
 
     else:
         rdims = dim4_tuple(rhs.dims())
-        rty = rhs.type()
+        lty = number_dtype(lhs)
         other = array()
-        other.arr = constant_array(lhs, rdims[0], rdims[1], rdims[2], rdims[3], rty)
-        safe_call(c_func(ct.pointer(out.arr), lhs.arr, other.arr, bcast.get()))
+        other.arr = constant_array(lhs, rdims[0], rdims[1], rdims[2], rdims[3], lty)
+        safe_call(c_func(ct.pointer(out.arr), other.arr, rhs.arr, bcast.get()))
 
     return out
 
diff --git a/arrayfire/array.py b/arrayfire/array.py
@@ -60,9 +60,9 @@ def binary_func(lhs, rhs, c_func):
 
     if (is_number(rhs)):
         ldims = dim4_tuple(lhs.dims())
-        lty = lhs.type()
+        rty = number_dtype(rhs)
         other = array()
-        other.arr = constant_array(rhs, ldims[0], ldims[1], ldims[2], ldims[3], lty)
+        other.arr = constant_array(rhs, ldims[0], ldims[1], ldims[2], ldims[3], rty)
     elif not isinstance(rhs, array):
         raise TypeError("Invalid parameter to binary function")
 
@@ -76,9 +76,9 @@ def binary_funcr(lhs, rhs, c_func):
 
     if (is_number(lhs)):
         rdims = dim4_tuple(rhs.dims())
-        rty = rhs.type()
+        lty = number_dtype(lhs)
         other = array()
-        other.arr = constant_array(lhs, rdims[0], rdims[1], rdims[2], rdims[3], rty)
+        other.arr = constant_array(lhs, rdims[0], rdims[1], rdims[2], rdims[3], lty)
     elif not isinstance(lhs, array):
         raise TypeError("Invalid parameter to binary function")
 
@@ -179,13 +179,18 @@ def __init__(self, src=None, dims=(0,), type_char=None):
 
     def copy(self):
         out = array()
-        safe_call(clib.af_retain_array(ct.pointer(out.arr), self.arr))
+        safe_call(clib.af_copy_array(ct.pointer(out.arr), self.arr))
         return out
 
     def __del__(self):
         if (self.arr.value != 0):
             clib.af_release_array(self.arr)
 
+    def device_ptr(self):
+        ptr = ctypes.c_void_p(0)
+        clib.af_get_device_ptr(ct.pointer(ptr), self.arr)
+        return ptr.value
+
     def elements(self):
         num = ct.c_ulonglong(0)
         safe_call(clib.af_get_elements(ct.pointer(num), self.arr))
diff --git a/arrayfire/util.py b/arrayfire/util.py
@@ -22,6 +22,18 @@ def dim4(d0=1, d1=1, d2=1, d3=1):
 def is_number(a):
     return isinstance(a, numbers.Number)
 
+def number_dtype(a):
+    if isinstance(a, bool):
+        return b8
+    if isinstance(a, int):
+        return s64
+    elif isinstance(a, float):
+        return f64
+    elif isinstance(a, complex):
+        return c64
+    else:
+        return to_dtype[a.dtype.char]
+
 def dim4_tuple(dims, default=1):
     assert(isinstance(dims, tuple))
 
@@ -59,7 +71,9 @@ def get_version():
             'i' : s32,
             'I' : u32,
             'l' : s64,
-            'L' : u64}
+            'L' : u64,
+            'F' : c32,
+            'D' : c64}
 
 to_typecode = {f32.value : 'f',
                f64.value : 'd',
@@ -68,7 +82,9 @@ def get_version():
                s32.value : 'i',
                u32.value : 'I',
                s64.value : 'l',
-               u64.value : 'L'}
+               u64.value : 'L',
+               c32.value : 'F',
+               c64.value : 'D'}
 
 to_c_type = {f32.value : ct.c_float,
              f64.value : ct.c_double,
@@ -77,4 +93,6 @@ def get_version():
              s32.value : ct.c_int,
              u32.value : ct.c_uint,
              s64.value : ct.c_longlong,
-             u64.value : ct.c_ulonglong}
+             u64.value : ct.c_ulonglong,
+             c32.value : ct.c_float * 2,
+             c64.value : ct.c_double * 2}
