[Scipy-svn] r4204 - in trunk/scipy: fftpack integrate interpolate lib/blas lib/lapack linalg optimize sparse/linalg/eigen/arpack sparse/linalg/isolve special stats
scipy-svn at scipy.org
scipy-svn at scipy.org
Sat May 3 02:22:46 EDT 2008
Author: cdavid
Date: 2008-05-03 01:22:28 -0500 (Sat, 03 May 2008)
New Revision: 4204
Modified:
trunk/scipy/fftpack/SConstruct
trunk/scipy/integrate/SConstruct
trunk/scipy/interpolate/SConstruct
trunk/scipy/lib/blas/SConstruct
trunk/scipy/lib/lapack/SConstruct
trunk/scipy/linalg/SConstruct
trunk/scipy/optimize/SConstruct
trunk/scipy/sparse/linalg/eigen/arpack/SConstruct
trunk/scipy/sparse/linalg/isolve/SConstruct
trunk/scipy/special/SConstruct
trunk/scipy/stats/SConstruct
Log:
Explicitly initialize numpyf2py tool when needed: numscons does not load it by default.
Modified: trunk/scipy/fftpack/SConstruct
===================================================================
--- trunk/scipy/fftpack/SConstruct 2008-05-01 21:02:04 UTC (rev 4203)
+++ trunk/scipy/fftpack/SConstruct 2008-05-03 06:22:28 UTC (rev 4204)
@@ -1,4 +1,4 @@
-# Last Change: Tue Apr 22 01:00 PM 2008 J
+# Last Change: Sat May 03 02:00 PM 2008 J
# vim:syntax=python
from os.path import join as pjoin
@@ -7,6 +7,7 @@
from numscons import CheckFFT, IsMKL, IsFFTW2, IsFFTW3
env = GetNumpyEnvironment(ARGUMENTS)
+env.Tool('numpyf2py')
env.AppendUnique(CPPPATH = get_numpy_include_dirs())
env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
Modified: trunk/scipy/integrate/SConstruct
===================================================================
--- trunk/scipy/integrate/SConstruct 2008-05-01 21:02:04 UTC (rev 4203)
+++ trunk/scipy/integrate/SConstruct 2008-05-03 06:22:28 UTC (rev 4204)
@@ -1,4 +1,4 @@
-# Last Change: Tue Mar 11 04:00 PM 2008 J
+# Last Change: Sat May 03 02:00 PM 2008 J
# vim:syntax=python
from os.path import join as pjoin
import warnings
@@ -7,6 +7,7 @@
from numscons import GetNumpyEnvironment, CheckF77Clib, CheckF77BLAS
env = GetNumpyEnvironment(ARGUMENTS)
+env.Tool('numpyf2py')
# Configuration
config = env.NumpyConfigure(custom_tests = {'CheckF77Clib' : CheckF77Clib,
Modified: trunk/scipy/interpolate/SConstruct
===================================================================
--- trunk/scipy/interpolate/SConstruct 2008-05-01 21:02:04 UTC (rev 4203)
+++ trunk/scipy/interpolate/SConstruct 2008-05-03 06:22:28 UTC (rev 4204)
@@ -1,4 +1,4 @@
-# Last Change: Tue Apr 22 01:00 PM 2008 J
+# Last Change: Sat May 03 02:00 PM 2008 J
# vim:syntax=python
from os.path import join as pjoin
@@ -6,6 +6,7 @@
from numscons import GetNumpyEnvironment, CheckF77Clib
env = GetNumpyEnvironment(ARGUMENTS)
+env.Tool('numpyf2py')
config = env.NumpyConfigure(custom_tests = {'CheckF77Clib' : CheckF77Clib})
if not config.CheckF77Clib():
Modified: trunk/scipy/lib/blas/SConstruct
===================================================================
--- trunk/scipy/lib/blas/SConstruct 2008-05-01 21:02:04 UTC (rev 4203)
+++ trunk/scipy/lib/blas/SConstruct 2008-05-03 06:22:28 UTC (rev 4204)
@@ -1,4 +1,4 @@
-# Last Change: Wed Mar 05 03:00 PM 2008 J
+# Last Change: Sat May 03 02:00 PM 2008 J
# vim:syntax=python
import os
@@ -15,6 +15,8 @@
from scons_support import do_generate_fake_interface, generate_interface_emitter
env = GetNumpyEnvironment(ARGUMENTS)
+env.Tool('numpyf2py')
+
env.Append(CPPPATH = [get_python_inc(), get_numpy_include_dirs()])
#if os.name == 'nt':
# # NT needs the pythonlib to run any code importing Python.h, including
Modified: trunk/scipy/lib/lapack/SConstruct
===================================================================
--- trunk/scipy/lib/lapack/SConstruct 2008-05-01 21:02:04 UTC (rev 4203)
+++ trunk/scipy/lib/lapack/SConstruct 2008-05-03 06:22:28 UTC (rev 4204)
@@ -1,4 +1,4 @@
-# Last Change: Tue Apr 22 01:00 PM 2008 J
+# Last Change: Sat May 03 02:00 PM 2008 J
# vim:syntax=python
import os
@@ -17,6 +17,7 @@
generate_interface_emitter
env = GetNumpyEnvironment(ARGUMENTS)
+env.Tool('numpyf2py')
env.Append(CPPPATH = [get_python_inc(), get_numpy_include_dirs()])
#if os.name == 'nt':
# # NT needs the pythonlib to run any code importing Python.h, including
Modified: trunk/scipy/linalg/SConstruct
===================================================================
--- trunk/scipy/linalg/SConstruct 2008-05-01 21:02:04 UTC (rev 4203)
+++ trunk/scipy/linalg/SConstruct 2008-05-03 06:22:28 UTC (rev 4204)
@@ -1,4 +1,4 @@
-# Last Change: Tue Apr 22 01:00 PM 2008 J
+# Last Change: Sat May 03 02:00 PM 2008 J
# vim:syntax=python
import os
@@ -19,6 +19,7 @@
# generate_config_header, generate_config_header_emitter
env = GetNumpyEnvironment(ARGUMENTS)
+env.Tool('numpyf2py')
env.Append(CPPPATH = [get_python_inc(), get_numpy_include_dirs()])
# XXX: handle cblas wrapper for complex (check in numpy.scons or here ?)
Modified: trunk/scipy/optimize/SConstruct
===================================================================
--- trunk/scipy/optimize/SConstruct 2008-05-01 21:02:04 UTC (rev 4203)
+++ trunk/scipy/optimize/SConstruct 2008-05-03 06:22:28 UTC (rev 4204)
@@ -1,4 +1,4 @@
-# Last Change: Tue Apr 22 01:00 PM 2008 J
+# Last Change: Sat May 03 02:00 PM 2008 J
# vim:syntax=python
import os
@@ -12,6 +12,7 @@
from numscons import write_info
env = GetNumpyEnvironment(ARGUMENTS)
+env.Tool('numpyf2py')
env.Append(CPPPATH = get_numpy_include_dirs())
env.Append(CPPPATH = env['F2PYINCLUDEDIR'])
#if os.name == 'nt':
Modified: trunk/scipy/sparse/linalg/eigen/arpack/SConstruct
===================================================================
--- trunk/scipy/sparse/linalg/eigen/arpack/SConstruct 2008-05-01 21:02:04 UTC (rev 4203)
+++ trunk/scipy/sparse/linalg/eigen/arpack/SConstruct 2008-05-03 06:22:28 UTC (rev 4204)
@@ -14,6 +14,7 @@
config = env.NumpyConfigure(custom_tests = {'CheckLAPACK' : CheckF77LAPACK,
'CheckF77Clib' : CheckF77Clib})
+env.Tool('numpyf2py')
#-----------------
# Checking Lapack
#-----------------
Modified: trunk/scipy/sparse/linalg/isolve/SConstruct
===================================================================
--- trunk/scipy/sparse/linalg/isolve/SConstruct 2008-05-01 21:02:04 UTC (rev 4203)
+++ trunk/scipy/sparse/linalg/isolve/SConstruct 2008-05-03 06:22:28 UTC (rev 4204)
@@ -1,4 +1,4 @@
-# Last Change: Wed Mar 05 06:00 PM 2008 J
+# Last Change: Sat May 03 02:00 PM 2008 J
# vim:syntax=python
from os.path import join as pjoin, splitext
@@ -10,6 +10,7 @@
from numscons import write_info
env = GetNumpyEnvironment(ARGUMENTS)
+env.Tool('numpyf2py')
env.Append(CPPPATH = [get_numpy_include_dirs(), env['F2PYINCLUDEDIR']])
#if os.name == 'nt':
# # NT needs the pythonlib to run any code importing Python.h, including
Modified: trunk/scipy/special/SConstruct
===================================================================
--- trunk/scipy/special/SConstruct 2008-05-01 21:02:04 UTC (rev 4203)
+++ trunk/scipy/special/SConstruct 2008-05-03 06:22:28 UTC (rev 4204)
@@ -1,4 +1,4 @@
-# Last Change: Wed Mar 05 09:00 PM 2008 J
+# Last Change: Sat May 03 02:00 PM 2008 J
# vim:syntax=python
from os.path import join as pjoin, basename as pbasename
import sys
@@ -11,6 +11,8 @@
env = GetNumpyEnvironment(ARGUMENTS)
+env.Tool('numpyf2py')
+
env.AppendUnique(CPPPATH = [get_python_inc(), get_numpy_include_dirs()])
env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
Modified: trunk/scipy/stats/SConstruct
===================================================================
--- trunk/scipy/stats/SConstruct 2008-05-01 21:02:04 UTC (rev 4203)
+++ trunk/scipy/stats/SConstruct 2008-05-03 06:22:28 UTC (rev 4204)
@@ -1,4 +1,4 @@
-# Last Change: Tue Apr 22 01:00 PM 2008 J
+# Last Change: Sat May 03 02:00 PM 2008 J
# vim:syntax=python
from os.path import join as pjoin
@@ -7,6 +7,8 @@
env = GetNumpyEnvironment(ARGUMENTS)
+t = env.Tool('numpyf2py')
+
env.AppendUnique(CPPPATH = [get_numpy_include_dirs()])
env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
More information about the Scipy-svn
mailing list