[Scipy-svn] r6695 - in trunk/scipy: fftpack interpolate spatial

scipy-svn@scip... scipy-svn@scip...
Thu Sep 9 12:32:11 CDT 2010


Author: ptvirtan
Date: 2010-09-09 12:32:11 -0500 (Thu, 09 Sep 2010)
New Revision: 6695

Modified:
   trunk/scipy/fftpack/SConscript
   trunk/scipy/interpolate/SConscript
   trunk/scipy/spatial/SConscript
Log:
BUG: fix some SConscript issues

  - include lapack in spatial/qhull
  - import CheckF77Mangling

Modified: trunk/scipy/fftpack/SConscript
===================================================================
--- trunk/scipy/fftpack/SConscript	2010-09-09 17:31:47 UTC (rev 6694)
+++ trunk/scipy/fftpack/SConscript	2010-09-09 17:32:11 UTC (rev 6695)
@@ -3,11 +3,12 @@
 from os.path import join as pjoin
 
 from numscons import GetNumpyEnvironment
+from numscons import CheckF77Mangling
 
 env = GetNumpyEnvironment(ARGUMENTS)
 env.Tool('f2py')
 
-config = env.NumpyConfigure()
+config = env.NumpyConfigure(custom_tests = {'CheckF77Mangling' : CheckF77Mangling})
 config.CheckF77Mangling()
 config.Finish()
 

Modified: trunk/scipy/interpolate/SConscript
===================================================================
--- trunk/scipy/interpolate/SConscript	2010-09-09 17:31:47 UTC (rev 6694)
+++ trunk/scipy/interpolate/SConscript	2010-09-09 17:32:11 UTC (rev 6695)
@@ -2,12 +2,12 @@
 # vim:syntax=python
 from os.path import join as pjoin
 
-from numscons import GetNumpyEnvironment, CheckF77Clib
+from numscons import GetNumpyEnvironment, CheckF77Clib, CheckF77Mangling
 
 env = GetNumpyEnvironment(ARGUMENTS)
 env.Tool('f2py')
 
-config = env.NumpyConfigure(custom_tests = {'CheckF77Clib' : CheckF77Clib})
+config = env.NumpyConfigure(custom_tests = {'CheckF77Clib' : CheckF77Clib, 'CheckF77Mangling': CheckF77Mangling})
 if not config.CheckF77Clib():
     raise Exception("Could not check F77 runtime, needed for interpolate")
 config.CheckF77Mangling()

Modified: trunk/scipy/spatial/SConscript
===================================================================
--- trunk/scipy/spatial/SConscript	2010-09-09 17:31:47 UTC (rev 6694)
+++ trunk/scipy/spatial/SConscript	2010-09-09 17:32:11 UTC (rev 6695)
@@ -1,10 +1,33 @@
 # Last Change: Mon Nov 03 06:00 PM 2008 J
 # vim:syntax=python
 from os.path import join
-from numscons import GetNumpyEnvironment
+from numscons import GetNumpyEnvironment, CheckF77LAPACK, CheckF77Clib
+from numscons import write_info
 
 env = GetNumpyEnvironment(ARGUMENTS)
 
+#=======================
+# Starting Configuration
+#=======================
+config = env.NumpyConfigure(custom_tests = {'CheckLAPACK' : CheckF77LAPACK})
+
+#-----------------
+# Checking Lapack
+#-----------------
+st = config.CheckLAPACK()
+if not st:
+    has_lapack = 0
+else:
+    has_lapack = 1
+
+config.Finish()
+write_info(env)
+
+
+#==========
+#  Build
+#==========
+
 env.NumpyPythonExtension('ckdtree', source = ['ckdtree.c'])
 
 env.NumpyPythonExtension('_distance_wrap', 
@@ -16,6 +39,5 @@
     'geom.c', 'geom2.c', 'global.c', 'io.c', 'mem.c',
     'merge.c', 'poly.c', 'poly2.c', 'qset.c', 'user.c',
     'stat.c', 'qhull.c']]
-qhullsrc = env.DistutilsStaticExtLibrary('qhullsrc', source=src)
 
-env.NumpyPythonExtension('qhull', source = 'qhull.c', LIBS=qhullsrc)
+env.NumpyPythonExtension('qhull', source = ['qhull.c'] + src)



More information about the Scipy-svn mailing list