chore: no more depend on pre-NumPy-1.7 C-API

Ref: https://cython.readthedocs.io/en/3.0.x/src/userguide/migrating_to_cy30.html
pypr · Sep 26, 2024 · e33482e · e33482e
1 parent fc8046d
commit e33482e
Show file tree

Hide file tree

Showing 39 changed files with 93 additions and 10 deletions.
diff --git a/pysph/base/box_sort_nnps.pxd b/pysph/base/box_sort_nnps.pxd
@@ -1,5 +1,7 @@
 # cython: language_level=3, embedsignature=True
 # distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 from libcpp.map cimport map
 
 from .nnps_base cimport *

diff --git a/pysph/base/box_sort_nnps.pyx b/pysph/base/box_sort_nnps.pyx
@@ -1,4 +1,7 @@
-# cython: language_level=3, language=c++, embedsignature=True
+# cython: language_level=3, embedsignature=True
+# distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 # Library imports.
 import numpy as np
 cimport numpy as np

diff --git a/pysph/base/cell_indexing_nnps.pxd b/pysph/base/cell_indexing_nnps.pxd
@@ -1,4 +1,7 @@
-# cython: language_level=3, language=c++, embedsignature=True
+# cython: language_level=3, embedsignature=True
+# distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 from libcpp.map cimport map
 from libcpp.pair cimport pair
 

diff --git a/pysph/base/cell_indexing_nnps.pyx b/pysph/base/cell_indexing_nnps.pyx
@@ -1,5 +1,6 @@
 # cython: language_level=3, embedsignature=True
 # distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
 
 # malloc and friends
 from libc.stdlib cimport malloc, free

diff --git a/pysph/base/gpu_nnps_base.pxd b/pysph/base/gpu_nnps_base.pxd
@@ -1,5 +1,7 @@
 # cython: language_level=3, embedsignature=True
 # distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 # numpy
 cimport numpy as np
 cimport cython

diff --git a/pysph/base/gpu_nnps_base.pyx b/pysph/base/gpu_nnps_base.pyx
@@ -1,5 +1,6 @@
 # cython: language_level=3, embedsignature=True
 # distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
 
 # Library imports.
 import numpy as np

diff --git a/pysph/base/linalg3.pxd b/pysph/base/linalg3.pxd
@@ -1,5 +1,6 @@
 # cython: language_level=3, embedsignature=True
 # distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
 
 """Routines for eigen decomposition of symmetric 3x3 matrices.
 """

diff --git a/pysph/base/linalg3.pyx b/pysph/base/linalg3.pyx
@@ -1,4 +1,5 @@
 #cython: boundscheck=False
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
 
 #
 # Eigen decomposition code for symmetric 3x3 matrices, some code taken

diff --git a/pysph/base/linked_list_nnps.pxd b/pysph/base/linked_list_nnps.pxd
@@ -1,5 +1,6 @@
 # cython: language_level=3, embedsignature=True
 # distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
 
 from libcpp.map cimport map
 from libcpp.vector cimport vector

diff --git a/pysph/base/linked_list_nnps.pyx b/pysph/base/linked_list_nnps.pyx
@@ -1,5 +1,7 @@
 # cython: language_level=3, embedsignature=True
 # distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 # Library imports.
 import numpy as np
 cimport numpy as np

diff --git a/pysph/base/nnps_base.pxd b/pysph/base/nnps_base.pxd
@@ -1,5 +1,7 @@
 # cython: language_level=3, embedsignature=True
 # distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 # numpy
 cimport numpy as np
 cimport cython

diff --git a/pysph/base/nnps_base.pyx b/pysph/base/nnps_base.pyx
@@ -1,5 +1,7 @@
 # cython: language_level=3, embedsignature=True
 # distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 # Library imports.
 import numpy as np
 cimport numpy as np

diff --git a/pysph/base/no_omp_threads.pxd b/pysph/base/no_omp_threads.pxd
@@ -1,2 +1,6 @@
+# cython: language_level=3, embedsignature=True
+# distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 cpdef int get_number_of_threads()
 cpdef set_number_of_threads(int)
