From e1290bce441c8958d12b601f29691581d3742872 Mon Sep 17 00:00:00 2001 From: georgeyiasemis Date: Mon, 24 Jun 2024 10:36:58 +0200 Subject: [PATCH] New version (pip?) causes problems with cnp.int_t --- direct/common/_gaussian.pyx | 4 ++-- direct/common/_poisson.pyx | 6 +++--- direct/ssl/_gaussian_fill.pyx | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/direct/common/_gaussian.pyx b/direct/common/_gaussian.pyx index 8c4db1ff8..7a05682b7 100644 --- a/direct/common/_gaussian.pyx +++ b/direct/common/_gaussian.pyx @@ -57,7 +57,7 @@ def gaussian_mask_1d( int n, int center, double std, - cnp.ndarray[cnp.int_t, ndim=1, mode='c'] mask, + cnp.ndarray[cnp.int32_t, ndim=1, mode='c'] mask, int seed, ): cdef int count, ind @@ -82,7 +82,7 @@ def gaussian_mask_2d( int center_x, int center_y, cnp.ndarray[cnp.float_t, ndim=1, mode='c'] std, - cnp.ndarray[cnp.int_t, ndim=2, mode='c'] mask, + cnp.ndarray[cnp.int32_t, ndim=2, mode='c'] mask, int seed, ): cdef int count, indx, indy diff --git a/direct/common/_poisson.pyx b/direct/common/_poisson.pyx index 5b1ad1830..a93e32630 100644 --- a/direct/common/_poisson.pyx +++ b/direct/common/_poisson.pyx @@ -38,7 +38,7 @@ def poisson( int nx, int ny, int max_attempts, - cnp.ndarray[cnp.int_t, ndim=2, mode='c'] mask, + cnp.ndarray[cnp.int32_t, ndim=2, mode='c'] mask, cnp.ndarray[cnp.float64_t, ndim=2, mode='c'] radius_x, cnp.ndarray[cnp.float64_t, ndim=2, mode='c'] radius_y, int seed @@ -62,8 +62,8 @@ def poisson( cdef Py_ssize_t startx, endx, starty, endy, px, py # initialize active list - cdef cnp.ndarray[cnp.int_t, ndim=1, mode='c'] pxs = np.empty(nx * ny, dtype=int) - cdef cnp.ndarray[cnp.int_t, ndim=1, mode='c'] pys = np.empty(nx * ny, dtype=int) + cdef cnp.ndarray[cnp.int32_t, ndim=1, mode='c'] pxs = np.empty(nx * ny, dtype=int) + cdef cnp.ndarray[cnp.int32_t, ndim=1, mode='c'] pys = np.empty(nx * ny, dtype=int) srand(seed) diff --git a/direct/ssl/_gaussian_fill.pyx b/direct/ssl/_gaussian_fill.pyx index d880916a7..406d99c50 100644 --- a/direct/ssl/_gaussian_fill.pyx +++ b/direct/ssl/_gaussian_fill.pyx @@ -45,8 +45,8 @@ def gaussian_fill( int center_x, int center_y, double std_scale, - cnp.ndarray[cnp.int_t, ndim=2, mode='c'] mask, - cnp.ndarray[cnp.int_t, ndim=2, mode='c'] output_mask, + cnp.ndarray[cnp.int32_t, ndim=2, mode='c'] mask, + cnp.ndarray[cnp.int32_t, ndim=2, mode='c'] output_mask, int seed, ): cdef int count, indx, indy