feat: support py310 (#155)

0x79ff · web-flow · commit 50485148da26 · 2025-09-14T14:31:02.000+08:00
* fix: correct 'np.bool' to 'bool' for numpy compatibility

* fix: fix adependency versions to resolve compatibility issues

* fix: repair cython files all against nogil position deprecation

---------

Co-authored-by: 0x79ff &lt;yangff@lamda.nju.edu.cn&gt;
diff --git a/deepforest/_cutils.pyx b/deepforest/_cutils.pyx
@@ -44,7 +44,7 @@ cpdef np.ndarray _c_sample_mask(const INT32_t [:] indices,
         SIZE_t n = indices.shape[0]
         SIZE_t sample_id
         np.ndarray[BOOL, ndim=1] sample_mask = np.zeros((n_samples,),
-                                                        dtype=np.bool)
+                                                        dtype=bool)
 
     with nogil:
         for i in range(n):
diff --git a/deepforest/tree/_criterion.pxd b/deepforest/tree/_criterion.pxd
@@ -46,10 +46,10 @@ cdef class Criterion:
     # Methods
     cdef int init(self, const DOUBLE_t[:, ::1] y, DOUBLE_t* sample_weight,
                   double weighted_n_samples, SIZE_t* samples, SIZE_t start,
-                  SIZE_t end) nogil except -1
-    cdef int reset(self) nogil except -1
-    cdef int reverse_reset(self) nogil except -1
-    cdef int update(self, SIZE_t new_pos) nogil except -1
+                  SIZE_t end) except -1 nogil
+    cdef int reset(self) except -1 nogil
+    cdef int reverse_reset(self) except -1 nogil
+    cdef int update(self, SIZE_t new_pos) except -1 nogil
     cdef double node_impurity(self) nogil
     cdef void children_impurity(self, double* impurity_left,
                                 double* impurity_right) nogil
diff --git a/deepforest/tree/_criterion.pyx b/deepforest/tree/_criterion.pyx
@@ -43,7 +43,7 @@ cdef class Criterion:
 
     cdef int init(self, const DOUBLE_t[:, ::1] y, DOUBLE_t* sample_weight,
                   double weighted_n_samples, SIZE_t* samples, SIZE_t start,
-                  SIZE_t end) nogil except -1:
+                  SIZE_t end) except -1 nogil:
         """Placeholder for a method which will initialize the criterion.
 
         Returns -1 in case of failure to allocate memory (and raise MemoryError)
@@ -69,22 +69,22 @@ cdef class Criterion:
 
         pass
 
-    cdef int reset(self) nogil except -1:
+    cdef int reset(self) except -1 nogil:
         """Reset the criterion at pos=start.
 
         This method must be implemented by the subclass.
         """
 
         pass
 
-    cdef int reverse_reset(self) nogil except -1:
+    cdef int reverse_reset(self) except -1 nogil:
         """Reset the criterion at pos=end.
 
         This method must be implemented by the subclass.
         """
         pass
 
-    cdef int update(self, SIZE_t new_pos) nogil except -1:
+    cdef int update(self, SIZE_t new_pos) except -1 nogil:
         """Updated statistics by moving samples[pos:new_pos] to the left child.
 
         This updates the collected statistics by moving samples[pos:new_pos]
@@ -268,7 +268,7 @@ cdef class ClassificationCriterion(Criterion):
 
     cdef int init(self, const DOUBLE_t[:, ::1] y,
                   DOUBLE_t* sample_weight, double weighted_n_samples,
-                  SIZE_t* samples, SIZE_t start, SIZE_t end) nogil except -1:
+                  SIZE_t* samples, SIZE_t start, SIZE_t end) except -1 nogil:
         """Initialize the criterion at node samples[start:end] and
         children samples[start:start] and samples[start:end].
 
@@ -333,7 +333,7 @@ cdef class ClassificationCriterion(Criterion):
         self.reset()
         return 0
 
-    cdef int reset(self) nogil except -1:
+    cdef int reset(self) except -1 nogil:
         """Reset the criterion at pos=start
 
         Returns -1 in case of failure to allocate memory (and raise MemoryError)
@@ -360,7 +360,7 @@ cdef class ClassificationCriterion(Criterion):
             sum_right += self.sum_stride
         return 0
 
-    cdef int reverse_reset(self) nogil except -1:
+    cdef int reverse_reset(self) except -1 nogil:
         """Reset the criterion at pos=end
 
         Returns -1 in case of failure to allocate memory (and raise MemoryError)
@@ -387,7 +387,7 @@ cdef class ClassificationCriterion(Criterion):
             sum_right += self.sum_stride
         return 0
 
-    cdef int update(self, SIZE_t new_pos) nogil except -1:
+    cdef int update(self, SIZE_t new_pos) except -1 nogil:
         """Updated statistics by moving samples[pos:new_pos] to the left child.
 
         Returns -1 in case of failure to allocate memory (and raise MemoryError)