diff --git a/pysph/base/no_omp_threads.pyx b/pysph/base/no_omp_threads.pyx
@@ -1,3 +1,7 @@
+# cython: language_level=3, embedsignature=True
+# distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 cpdef int get_number_of_threads():
     return 1
 

diff --git a/pysph/base/octree.pxd b/pysph/base/octree.pxd
@@ -1,5 +1,7 @@
 # cython: language_level=3, embedsignature=True
 # distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 from .nnps_base cimport *
 from libcpp.vector cimport vector
 cimport cython

diff --git a/pysph/base/octree.pyx b/pysph/base/octree.pyx
@@ -1,4 +1,6 @@
-#cython: embedsignature=True
+# cython: language_level=3, embedsignature=True
+# distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
 
 from .nnps_base cimport *
 

diff --git a/pysph/base/octree_gpu_nnps.pxd b/pysph/base/octree_gpu_nnps.pxd
@@ -1,5 +1,7 @@
 # cython: language_level=3, embedsignature=True
 # distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 from pysph.base.gpu_nnps_base cimport *
 
 

diff --git a/pysph/base/octree_gpu_nnps.pyx b/pysph/base/octree_gpu_nnps.pyx
@@ -1,4 +1,7 @@
-#cython: embedsignature=True
+# cython: language_level=3, embedsignature=True
+# distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 import numpy as np
 cimport numpy as np
 from pysph.base.tree.point_tree import PointTree

diff --git a/pysph/base/octree_nnps.pxd b/pysph/base/octree_nnps.pxd
@@ -1,5 +1,6 @@
 # cython: language_level=3, embedsignature=True
 # distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
 
 from .nnps_base cimport *
 from .octree cimport Octree, CompressedOctree, cOctreeNode

diff --git a/pysph/base/octree_nnps.pyx b/pysph/base/octree_nnps.pyx
@@ -1,4 +1,6 @@
-#cython: embedsignature=True
+# cython: language_level=3, embedsignature=True
+# distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
 
 from .nnps_base cimport *
 from .octree cimport Octree, CompressedOctree, cOctreeNode

diff --git a/pysph/base/omp_threads.pxd b/pysph/base/omp_threads.pxd
@@ -1,2 +1,6 @@
+# cython: language_level=3, embedsignature=True
+# distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 cpdef int get_number_of_threads()
 cpdef set_number_of_threads(int)
diff --git a/pysph/base/omp_threads.pyx b/pysph/base/omp_threads.pyx
@@ -1,3 +1,7 @@
+# cython: language_level=3, embedsignature=True
+# distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 from cython.parallel import parallel, prange
 cimport openmp
 

diff --git a/pysph/base/particle_array.pxd b/pysph/base/particle_array.pxd
@@ -1,4 +1,7 @@
-# cython: language_level=3, language=c++, embedsignature=True
+# cython: language_level=3, embedsignature=True
+# distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 cimport numpy as np
 
 from cyarray.carray cimport BaseArray, UIntArray, IntArray, LongArray

diff --git a/pysph/base/particle_array.pyx b/pysph/base/particle_array.pyx
@@ -1,5 +1,7 @@
 # cython: language_level=3, embedsignature=True
 # distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 """
 A `ParticleArray` represents a collection of particles.
 

diff --git a/pysph/base/point.pxd b/pysph/base/point.pxd
@@ -1,5 +1,7 @@
 # cython: language_level=3, embedsignature=True
 # distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 cimport numpy
 
 cdef extern from "math.h":

diff --git a/pysph/base/point.pyx b/pysph/base/point.pyx
@@ -1,4 +1,6 @@
-#cython: embedsignature=True
+# cython: language_level=3, embedsignature=True
+# distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
 
 """A handy set of classes/functions for 3D points.
 """

