missing np.import_array() added (#155)

cihologramas · Mar 5, 2024 · cb135b2 · cb135b2
1 parent 31b181e
commit cb135b2
Show file tree

Hide file tree

Showing 25 changed files with 29 additions and 5 deletions.
diff --git a/pyoptools/misc/Poly1Drot/Poly1Drot.pyx b/pyoptools/misc/Poly1Drot/Poly1Drot.pyx
@@ -1,6 +1,8 @@
 #cython: profile=True
 import numpy as np
 cimport numpy as np
+np.import_array()
+
 cimport cython
 
 cdef extern from "math.h":

diff --git a/pyoptools/misc/cmisc/cmisc.pxd b/pyoptools/misc/cmisc/cmisc.pxd
@@ -10,7 +10,7 @@ cdef extern from "Python.h":
 
 cdef extern from "numpy/arrayobject.h":
 
-    cdef void import_array()
+    #cdef void import_array()
 
     cdef object PyArray_ZEROS(int nd, np.npy_intp *dims, int typenum, int fortran)
     cdef object PyArray_SimpleNew(int nd, np.npy_intp *dims, int typenum)

diff --git a/pyoptools/misc/cmisc/cmisc.pyx b/pyoptools/misc/cmisc/cmisc.pyx
@@ -4,7 +4,7 @@
 import numpy as np
 cimport numpy as np
 
-import_array()
+np.import_array()
 
 cimport cython
 

diff --git a/pyoptools/misc/definitions/definitions.pyx b/pyoptools/misc/definitions/definitions.pyx
@@ -1,6 +1,5 @@
 # Definitions that help to speed up some processces
 
-cimport numpy as np
 from numpy import inf, array
 # Infinity vector is used in many places to show no intersection, to
 # avoid runtime creation of many infiniti vectors, inf_vect should be used

diff --git a/pyoptools/misc/lsq/lsq.pyx b/pyoptools/misc/lsq/lsq.pyx
@@ -4,6 +4,7 @@ from pyoptools.misc.Poly2D.Poly2D cimport *
 #from pyoptools.misc.Poly2D import *
 
 cimport numpy as np
+np.import_array()
 import numpy as np
 cimport cython
 

diff --git a/pyoptools/misc/plist/plist.pyx b/pyoptools/misc/plist/plist.pyx
@@ -1,5 +1,7 @@
 # cython: profile=True
 cimport numpy as np
+np.import_array()
+
 from numpy import array, float64
 import six
 

diff --git a/pyoptools/raytrace/component/component.pyx b/pyoptools/raytrace/component/component.pyx
@@ -11,6 +11,7 @@ from pyoptools.raytrace.ray.ray cimport Ray
 from pyoptools.raytrace.surface.surface cimport Surface
 from numpy import inf, asarray, pi, alltrue, sometrue, isinf, isnan, array, dot, float64
 cimport numpy as np
+np.import_array()
 
 
 #from misc import rot_mat, rot_mat_i

diff --git a/pyoptools/raytrace/ray/ray.pxd b/pyoptools/raytrace/ray/ray.pxd
@@ -1,5 +1,7 @@
 
 cimport numpy as np
+np.import_array()
+
 from cpython cimport bool
 
 

diff --git a/pyoptools/raytrace/ray/ray.pyx b/pyoptools/raytrace/ray/ray.pyx
@@ -20,7 +20,6 @@ from sys import exit
 
 import numpy as np
 from numpy import dot, array, float_, inf, float64, empty, zeros, sqrt as npsqrt
-cimport numpy as np
 
 #from misc import rot_mat, rot_mat_i,mvdot, dot_test
 from pyoptools.misc.cmisc.cmisc cimport *  # rot_mat, rot_mat_i

diff --git a/pyoptools/raytrace/surface/aspherical.pyx b/pyoptools/raytrace/surface/aspherical.pyx
@@ -30,6 +30,7 @@ cdef extern from "math.h":
 
 
 cimport numpy as np
+np.import_array()
 
 
 #from ray_trace.surface.taylor_poly import eval_poly,  Poly_DyDx

diff --git a/pyoptools/raytrace/surface/cylinder.pyx b/pyoptools/raytrace/surface/cylinder.pyx
@@ -23,6 +23,7 @@ from pyoptools.raytrace.ray.ray cimport Ray
 from pyoptools.raytrace.surface.surface cimport Surface
 from numpy import pi, power, array, inf, sqrt, absolute, float64, dot, sin, cos
 cimport numpy as np
+np.import_array()
 #from enthought.traits.api import Float, Tuple
 #from enthought.traits.ui.view import Group, Item
 #from enthought.tvtk.api import tvtk

diff --git a/pyoptools/raytrace/surface/cylindrical.pyx b/pyoptools/raytrace/surface/cylindrical.pyx
@@ -24,6 +24,7 @@ from pyoptools.raytrace.ray.ray cimport Ray
 from pyoptools.raytrace.surface.surface cimport Surface
 from numpy import power, array, inf, absolute, float64, dot, sqrt as npsqrt
 cimport numpy as np
+np.import_array()
 
 #from enthought.traits.api import Float, Tuple
 #from enthought.traits.ui.view import Group, Item

diff --git a/pyoptools/raytrace/surface/idealsurface.pyx b/pyoptools/raytrace/surface/idealsurface.pyx
@@ -12,6 +12,7 @@ from pyoptools.misc.definitions import inf_vect
 from pyoptools.raytrace.surface.surface cimport Surface
 from pyoptools.raytrace.ray.ray cimport Ray
 cimport numpy as np
+np.import_array()
 
 cdef class IdealSurface(Surface):
     """Clase que representa una superficie ideal. Se utiliza para crear

diff --git a/pyoptools/raytrace/surface/plane.pxd b/pyoptools/raytrace/surface/plane.pxd
@@ -1,6 +1,8 @@
 from pyoptools.raytrace.surface.surface cimport Surface
 from pyoptools.raytrace.ray.ray cimport Ray
 cimport numpy as np
+
+
 cdef class Plane(Surface):
     cpdef _intersection(self, Ray A)
     cpdef np.ndarray normal(self, ri)
diff --git a/pyoptools/raytrace/surface/plane.pyx b/pyoptools/raytrace/surface/plane.pyx
@@ -33,6 +33,7 @@ from pyoptools.raytrace.ray.ray cimport Ray
 from pyoptools.misc.definitions import *
 
 cimport numpy as np
+np.import_array()
 
 
 cdef class Plane(Surface):

diff --git a/pyoptools/raytrace/surface/plane_mask.pyx b/pyoptools/raytrace/surface/plane_mask.pyx
@@ -32,6 +32,7 @@ cdef extern from "math.h":
 
 
 cimport numpy as np
+np.import_array()
 
 
 cdef class RPPMask(Surface):

diff --git a/pyoptools/raytrace/surface/powell.pyx b/pyoptools/raytrace/surface/powell.pyx
@@ -31,6 +31,7 @@ cdef extern from "math.h":
 
 
 cimport numpy as np
+np.import_array()
 
 
 #from ray_trace.surface.taylor_poly import eval_poly,  Poly_DyDx

diff --git a/pyoptools/raytrace/surface/spherical.pyx b/pyoptools/raytrace/surface/spherical.pyx
@@ -27,6 +27,7 @@ cdef extern from "math.h":
 '''
 
 cimport numpy as np
+np.import_array()
 
 
 cdef class Spherical(Surface):

diff --git a/pyoptools/raytrace/surface/taylor_poly.pyx b/pyoptools/raytrace/surface/taylor_poly.pyx
@@ -24,6 +24,7 @@ from numpy import array, asarray, arange, polyadd, polymul, polysub, polyval,\
      dot, inf, roots, zeros, meshgrid, where, abs, sqrt as npsqrt
 
 cimport numpy as np
+np.import_array()
 
 from pyoptools.raytrace.surface.surface cimport Surface
 from pyoptools.raytrace.ray.ray cimport Ray

diff --git a/pyoptools/raytrace/system/idealcomponent.pyx b/pyoptools/raytrace/system/idealcomponent.pyx
@@ -5,6 +5,7 @@ from pyoptools.raytrace.surface.plane cimport Plane
 from math import isinf
 from numpy import asarray
 cimport numpy as np
+np.import_array()
 
 
 class IdealThickLens(System):

diff --git a/pyoptools/raytrace/system/system.pyx b/pyoptools/raytrace/system/system.pyx
@@ -37,6 +37,7 @@ from pyoptools.raytrace.surface.surface cimport Surface
 from pyoptools.raytrace.component.component cimport Component
 
 cimport numpy as np
+np.import_array()
 
 cdef extern from "math.h":
     bint isnan(double x) nogil

diff --git a/pyoptools/wavefront/cpsurfrep/cpsurfrep.pyx b/pyoptools/wavefront/cpsurfrep/cpsurfrep.pyx
@@ -4,6 +4,8 @@ from pyoptools.misc import *
 
 import numpy as np
 cimport numpy as np
+np.import_array()
+
 cimport cython
 
 #from numpy.ma import is_masked, MaskedArray

diff --git a/pyoptools/wavefront/field/field.pyx b/pyoptools/wavefront/field/field.pyx
@@ -52,6 +52,7 @@ cdef extern from "math.h":
     double sqrt(double)
 
 cimport numpy as np
+np.import_array()
 cimport cython
 
 

diff --git a/pyoptools/wavefront/psurfrep/psurfrep.pyx b/pyoptools/wavefront/psurfrep/psurfrep.pyx
@@ -10,6 +10,8 @@ from pyoptools.misc.Poly2D import ord2i, poly2d
 from pyoptools.wavefront.field import Field
 
 cimport numpy as np
+np.import_array()
+
 cdef extern from "math.h":
     double sqrt(double) nogil
     double atan2(double, double) nogil

diff --git a/pyproject.toml b/pyproject.toml
@@ -10,7 +10,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyoptools"
-version = "0.2.2"
+version = "0.2.3"
 description = "Python tools for simulation of optical systems"
 authors = [{ name = "Ricardo Amézquita Orozco", email = "ramezquitao@cihologramas.com" }]
 license = {file = "LICENSE.txt"}