fix: fix ctypes declaration of _view() functions

Author: ntamas

src/codegen/internal_lib.py.in

@@ -110,8 +110,8 @@ igraph_vector_init_array.restype = handle_igraph_error_t
 igraph_vector_init_array.argtypes = [POINTER(igraph_vector_t), POINTER(igraph_real_t), igraph_int_t]
 
 igraph_vector_view = _lib.igraph_vector_view
-igraph_vector_view.restype = POINTER(igraph_vector_t)
-igraph_vector_view.argtypes = [POINTER(igraph_vector_t), POINTER(igraph_real_t), igraph_int_t]
+igraph_vector_view.restype = igraph_vector_t
+igraph_vector_view.argtypes = [POINTER(igraph_real_t), igraph_int_t]
 
 igraph_vector_clear = _lib.igraph_vector_clear
 igraph_vector_clear.restype = None
@@ -160,8 +160,8 @@ igraph_vector_int_init_array.restype = handle_igraph_error_t
 igraph_vector_int_init_array.argtypes = [POINTER(igraph_vector_int_t), POINTER(igraph_int_t), igraph_int_t]
 
 igraph_vector_int_view = _lib.igraph_vector_int_view
-igraph_vector_int_view.restype = POINTER(igraph_vector_int_t)
-igraph_vector_int_view.argtypes = [POINTER(igraph_vector_int_t), POINTER(igraph_int_t), igraph_int_t]
+igraph_vector_int_view.restype = igraph_vector_int_t
+igraph_vector_int_view.argtypes = [POINTER(igraph_int_t), igraph_int_t]
 
 igraph_vector_int_clear = _lib.igraph_vector_int_clear
 igraph_vector_int_clear.restype = None
@@ -210,8 +210,8 @@ igraph_vector_bool_init_array.restype = handle_igraph_error_t
 igraph_vector_bool_init_array.argtypes = [POINTER(igraph_vector_bool_t), POINTER(igraph_bool_t), igraph_int_t]
 
 igraph_vector_bool_view = _lib.igraph_vector_bool_view
-igraph_vector_bool_view.restype = POINTER(igraph_vector_bool_t)
-igraph_vector_bool_view.argtypes = [POINTER(igraph_vector_bool_t), POINTER(igraph_bool_t), igraph_int_t]
+igraph_vector_bool_view.restype = igraph_vector_bool_t
+igraph_vector_bool_view.argtypes = [POINTER(igraph_bool_t), igraph_int_t]
 
 igraph_vector_bool_clear = _lib.igraph_vector_bool_clear
 igraph_vector_bool_clear.restype = None
@@ -322,9 +322,8 @@ igraph_matrix_init_array.argtypes = [
 ]
 
 igraph_matrix_view = _lib.igraph_matrix_view
