[Scipy-svn] r7027 - in branches/0.9.x/scipy/spatial: . qhull/src

[scipy-svn at scipy.org]

Author: rgommers
Date: 2011-01-11 06:49:17 -0600 (Tue, 11 Jan 2011)
New Revision: 7027

Modified:
   branches/0.9.x/scipy/spatial/SConscript
   branches/0.9.x/scipy/spatial/qhull/src/mem.h
   branches/0.9.x/scipy/spatial/setup.py
Log:
BUG: spatial/qhull: define ptr_intT correctly in Qhull

(backported from r7013)

Modified: branches/0.9.x/scipy/spatial/SConscript
===================================================================
--- branches/0.9.x/scipy/spatial/SConscript	2011-01-11 12:48:55 UTC (rev 7026)
+++ branches/0.9.x/scipy/spatial/SConscript	2011-01-11 12:49:17 UTC (rev 7027)
@@ -1,10 +1,14 @@
 # Last Change: Mon Nov 03 06:00 PM 2008 J
 # vim:syntax=python
 from os.path import join
+from numpy.distutils.misc_util import get_numpy_include_dirs, get_pkg_info
+from distutils.sysconfig import get_python_inc
 from numscons import GetNumpyEnvironment, CheckF77LAPACK, CheckF77Clib
 from numscons import write_info
 
 env = GetNumpyEnvironment(ARGUMENTS)
+env.PrependUnique(CPPPATH=[get_numpy_include_dirs(), get_python_inc(),
+                           env["PYEXTCPPPATH"]])
 
 #=======================
 # Starting Configuration
@@ -30,14 +34,14 @@
 
 env.NumpyPythonExtension('ckdtree', source = ['ckdtree.c'])
 
-env.NumpyPythonExtension('_distance_wrap', 
+env.NumpyPythonExtension('_distance_wrap',
                          source = [join('src', 'distance_wrap.c'),
                                    join('src', 'distance.c')])
 
 # Build qhull
 src = [join('qhull', 'src', s) for s in [
-    'geom2.c', 'geom.c', 'global.c', 'io.c', 'libqhull.c', 
-    'mem.c', 'merge.c', 'poly2.c', 'poly.c', 'qset.c', 
+    'geom2.c', 'geom.c', 'global.c', 'io.c', 'libqhull.c',
+    'mem.c', 'merge.c', 'poly2.c', 'poly.c', 'qset.c',
     'random.c', 'rboxlib.c', 'stat.c', 'user.c', 'usermem.c',
     'userprintf.c']]
 

Modified: branches/0.9.x/scipy/spatial/qhull/src/mem.h
===================================================================
--- branches/0.9.x/scipy/spatial/qhull/src/mem.h	2011-01-11 12:48:55 UTC (rev 7026)
+++ branches/0.9.x/scipy/spatial/qhull/src/mem.h	2011-01-11 12:49:17 UTC (rev 7027)
@@ -19,6 +19,9 @@
 #ifndef qhDEFmem
 #define qhDEFmem 1
 
+#include <Python.h>
+#include <numpy/ndarraytypes.h>
+
 #include <stdio.h>
 
 /*-<a                             href="qh-mem.htm#TOC"
@@ -77,9 +80,9 @@
     ptr_intT is typically a signed value, but not necessarily so
     size_t is typically unsigned, but should match the parameter type
     Qhull uses int instead of size_t except for system calls such as malloc, qsort, qh_malloc, etc.
-    This matches Qt convention and is easier to work with.  
+    This matches Qt convention and is easier to work with.
 */
-typedef long ptr_intT;
+typedef npy_intp ptr_intT;
 
 /*-<a                             href="qh-mem.htm#TOC"
   >--------------------------------</a><a name="qhmemT">-</a>

Modified: branches/0.9.x/scipy/spatial/setup.py
===================================================================
--- branches/0.9.x/scipy/spatial/setup.py	2011-01-11 12:48:55 UTC (rev 7026)
+++ branches/0.9.x/scipy/spatial/setup.py	2011-01-11 12:49:17 UTC (rev 7027)
@@ -5,18 +5,21 @@
 def configuration(parent_package = '', top_path = None):
     from numpy.distutils.misc_util import Configuration, get_numpy_include_dirs
     from numpy.distutils.system_info import get_info
+    from distutils.sysconfig import get_python_inc
 
     config = Configuration('spatial', parent_package, top_path)
 
     config.add_data_dir('tests')
 
-    qhull_src = ['geom2.c', 'geom.c', 'global.c', 'io.c', 'libqhull.c', 
-                 'mem.c', 'merge.c', 'poly2.c', 'poly.c', 'qset.c', 
+    qhull_src = ['geom2.c', 'geom.c', 'global.c', 'io.c', 'libqhull.c',
+                 'mem.c', 'merge.c', 'poly2.c', 'poly.c', 'qset.c',
                  'random.c', 'rboxlib.c', 'stat.c', 'user.c', 'usermem.c',
                  'userprintf.c']
 
     config.add_library('qhull',
                        sources=[join('qhull', 'src', x) for x in qhull_src],
+                       include_dirs=[get_python_inc(),
+                                     get_numpy_include_dirs()],
                        # XXX: GCC dependency!
                        #extra_compiler_args=['-fno-strict-aliasing'],
                        )