Merge remote-tracking branch 'origin/master' into devel

Author: pavanky

CHANGELOG.md

@@ -1,3 +1,8 @@
+### v3.3.20160427
+- Fixes to numpy interop on Windows
+- Fixes issues with occasional double free
+- Fixes to graphics examples
+
 ### v3.3.20160328
 - Fixes to make arrayfire-python to work on 32 bit systems
 

arrayfire/array.py

@@ -481,6 +481,7 @@ def __del__(self):
         """
         if self.arr.value:
             backend.get().af_release_array(self.arr)
+            self.arr.value = 0
 
     def device_ptr(self):
         """

arrayfire/interop.py

@@ -40,7 +40,7 @@ def np_to_af_array(np_arr):
         """
 
         in_shape = np_arr.shape
-        in_ptr = np_arr.ctypes.data
+        in_ptr = np_arr.ctypes.data_as(ct.c_void_p)
         in_dtype = np_arr.dtype.char
 
         if (np_arr.flags['F_CONTIGUOUS']):

arrayfire/library.py

@@ -507,7 +507,7 @@ def name(self):
         return self.__name
 
     def is_unified(self):
-        return self.__name == ''
+        return self.__name == 'unified'
 
     def parse(self, res):
         lst = []

examples/graphics/conway.py

@@ -66,7 +66,7 @@
     A2 = (state == 0) & C1
     A3 = (state == 1) & (neighborhood > 3)
 
-    display = (af.join(2, A0 + A1, A1 + A2, A3).as_type(af.Dtype.f32)
+    display = af.join(2, A0 + A1, A1 + A2, A3).as_type(af.Dtype.f32)
 
     state = state * C0 + C1
 

examples/graphics/histogram.py

@@ -29,7 +29,7 @@
     hist_win = af.Window(512, 512, "3D Plot example using ArrayFire")
     img_win  = af.Window(480, 640, "Input Image")
 
-    img = (af.load_image(sys.argv[1])).(af.Dtype.u8)
+    img = af.load_image(sys.argv[1]).as_type(af.Dtype.u8)
     hist = af.histogram(img, 256, 0, 255)
 
     while (not hist_win.close()) and (not img_win.close()):

setup.py

@@ -15,10 +15,7 @@
 ## 1) Look for af libraries during setup
 ## 2) Include test suite
 
-# Some hackery to avoid merge conflicts between master and devel
-current_version = "3.3.20160328"
-devel_version = "3.4.0"
-release_version = current_version if current_version > devel_version else devel_version
+release_version = "3.4.0"
 
 setup(
     author="Pavan Yalamanchili",