-igraph_matrix_view.restype = POINTER(igraph_matrix_t)
+igraph_matrix_view.restype = igraph_matrix_t
 igraph_matrix_view.argtypes = [
-    POINTER(igraph_matrix_t),
     POINTER(igraph_real_t),
     igraph_int_t,
     igraph_int_t,
@@ -363,9 +362,8 @@ igraph_matrix_int_init_array.argtypes = [
 ]
 
 igraph_matrix_int_view = _lib.igraph_matrix_int_view
-igraph_matrix_int_view.restype = POINTER(igraph_matrix_int_t)
+igraph_matrix_int_view.restype = igraph_matrix_int_t
 igraph_matrix_int_view.argtypes = [
-    POINTER(igraph_matrix_int_t),
     POINTER(igraph_int_t),
     igraph_int_t,
     igraph_int_t,

src/igraph_ctypes/_internal/conversion.py

@@ -621,14 +621,12 @@ def numpy_array_to_igraph_vector_bool_t_view(
     provided into the copy.
     """
     arr = _force_into_1d_numpy_array(arr, np_type_of_igraph_bool_t, flatten=flatten)
+    arr_ptr = arr.ctypes.data_as(POINTER(igraph_bool_t))
 
-    result = _VectorBool()
-    igraph_vector_bool_view(
-        result, arr.ctypes.data_as(POINTER(igraph_bool_t)), arr.shape[0]
-    )
+    result = _VectorBool(igraph_vector_bool_view(arr_ptr, arr.shape[0]))
 
     # Destructor must not be called so we never mark result as initialized;
-    # this is intentional
+    result.release()
 
     return result
 
@@ -655,14 +653,12 @@ def numpy_array_to_igraph_vector_int_t_view(
     provided into the copy.
     """
     arr = _force_into_1d_numpy_array(arr, np_type_of_igraph_int_t, flatten=flatten)
+    arr_ptr = arr.ctypes.data_as(POINTER(igraph_int_t))
 
-    result = _VectorInt()
-    igraph_vector_int_view(
-        result, arr.ctypes.data_as(POINTER(igraph_int_t)), arr.shape[0]
-    )
+    result = _VectorInt(igraph_vector_int_view(arr_ptr, arr.shape[0]))
 
-    # Destructor must not be called so we never mark result as initialized;
-    # this is intentional
+    # Destructor must not be called so we need to call .release()
+    result.release()
 
     return result
 
@@ -687,12 +683,12 @@ def numpy_array_to_igraph_vector_t_view(
     provided into the copy.
     """
     arr = _force_into_1d_numpy_array(arr, np_type_of_igraph_real_t, flatten=flatten)
+    arr_ptr = arr.ctypes.data_as(POINTER(igraph_real_t))
 
-    result = _Vector()
-    igraph_vector_view(result, arr.ctypes.data_as(POINTER(igraph_real_t)), arr.shape[0])
+    result = _Vector(igraph_vector_view(arr_ptr, arr.shape[0]))
 
-    # Destructor must not be called so we never mark result as initialized;
-    # this is intentional
+    # Destructor must not be called so we need to call .release()
+    result.release()
 
     return result
 

src/igraph_ctypes/_internal/lib.py

@@ -110,8 +110,8 @@ def _load_libc():
 igraph_vector_init_array.argtypes = [POINTER(igraph_vector_t), POINTER(igraph_real_t), igraph_int_t]
 
 igraph_vector_view = _lib.igraph_vector_view
-igraph_vector_view.restype = POINTER(igraph_vector_t)
-igraph_vector_view.argtypes = [POINTER(igraph_vector_t), POINTER(igraph_real_t), igraph_int_t]
+igraph_vector_view.restype = igraph_vector_t
+igraph_vector_view.argtypes = [POINTER(igraph_real_t), igraph_int_t]
 
 igraph_vector_clear = _lib.igraph_vector_clear
 igraph_vector_clear.restype = None
@@ -160,8 +160,8 @@ def _load_libc():
 igraph_vector_int_init_array.argtypes = [POINTER(igraph_vector_int_t), POINTER(igraph_int_t), igraph_int_t]
 
 igraph_vector_int_view = _lib.igraph_vector_int_view
-igraph_vector_int_view.restype = POINTER(igraph_vector_int_t)
-igraph_vector_int_view.argtypes = [POINTER(igraph_vector_int_t), POINTER(igraph_int_t), igraph_int_t]
+igraph_vector_int_view.restype = igraph_vector_int_t
+igraph_vector_int_view.argtypes = [POINTER(igraph_int_t), igraph_int_t]
 
 igraph_vector_int_clear = _lib.igraph_vector_int_clear
 igraph_vector_int_clear.restype = None
@@ -210,8 +210,8 @@ def _load_libc():
 igraph_vector_bool_init_array.argtypes = [POINTER(igraph_vector_bool_t), POINTER(igraph_bool_t), igraph_int_t]
 
 igraph_vector_bool_view = _lib.igraph_vector_bool_view
-igraph_vector_bool_view.restype = POINTER(igraph_vector_bool_t)
-igraph_vector_bool_view.argtypes = [POINTER(igraph_vector_bool_t), POINTER(igraph_bool_t), igraph_int_t]
+igraph_vector_bool_view.restype = igraph_vector_bool_t
+igraph_vector_bool_view.argtypes = [POINTER(igraph_bool_t), igraph_int_t]
 
 igraph_vector_bool_clear = _lib.igraph_vector_bool_clear
 igraph_vector_bool_clear.restype = None
@@ -322,9 +322,8 @@ def _load_libc():
 ]
 
 igraph_matrix_view = _lib.igraph_matrix_view
-igraph_matrix_view.restype = POINTER(igraph_matrix_t)
+igraph_matrix_view.restype = igraph_matrix_t
 igraph_matrix_view.argtypes = [
-    POINTER(igraph_matrix_t),
     POINTER(igraph_real_t),
     igraph_int_t,
     igraph_int_t,
@@ -363,9 +362,8 @@ def _load_libc():
 ]
 
 igraph_matrix_int_view = _lib.igraph_matrix_int_view
-igraph_matrix_int_view.restype = POINTER(igraph_matrix_int_t)
+igraph_matrix_int_view.restype = igraph_matrix_int_t
 igraph_matrix_int_view.argtypes = [
-    POINTER(igraph_matrix_int_t),
     POINTER(igraph_int_t),
     igraph_int_t,
     igraph_int_t,