From 6e500b173377db76c77c27af7496e3619992b4a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Wed, 20 May 2015 20:29:19 -0700 Subject: [PATCH] Do not acquire GIL for shared functions --- skimage/_shared/geometry.pxd | 4 ++-- skimage/_shared/geometry.pyx | 5 +++-- skimage/_shared/transform.pxd | 2 +- skimage/_shared/transform.pyx | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/skimage/_shared/geometry.pxd b/skimage/_shared/geometry.pxd index 3379318c..4524fa37 100644 --- a/skimage/_shared/geometry.pxd +++ b/skimage/_shared/geometry.pxd @@ -1,6 +1,6 @@ cdef unsigned char point_in_polygon(Py_ssize_t nr_verts, double *xp, double *yp, - double x, double y) + double x, double y) nogil cdef void points_in_polygon(Py_ssize_t nr_verts, double *xp, double *yp, Py_ssize_t nr_points, double *x, double *y, - unsigned char *result) + unsigned char *result) nogil diff --git a/skimage/_shared/geometry.pyx b/skimage/_shared/geometry.pyx index beb07e14..ea6695a9 100644 --- a/skimage/_shared/geometry.pyx +++ b/skimage/_shared/geometry.pyx @@ -5,7 +5,8 @@ cdef inline unsigned char point_in_polygon(Py_ssize_t nr_verts, double *xp, - double *yp, double x, double y): + double *yp, double x, + double y) nogil: """Test whether point lies inside a polygon. Parameters @@ -33,7 +34,7 @@ cdef inline unsigned char point_in_polygon(Py_ssize_t nr_verts, double *xp, cdef void points_in_polygon(Py_ssize_t nr_verts, double *xp, double *yp, Py_ssize_t nr_points, double *x, double *y, - unsigned char *result): + unsigned char *result) nogil: """Test whether points lie inside a polygon. Parameters diff --git a/skimage/_shared/transform.pxd b/skimage/_shared/transform.pxd index 4978e843..b48fe92e 100644 --- a/skimage/_shared/transform.pxd +++ b/skimage/_shared/transform.pxd @@ -2,4 +2,4 @@ cimport numpy as cnp cdef float integrate(float[:, ::1] sat, Py_ssize_t r0, Py_ssize_t c0, - Py_ssize_t r1, Py_ssize_t c1) + Py_ssize_t r1, Py_ssize_t c1) nogil diff --git a/skimage/_shared/transform.pyx b/skimage/_shared/transform.pyx index d77ec583..cbb40144 100644 --- a/skimage/_shared/transform.pyx +++ b/skimage/_shared/transform.pyx @@ -6,7 +6,7 @@ cimport numpy as cnp cdef float integrate(float[:, ::1] sat, Py_ssize_t r0, Py_ssize_t c0, - Py_ssize_t r1, Py_ssize_t c1): + Py_ssize_t r1, Py_ssize_t c1) nogil: """ Using a summed area table / integral image, calculate the sum over a given window.