@@ -729,7 +729,7 @@ cdef class RegressionCriterion(Criterion):
 
     cdef int init(self, const DOUBLE_t[:, ::1] y, DOUBLE_t* sample_weight,
                   double weighted_n_samples, SIZE_t* samples, SIZE_t start,
-                  SIZE_t end) nogil except -1:
+                  SIZE_t end) except -1 nogil:
         """Initialize the criterion at node samples[start:end] and
            children samples[start:start] and samples[start:end]."""
         # Initialize fields
@@ -770,7 +770,7 @@ cdef class RegressionCriterion(Criterion):
         self.reset()
         return 0
 
-    cdef int reset(self) nogil except -1:
+    cdef int reset(self) except -1 nogil:
         """Reset the criterion at pos=start."""
         cdef SIZE_t n_bytes = self.n_outputs * sizeof(double)
         memset(self.sum_left, 0, n_bytes)
@@ -781,7 +781,7 @@ cdef class RegressionCriterion(Criterion):
         self.pos = self.start
         return 0
 
-    cdef int reverse_reset(self) nogil except -1:
+    cdef int reverse_reset(self) except -1 nogil:
         """Reset the criterion at pos=end."""
         cdef SIZE_t n_bytes = self.n_outputs * sizeof(double)
         memset(self.sum_right, 0, n_bytes)
@@ -792,7 +792,7 @@ cdef class RegressionCriterion(Criterion):
         self.pos = self.end
         return 0
 
-    cdef int update(self, SIZE_t new_pos) nogil except -1:
+    cdef int update(self, SIZE_t new_pos) except -1 nogil:
         """Updated statistics by moving samples[pos:new_pos] to the left."""
 
         cdef double* sum_left = self.sum_left
@@ -1013,7 +1013,7 @@ cdef class MAE(RegressionCriterion):
 
     cdef int init(self, const DOUBLE_t[:, ::1] y, DOUBLE_t* sample_weight,
                   double weighted_n_samples, SIZE_t* samples, SIZE_t start,
-                  SIZE_t end) nogil except -1:
+                  SIZE_t end) except -1 nogil:
         """Initialize the criterion at node samples[start:end] and
            children samples[start:start] and samples[start:end]."""
 
@@ -1061,7 +1061,7 @@ cdef class MAE(RegressionCriterion):
         self.reset()
         return 0
 
-    cdef int reset(self) nogil except -1:
+    cdef int reset(self) except -1 nogil:
         """Reset the criterion at pos=start
 
         Returns -1 in case of failure to allocate memory (and raise MemoryError)
@@ -1093,7 +1093,7 @@ cdef class MAE(RegressionCriterion):
                                                                  weight)
         return 0
 
-    cdef int reverse_reset(self) nogil except -1:
+    cdef int reverse_reset(self) except -1 nogil:
         """Reset the criterion at pos=end
 
         Returns -1 in case of failure to allocate memory (and raise MemoryError)
@@ -1122,7 +1122,7 @@ cdef class MAE(RegressionCriterion):
                                                                 weight)
         return 0
 
-    cdef int update(self, SIZE_t new_pos) nogil except -1:
+    cdef int update(self, SIZE_t new_pos) except -1 nogil:
         """Updated statistics by moving samples[pos:new_pos] to the left
 
         Returns -1 in case of failure to allocate memory (and raise MemoryError)
diff --git a/deepforest/tree/_splitter.pxd b/deepforest/tree/_splitter.pxd
@@ -74,12 +74,12 @@ cdef class Splitter:
                   np.ndarray X_idx_sorted=*) except -1
 
     cdef int node_reset(self, SIZE_t start, SIZE_t end,
-                        double* weighted_n_node_samples) nogil except -1
+                        double* weighted_n_node_samples) except -1 nogil
 
     cdef int node_split(self,
                         double impurity,   # Impurity of the node
                         SplitRecord* split,
-                        SIZE_t* n_constant_features) nogil except -1
+                        SIZE_t* n_constant_features) except -1 nogil
 
     cdef void node_value(self, double* dest) nogil
 
diff --git a/deepforest/tree/_splitter.pyx b/deepforest/tree/_splitter.pyx
@@ -169,7 +169,7 @@ cdef class Splitter:
         return 0
 
     cdef int node_reset(self, SIZE_t start, SIZE_t end,
-                        double* weighted_n_node_samples) nogil except -1:
+                        double* weighted_n_node_samples) except -1 nogil:
         """Reset splitter on node samples[start:end].
 
         Returns -1 in case of failure to allocate memory (and raise MemoryError)
