fix: remove usage of igraph_matrix_e now that it was removed from igraph itself

Author: ntamas

src/codegen/internal_lib.py.in

@@ -336,14 +336,6 @@ igraph_matrix_nrow = _lib.igraph_matrix_nrow
 igraph_matrix_nrow.restype = igraph_integer_t
 igraph_matrix_nrow.argtypes = [POINTER(igraph_matrix_t)]
 
-igraph_matrix_e = _lib.igraph_matrix_e
-igraph_matrix_e.restype = igraph_real_t
-igraph_matrix_e.argtypes = [POINTER(igraph_matrix_t), igraph_integer_t, igraph_integer_t]
-
-igraph_matrix_e_ptr = _lib.igraph_matrix_e_ptr
-igraph_matrix_e_ptr.restype = POINTER(igraph_real_t)
-igraph_matrix_e_ptr.argtypes = [POINTER(igraph_matrix_t), igraph_integer_t, igraph_integer_t]
-
 # Integer matrix type
 
 igraph_matrix_int_init = _lib.igraph_matrix_int_init
@@ -385,14 +377,6 @@ igraph_matrix_int_nrow = _lib.igraph_matrix_int_nrow
 igraph_matrix_int_nrow.restype = igraph_integer_t
 igraph_matrix_int_nrow.argtypes = [POINTER(igraph_matrix_int_t)]
 
-igraph_matrix_int_e = _lib.igraph_matrix_int_e
-igraph_matrix_int_e.restype = igraph_integer_t
-igraph_matrix_int_e.argtypes = [POINTER(igraph_matrix_int_t), igraph_integer_t, igraph_integer_t]
-
-igraph_matrix_int_e_ptr = _lib.igraph_matrix_int_e_ptr
-igraph_matrix_int_e_ptr.restype = POINTER(igraph_integer_t)
-igraph_matrix_int_e_ptr.argtypes = [POINTER(igraph_matrix_int_t), igraph_integer_t, igraph_integer_t]
-
 # List of vectors type
 
 igraph_vector_list_init = _lib.igraph_vector_list_init

src/igraph_ctypes/_internal/conversion.py

@@ -5,7 +5,7 @@
 import numpy as np
 
 from contextlib import contextmanager
-from ctypes import addressof, cast, get_errno, memmove, POINTER
+from ctypes import addressof, get_errno, memmove, POINTER
 from os import strerror
 from typing import (
     Any,
@@ -32,11 +32,9 @@
     igraph_matrix_int_init_array,
     igraph_matrix_int_ncol,
     igraph_matrix_int_nrow,
-    igraph_matrix_int_e_ptr,
     igraph_matrix_init_array,
     igraph_matrix_ncol,
     igraph_matrix_nrow,
-    igraph_matrix_e_ptr,
     igraph_vector_bool_get,
     igraph_vector_bool_get_ptr,
     igraph_vector_bool_init_array,
@@ -824,17 +822,15 @@ def igraph_matrix_t_to_numpy_array(matrix: _Matrix) -> RealArray:
     shape = igraph_matrix_nrow(matrix), igraph_matrix_ncol(matrix)
     result = np.zeros(shape, dtype=np_type_of_igraph_real_t)
     if result.size > 0:
-        memmove(result.ctypes.data, igraph_matrix_e_ptr(matrix, 0, 0), result.nbytes)
+        memmove(result.ctypes.data, matrix.unwrap().data.stor_begin, result.nbytes)
     return result
 
 
 def igraph_matrix_int_t_to_numpy_array(matrix: _MatrixInt) -> IntArray:
     shape = igraph_matrix_int_nrow(matrix), igraph_matrix_int_ncol(matrix)
     result = np.zeros(shape, dtype=np_type_of_igraph_integer_t)
     if result.size > 0:
-        memmove(
-            result.ctypes.data, igraph_matrix_int_e_ptr(matrix, 0, 0), result.nbytes
-        )
+        memmove(result.ctypes.data, matrix.unwrap().data.stor_begin, result.nbytes)
     return result
 
 

src/igraph_ctypes/_internal/lib.py

@@ -336,14 +336,6 @@ def _load_libc():
 igraph_matrix_nrow.restype = igraph_integer_t
 igraph_matrix_nrow.argtypes = [POINTER(igraph_matrix_t)]
 
-igraph_matrix_e = _lib.igraph_matrix_e
-igraph_matrix_e.restype = igraph_real_t
-igraph_matrix_e.argtypes = [POINTER(igraph_matrix_t), igraph_integer_t, igraph_integer_t]
-
-igraph_matrix_e_ptr = _lib.igraph_matrix_e_ptr
-igraph_matrix_e_ptr.restype = POINTER(igraph_real_t)
-igraph_matrix_e_ptr.argtypes = [POINTER(igraph_matrix_t), igraph_integer_t, igraph_integer_t]
-
 # Integer matrix type
 
 igraph_matrix_int_init = _lib.igraph_matrix_int_init
@@ -385,14 +377,6 @@ def _load_libc():
 igraph_matrix_int_nrow.restype = igraph_integer_t
 igraph_matrix_int_nrow.argtypes = [POINTER(igraph_matrix_int_t)]
 
-igraph_matrix_int_e = _lib.igraph_matrix_int_e
-igraph_matrix_int_e.restype = igraph_integer_t
-igraph_matrix_int_e.argtypes = [POINTER(igraph_matrix_int_t), igraph_integer_t, igraph_integer_t]
-
-igraph_matrix_int_e_ptr = _lib.igraph_matrix_int_e_ptr
-igraph_matrix_int_e_ptr.restype = POINTER(igraph_integer_t)
-igraph_matrix_int_e_ptr.argtypes = [POINTER(igraph_matrix_int_t), igraph_integer_t, igraph_integer_t]
-
 # List of vectors type
 
 igraph_vector_list_init = _lib.igraph_vector_list_init