Merge pull request #4374 from sturlamolden/ckdtree-query-fix-memleak

ENH: Enhancements to spatial.cKDTree
scipy · May 10, 2015 · bea41ad · bea41ad
2 parents aa2f836 + fcdf071
commit bea41ad
Show file tree

Hide file tree

Showing 13 changed files with 1,735 additions and 579 deletions.
diff --git a/.gitignore b/.gitignore
@@ -191,7 +191,8 @@ scipy/sparse/sparsetools/csc_impl.h
 scipy/sparse/sparsetools/csr_impl.h
 scipy/sparse/sparsetools/other_impl.h
 scipy/sparse/sparsetools/sparsetools_impl.h
-scipy/spatial/ckdtree.c
+scipy/spatial/ckdtree/ckdtree.cxx
+scipy/spatial/ckdtree/ckdtree.h
 scipy/spatial/qhull.c
 scipy/special/_ellip_harm_2.c
 scipy/special/_ellip_harm_2.h

diff --git a/scipy/spatial/bento.info b/scipy/spatial/bento.info
@@ -2,7 +2,11 @@ HookFile: bscript
 
 Library:
     Extension: ckdtree
-        Sources: ckdtree.c
+        Sources: 
+            ckdtree/ckdtree.cxx,
+            ckdtree/src/ckdtree_query.cxx,
+            ckdtree/src/ckdtree_globals.cxx,
+            ckdtree/src/ckdtree_cpp_exc.cxx
     Extension: _distance_wrap
         Sources: src/distance_wrap.c
     Extension: qhull

diff --git a/scipy/spatial/bscript b/scipy/spatial/bscript
@@ -4,3 +4,6 @@ from bento.commands import hooks
 def pre_build(context):
     context.tweak_extension("qhull", use="LAPACK CLIB",
                             defines=['qh_QHpointer=1'])
+
+    context.tweak_extension("ckdtree", features="c cxxshlib pyext bento",
+                            includes="ckdtree/src")