Fix build

- fix error with locating numpy include dir - fix import_array errors
CellProfiler · Jul 11, 2024 · 591dea7 · 591dea7
1 parent b178071
commit 591dea7
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 13,810 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 .eggs
 .idea
 .tox
+centrosome/_propagate.c
 __pycache__
 build
 centrosome.egg-info/

diff --git a/centrosome/_cpmorphology2.pyx b/centrosome/_cpmorphology2.pyx
@@ -12,10 +12,9 @@ cdef extern from "numpy/arrayobject.h":
         cdef Py_intptr_t *dimensions
         cdef Py_intptr_t *shape        
         cdef Py_intptr_t *strides
-    cdef void import_array()
     cdef int  PyArray_ITEMSIZE(np.ndarray)
 
-import_array()
+np.import_array()
 
 @cython.boundscheck(False)
 def skeletonize_loop(np.ndarray[dtype=np.uint8_t, ndim=2, 

diff --git a/centrosome/_filter.pyx b/centrosome/_filter.pyx
@@ -10,7 +10,6 @@ cdef extern from "numpy/arrayobject.h":
     ctypedef class numpy.ndarray [object PyArrayObject]:
         cdef char *data
         cdef Py_intptr_t *strides
-    cdef void import_array()
     cdef int  PyArray_ITEMSIZE(np.ndarray)
 
 cdef extern from "stdlib.h":
@@ -21,7 +20,7 @@ cdef extern from "stdlib.h":
 cdef extern from "string.h":
     void *memset(void *, int, int)
 
-import_array()
+np.import_array()
 
 ##############################################################################
 # 

diff --git a/centrosome/_lapjv.pyx b/centrosome/_lapjv.pyx
@@ -12,11 +12,10 @@ cdef extern from "numpy/arrayobject.h":
         cdef int nd
         cdef Py_intptr_t *dimensions
         cdef Py_intptr_t *strides
-    cdef void import_array()
     cdef int  PyArray_ITEMSIZE(np.ndarray)
     cdef void * PyArray_DATA(np.ndarray)
 
-import_array()
+np.import_array()
 
 __eps = np.sqrt(np.finfo(np.float64).eps)
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ @@
     .eggs
     .idea
     .tox
+    centrosome/_propagate.c
     __pycache__
     build
     centrosome.egg-info/
@@ Expand Down @@