@@ -199,7 +199,7 @@ cdef class Splitter:
         return 0
 
     cdef int node_split(self, double impurity, SplitRecord* split,
-                        SIZE_t* n_constant_features) nogil except -1:
+                        SIZE_t* n_constant_features) except -1 nogil:
         """Find the best split on node samples[start:end].
 
         This is a placeholder method. The majority of computation will be done
@@ -266,7 +266,7 @@ cdef class BestSplitter(BaseDenseSplitter):
                                self.random_state), self.__getstate__())
 
     cdef int node_split(self, double impurity, SplitRecord* split,
-                        SIZE_t* n_constant_features) nogil except -1:
+                        SIZE_t* n_constant_features) except -1 nogil:
         """Find the best split on node samples[start:end]
 
         Returns -1 in case of failure to allocate memory (and raise MemoryError)
@@ -582,7 +582,7 @@ cdef class RandomSplitter(BaseDenseSplitter):
                                  self.random_state), self.__getstate__())
 
     cdef int node_split(self, double impurity, SplitRecord* split,
-                        SIZE_t* n_constant_features) nogil except -1:
+                        SIZE_t* n_constant_features) except -1 nogil:
         """Find the best random split on node samples[start:end]
 
         Returns -1 in case of failure to allocate memory (and raise MemoryError)
@@ -1100,7 +1100,7 @@ cdef class BestSparseSplitter(BaseSparseSplitter):
                                      self.random_state), self.__getstate__())
 
     cdef int node_split(self, double impurity, SplitRecord* split,
-                        SIZE_t* n_constant_features) nogil except -1:
+                        SIZE_t* n_constant_features) except -1 nogil:
         """Find the best split on node samples[start:end], using sparse features
 
         Returns -1 in case of failure to allocate memory (and raise MemoryError)
@@ -1329,7 +1329,7 @@ cdef class RandomSparseSplitter(BaseSparseSplitter):
                                        self.random_state), self.__getstate__())
 
     cdef int node_split(self, double impurity, SplitRecord* split,
-                        SIZE_t* n_constant_features) nogil except -1:
+                        SIZE_t* n_constant_features) except -1 nogil:
         """Find a random split on node samples[start:end], using sparse features
 
         Returns -1 in case of failure to allocate memory (and raise MemoryError)
diff --git a/deepforest/tree/_tree.pxd b/deepforest/tree/_tree.pxd
@@ -43,13 +43,13 @@ cdef class Tree:
     cdef SIZE_t value_stride                # = n_outputs * max_n_classes
 
     # Methods
-    cdef SIZE_t _upd_parent(self, SIZE_t parent, bint is_left) nogil except -1
+    cdef SIZE_t _upd_parent(self, SIZE_t parent, bint is_left) except -1 nogil
     cdef SIZE_t _add_node(self, SIZE_t parent, bint is_left, bint is_leaf,
-                          SIZE_t feature, DTYPE_t threshold) nogil except -1
+                          SIZE_t feature, DTYPE_t threshold) except -1 nogil
     cdef int _resize(self, SIZE_t internal_capacity,
-                     SIZE_t leaf_capacity) nogil except -1
-    cdef int _resize_node_c(self, SIZE_t internal_capacity=*) nogil except -1
-    cdef int _resize_value_c(self, SIZE_t leaf_capacity=*) nogil except -1
+                     SIZE_t leaf_capacity) except -1 nogil
+    cdef int _resize_node_c(self, SIZE_t internal_capacity=*) except -1 nogil
+    cdef int _resize_value_c(self, SIZE_t leaf_capacity=*) except -1 nogil
 
     cdef np.ndarray _get_value_ndarray(self)
     cdef np.ndarray _get_node_ndarray(self)
diff --git a/deepforest/tree/_tree.pyx b/deepforest/tree/_tree.pyx
@@ -441,7 +441,7 @@ cdef class Tree:
                        self.internal_node_count * sizeof(Node))
 
     cdef int _resize(self, SIZE_t internal_capacity,
-                     SIZE_t leaf_capacity) nogil except -1:
+                     SIZE_t leaf_capacity) except -1 nogil:
         """Resize `self.nodes` to `internal_capacity`, and resize `self.value`
         to `leaf_capacity`.
 