diff --git a/pysph/base/spatial_hash_nnps.pxd b/pysph/base/spatial_hash_nnps.pxd
@@ -1,5 +1,7 @@
 # cython: language_level=3, embedsignature=True
 # distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 from libcpp.vector cimport vector
 
 from .nnps_base cimport *

diff --git a/pysph/base/spatial_hash_nnps.pyx b/pysph/base/spatial_hash_nnps.pyx
@@ -1,5 +1,6 @@
 # cython: language_level=3, embedsignature=True
 # distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
 
 # malloc and friends
 from libc.stdlib cimport malloc, free

diff --git a/pysph/base/stratified_hash_nnps.pxd b/pysph/base/stratified_hash_nnps.pxd
@@ -1,5 +1,7 @@
 # cython: language_level=3, embedsignature=True
 # distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 from libcpp.vector cimport vector
 
 from .nnps_base cimport *

diff --git a/pysph/base/stratified_hash_nnps.pyx b/pysph/base/stratified_hash_nnps.pyx
@@ -1,4 +1,6 @@
-#cython: embedsignature=True
+# cython: language_level=3, embedsignature=True
+# distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
 
 # malloc and friends
 from libc.stdlib cimport malloc, free

diff --git a/pysph/base/stratified_sfc_gpu_nnps.pxd b/pysph/base/stratified_sfc_gpu_nnps.pxd
@@ -1,5 +1,7 @@
 # cython: language_level=3, embedsignature=True
 # distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 from libcpp.vector cimport vector
 from libcpp.map cimport map
 from libcpp.pair cimport pair

diff --git a/pysph/base/stratified_sfc_gpu_nnps.pyx b/pysph/base/stratified_sfc_gpu_nnps.pyx
@@ -1,5 +1,6 @@
 # cython: language_level=3, embedsignature=True
 # distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
 
 # malloc and friends
 from libc.stdlib cimport malloc, free

diff --git a/pysph/base/stratified_sfc_nnps.pxd b/pysph/base/stratified_sfc_nnps.pxd
@@ -1,5 +1,7 @@
 # cython: language_level=3, embedsignature=True
 # distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 from libcpp.vector cimport vector
 from libcpp.map cimport map
 from libcpp.pair cimport pair

diff --git a/pysph/base/stratified_sfc_nnps.pyx b/pysph/base/stratified_sfc_nnps.pyx
@@ -1,4 +1,6 @@
-#cython: embedsignature=True
+# cython: language_level=3, embedsignature=True
+# distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
 
 # malloc and friends
 from libc.stdlib cimport malloc, free

diff --git a/pysph/base/z_order_gpu_nnps.pxd b/pysph/base/z_order_gpu_nnps.pxd
@@ -1,5 +1,7 @@
 # cython: language_level=3, embedsignature=True
 # distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 from libcpp.map cimport map
 from libcpp.pair cimport pair
 

diff --git a/pysph/base/z_order_gpu_nnps.pyx b/pysph/base/z_order_gpu_nnps.pyx
@@ -1,4 +1,6 @@
-#cython: embedsignature=True
+# cython: language_level=3, embedsignature=True
+# distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
 
 # malloc and friends
 from libc.stdlib cimport malloc, free

diff --git a/pysph/base/z_order_nnps.pxd b/pysph/base/z_order_nnps.pxd
@@ -1,5 +1,7 @@
 # cython: language_level=3, embedsignature=True
 # distutils: language=c++
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 from libcpp.map cimport map
 from libcpp.pair cimport pair
 

diff --git a/pysph/base/z_order_nnps.pyx b/pysph/base/z_order_nnps.pyx
@@ -1,4 +1,5 @@
 #cython: embedsignature=True
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
 
 # malloc and friends
 from libc.stdlib cimport malloc, free

diff --git a/pysph/tools/mesh_tools.pyx b/pysph/tools/mesh_tools.pyx
@@ -1,4 +1,8 @@
+# cython: language_level=3, embedsignature=True
+# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
+
 from pysph.base.particle_array import ParticleArray
+
 from pysph.base import nnps
 from pysph.tools.geometry import remove_repeated_points
 import numpy as np