Move back to namedtuples for trees

Author: lmcinnes

pynndescent/rp_trees.py

@@ -14,149 +14,19 @@
 from pynndescent.utils import tau_rand_int, norm
 import joblib
 
+from collections import namedtuple
+
 locale.setlocale(locale.LC_NUMERIC, "C")
 
 # Used for a floating point "nearly zero" comparison
 EPS = 1e-8
 INT32_MIN = np.iinfo(np.int32).min + 1
 INT32_MAX = np.iinfo(np.int32).max - 1
 
-
-@structref.register
-class RandomProjectionTreeNodeType(types.StructRef):
-    pass
-
-
-class RandomProjectionTreeNode(structref.StructRefProxy):
-    @property
-    def graph_indices(self):
-        return RandomProjectionTreeNode_get_graph_indices(self)
-
-    @property
-    def is_leaf(self):
-        return RandomProjectionTreeNode_get_is_leaf(self)
-
-    @property
-    def hyperplane(self):
-        return RandomProjectionTreeNode_get_hyperplane(self)
-
-    @property
-    def offset(self):
-        return RandomProjectionTreeNode_get_offset(self)
-
-    @property
-    def left_child(self):
-        return RandomProjectionTreeNode_get_left_child(self)
-
-    @property
-    def right_child(self):
-        return RandomProjectionTreeNode_get_right_child(self)
-
-
-@numba.njit
-def RandomProjectionTreeNode_get_graph_indices(self):
-    return self.graph_indices
-
-
-@numba.njit
-def RandomProjectionTreeNode_get_is_leaf(self):
-    return self.is_leaf
-
-
-@numba.njit
-def RandomProjectionTreeNode_get_hyperplane(self):
-    return self.hyperplane
-
-
-@numba.njit
-def RandomProjectionTreeNode_get_offset(self):
-    return self.offset
-
-
-@numba.njit
-def RandomProjectionTreeNode_get_left_child(self):
-    return self.left_child
-
-
-@numba.njit
-def RandomProjectionTreeNode_get_right_child(self):
-    return self.right_child
-
-
-structref.define_proxy(
-    RandomProjectionTreeNode,
-    RandomProjectionTreeNodeType,
-    ["graph_indices", "is_leaf", "hyperplane", "offset", "left_child", "right_child"],
+FlatTree = namedtuple(
+    "FlatTree", ["hyperplanes", "offsets", "children", "indices", "leaf_size"]
 )
 
-# RandomProjectionTreeNode = namedtuple(
-#     "RandomProjectionTreeNode",
-#     ["graph_indices", "is_leaf", "hyperplane", "offset", "left_child", "right_child"],
-# )
-
-
-@structref.register
-class FlatTreeType(types.StructRef):
-    pass
-
-
-class FlatTree(structref.StructRefProxy):
-    @property
-    def hyperplanes(self):
-        return FlatTree_get_hyperplanes(self)
-
-    @property
-    def offsets(self):
-        return FlatTree_get_offsets(self)
-
-    @property
-    def children(self):
-        return FlatTree_get_children(self)
-
-    @property
-    def indices(self):
-        return FlatTree_get_indices(self)
-
-    @property
-    def leaf_size(self):
-        return FlatTree_get_leaf_size(self)
-
-
-@numba.njit
-def FlatTree_get_hyperplanes(self):
-    return self.hyperplanes
-
-
-@numba.njit
-def FlatTree_get_offsets(self):
-    return self.offsets
-
-
-@numba.njit
-def FlatTree_get_children(self):
-    return self.children
-
-
-@numba.njit
-def FlatTree_get_indices(self):
-    return self.indices
-
-
-@numba.njit
-def FlatTree_get_leaf_size(self):
-    return self.leaf_size
-
-
-structref.define_proxy(
-    FlatTree,
-    FlatTreeType,
-    ["hyperplanes", "offsets", "children", "indices", "leaf_size"],
-)
-
-# FlatTree = namedtuple(
-#     "FlatTree", ["hyperplanes", "offsets", "children", "indices", "leaf_size"]
-# )
-
 dense_hyperplane_type = numba.float32[::1]
 sparse_hyperplane_type = numba.float64[:, ::1]
 offset_type = numba.float64

setup.py

@@ -8,7 +8,7 @@ def readme():
 
 configuration = {
     "name": "pynndescent",
-    "version": "0.5.0",
+    "version": "0.5.1",
     "description": "Nearest Neighbor Descent",
     "long_description": readme(),
     "classifiers": [