Adding join function to the array class (#49)

1) Fix in the to_arrayfire and the from_arrayfire functions
2) Adding join function to the array class
3) Increasing the version

Author: Oscar Torreno

CHANGES.rst

@@ -4,6 +4,16 @@ Changelog
 
 KHIVA uses `Semantic Versioning <http://semver.org/>`_
 
+Version 0.2.2
+=============
+
+Added
+ - Join function for KHIVA arrays.
+
+Fixed
+ - to_arrayfire and from_arrayfire functions.
+ - KShape for double precision data.
+
 Version 0.2.0
 =============
 

khiva/array.py

@@ -10,14 +10,17 @@
 ########################################################################################################################
 # IMPORT
 ########################################################################################################################
-import numpy as np
+
 import ctypes
+import logging
+import sys
 from collections import deque
-from khiva.library import KhivaLibrary
 from enum import Enum
+
+import numpy as np
 import pandas as pd
-import logging
-import sys
+
+from khiva.library import KhivaLibrary
 
 
 ########################################################################################################################
@@ -159,7 +162,8 @@ def from_arrayfire(cls, arrayfire):
         """
         result = ctypes.c_void_p(0)
         KhivaLibrary().c_khiva_library.from_arrayfire(ctypes.pointer(arrayfire.arr), ctypes.pointer(result))
-        return cls(array_reference=result, arrayfire_reference=True)
+        arrayfire.arr.value = 0
+        return cls(array_reference=result, arrayfire_reference=False)
 
     def _create_array(self, data):
         """ Creates the KHIVA array in the device.
@@ -306,10 +310,24 @@ def to_pandas(self):
 
     def display(self):
         """
-        Dispays the data stored in the KHIVA array.
+        Displays the data stored in the KHIVA array.
         """
         KhivaLibrary().c_khiva_library.display(ctypes.pointer(self.arr_reference))
 
+    def join(self, dim, other):
+        """
+        Joins the first and second KHIVA arrays along the specified dimension.
+        :param dim: The dimension along which the join occurs.
+        :param other: The second input array.
+        :return: KHIVA Array with the result of this operation.
+        """
+        result = ctypes.c_void_p(0)
+        KhivaLibrary().c_khiva_library.join(ctypes.pointer(ctypes.c_int(dim)),
+                                            ctypes.pointer(self.arr_reference),
+                                            ctypes.pointer(other.arr_reference),
+                                            ctypes.pointer(result))
+        return Array(array_reference=result)
+
     def __len__(self):
         """
         Return the length.

setup.py

@@ -21,7 +21,7 @@
     author="Shapelets.io",
     author_email="dev@shapelets.io",
     name="khiva",
-    version='0.2.0',
+    version='0.2.2',
     long_description = LONG_DESC,
     description="Python bindings for khiva",
     license="MPL 2.0",

tests/unit_tests/array_unit_tests.py

@@ -12,10 +12,12 @@
 # IMPORT
 ########################################################################################################################
 import unittest
+
+import arrayfire as af
 import numpy as np
 import pandas as pd
+
 from khiva.array import Array, dtype
-import arrayfire as af
 from khiva.library import set_backend, KHIVABackend
 
 
@@ -120,6 +122,12 @@ def test_get_type(self):
         expected = dtype.s64
         self.assertEqual(a.get_type(), expected)
 
+    def test_join(self):
+        a = Array([1, 2, 3, 4], khiva_type=dtype.f64)
+        b = Array([5, 6, 7, 8], khiva_type=dtype.f64)
+        c = a.join(0, b)
+        np.testing.assert_array_equal(c.to_numpy(), np.array([1, 2, 3, 4, 5, 6, 7, 8]))
+
     def testPlus(self):
         a = Array([1, 2, 3, 4])
         b = Array([1, 2, 3, 4])
@@ -276,8 +284,9 @@ def testCopy(self):
 
     def testArrayfire(self):
         a = af.Array([1, 2, 3, 4])
+        a_data = a.to_list()
         b = Array.from_arrayfire(a)
-        np.testing.assert_array_equal(np.asarray(a.to_list()), np.asarray(b.to_list()))
+        np.testing.assert_array_equal(np.asarray(a_data), np.asarray(b.to_list()))
 
     def testFromPandas(self):
         df = pd.DataFrame([[1, 2, 3, 4], [5, 6, 7, 8]])