@@ -461,7 +461,7 @@ cdef class Tree:
                                   leaf_capacity)
 
     cdef int _resize_node_c(self,
-                            SIZE_t internal_capacity=SIZE_MAX) nogil except -1:
+                            SIZE_t internal_capacity=SIZE_MAX) except -1 nogil:
         """Resize `self.nodes` to `internal_capacity`.
 
         Returns -1 in case of failure to allocate memory (and raise
@@ -486,7 +486,7 @@ cdef class Tree:
         return 0
 
     cdef int _resize_value_c(self,
-                             SIZE_t leaf_capacity=SIZE_MAX) nogil except -1:
+                             SIZE_t leaf_capacity=SIZE_MAX) except -1 nogil:
         """Resize `self.value` to `leaf_capacity`.
         
         Returns -1 in case of failure to allocate memory (and raise
@@ -516,7 +516,7 @@ cdef class Tree:
         self.leaf_capacity = leaf_capacity
         return 0
 
-    cdef SIZE_t _upd_parent(self, SIZE_t parent, bint is_left) nogil except -1:
+    cdef SIZE_t _upd_parent(self, SIZE_t parent, bint is_left) except -1 nogil:
         """Add a leaf node to the tree and connect it with its parent. Notice
         that `self.nodes` does not store any information on leaf nodes except
         the id of leaf nodes. In addition, the id of leaf nodes are multiplied
@@ -543,7 +543,7 @@ cdef class Tree:
         return node_id
 
     cdef SIZE_t _add_node(self, SIZE_t parent, bint is_left, bint is_leaf,
-                          SIZE_t feature, DTYPE_t threshold) nogil except -1:
+                          SIZE_t feature, DTYPE_t threshold) except -1 nogil:
         """Add an internal node to the tree.
 
         The new node registers itself as the child of its parent.
diff --git a/deepforest/tree/_utils.pxd b/deepforest/tree/_utils.pxd
@@ -37,7 +37,7 @@ ctypedef fused realloc_ptr:
     (StackRecord*)
     (PriorityHeapRecord*)
 
-cdef realloc_ptr safe_realloc(realloc_ptr* p, size_t nelems) nogil except *
+cdef realloc_ptr safe_realloc(realloc_ptr* p, size_t nelems) except * nogil
 
 
 cdef np.ndarray sizet_ptr_to_ndarray(SIZE_t* data, SIZE_t size)
@@ -75,7 +75,7 @@ cdef class Stack:
     cdef bint is_empty(self) nogil
     cdef int push(self, SIZE_t start, SIZE_t end, SIZE_t depth, SIZE_t parent,
                   bint is_left, double impurity,
-                  SIZE_t n_constant_features) nogil except -1
+                  SIZE_t n_constant_features) except -1 nogil
     cdef int pop(self, StackRecord* res) nogil
 
 
@@ -107,7 +107,7 @@ cdef class PriorityHeap:
     cdef int push(self, SIZE_t node_id, SIZE_t start, SIZE_t end, SIZE_t pos,
                   SIZE_t depth, bint is_leaf, double improvement,
                   double impurity, double impurity_left,
-                  double impurity_right) nogil except -1
+                  double impurity_right) except -1 nogil
     cdef int pop(self, PriorityHeapRecord* res) nogil
 
 # =============================================================================
@@ -125,9 +125,9 @@ cdef class WeightedPQueue:
     cdef WeightedPQueueRecord* array_
 
     cdef bint is_empty(self) nogil
-    cdef int reset(self) nogil except -1
+    cdef int reset(self) except -1 nogil
     cdef SIZE_t size(self) nogil
-    cdef int push(self, DOUBLE_t data, DOUBLE_t weight) nogil except -1
+    cdef int push(self, DOUBLE_t data, DOUBLE_t weight) except -1 nogil
     cdef int remove(self, DOUBLE_t data, DOUBLE_t weight) nogil
     cdef int pop(self, DOUBLE_t* data, DOUBLE_t* weight) nogil
     cdef int peek(self, DOUBLE_t* data, DOUBLE_t* weight) nogil
@@ -148,8 +148,8 @@ cdef class WeightedMedianCalculator:
                                        # = w[0] + w[1] + ... + w[k-1]
 
     cdef SIZE_t size(self) nogil
-    cdef int push(self, DOUBLE_t data, DOUBLE_t weight) nogil except -1
-    cdef int reset(self) nogil except -1
+    cdef int push(self, DOUBLE_t data, DOUBLE_t weight) except -1 nogil
+    cdef int reset(self) except -1 nogil
     cdef int update_median_parameters_post_push(
         self, DOUBLE_t data, DOUBLE_t weight,
         DOUBLE_t original_median) nogil
diff --git a/deepforest/tree/_utils.pyx b/deepforest/tree/_utils.pyx
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/setup.py b/setup.py
