Update wrapper

- add Kron
- add MxM
- add Duplicate

Author: Krekep

python/pycubool/dll.py

@@ -1,6 +1,5 @@
 import ctypes
 
-
 __all__ = [
     "CuBoolInstanceDesc",
     "load_and_configure",
@@ -63,6 +62,11 @@ def load_and_configure(cubool_lib_path: str):
                                                ctypes.POINTER(ctypes.c_uint),
                                                ctypes.POINTER(ctypes.c_size_t)]
 
+    lib.CuBool_Matrix_Duplicate.restype = ctypes.c_uint
+    lib.CuBool_Matrix_Duplicate.argtypes = [instance_p,
+                                            matrix_p,
+                                            p_to_matrix_p]
+
     lib.CuBool_Matrix_Nrows.restype = ctypes.c_uint
     lib.CuBool_Matrix_Nrows.argtype = [instance_p,
                                        matrix_p,
@@ -83,6 +87,18 @@ def load_and_configure(cubool_lib_path: str):
                                       matrix_p,
                                       matrix_p]
 
+    lib.CuBool_MxM.restype = ctypes.c_uint
+    lib.CuBool_MxM.argtypes = [instance_p,
+                               matrix_p,
+                               matrix_p,
+                               matrix_p]
+
+    lib.CuBool_Kron.restype = ctypes.c_uint
+    lib.CuBool_Kron.argtypes = [instance_p,
+                                matrix_p,
+                                matrix_p,
+                                matrix_p]
+
     return lib
 
 

python/pycubool/kron.py

@@ -0,0 +1,16 @@
+from . import wrapper
+from . import dll
+from . import matrix
+
+__all__ = [
+    "kron"
+]
+
+
+def kron(result_matrix: matrix.Matrix, a_matrix: matrix.Matrix, b_matrix: matrix.Matrix):
+    status = wrapper.loaded_dll.CuBool_Kron(wrapper.instance,
+                                            result_matrix.hnd,
+                                            a_matrix.hnd,
+                                            b_matrix.hnd)
+
+    dll.check(status)

python/pycubool/matrix.py

@@ -3,7 +3,6 @@
 from . import wrapper
 from . import dll
 
-
 __all__ = [
     "Matrix"
 ]
@@ -63,7 +62,7 @@ def nrows(self) -> int:
         return int(result.value)
 
     @property
-    def nclos(self):
+    def nclos(self) -> int:
         result = ctypes.c_uint(0)
 
         status = wrapper.loaded_dll.CuBool_Matrix_Ncols(wrapper.instance,
@@ -103,3 +102,12 @@ def to_lists(self):
         dll.check(status)
 
         return rows, cols
+
+    def duplicate(self):
+        result_matrix = Matrix(self.nrows, self.nclos)
+        status = wrapper.loaded_dll.CuBool_Matrix_Duplicate(wrapper.instance,
+                                                            self.hnd,
+                                                            result_matrix.hnd)
+
+        dll.check(status)
+        return result_matrix

python/pycubool/mxm.py

@@ -0,0 +1,16 @@
+from . import wrapper
+from . import dll
+from . import matrix
+
+__all__ = [
+    "mxm"
+]
+
+
+def mxm(result_matrix: matrix.Matrix, a_matrix: matrix.Matrix, b_matrix: matrix.Matrix):
+    status = wrapper.loaded_dll.CuBool_MxM(wrapper.instance,
+                                           result_matrix.hnd,
+                                           a_matrix.hnd,
+                                           b_matrix.hnd)
+
+    dll.check(status)