[Scipy-svn] r4889 - branches/remove_fft_backends/scipy/fftpack

scipy-svn@scip... scipy-svn@scip...
Sat Nov 1 09:20:43 CDT 2008


Author: cdavid
Date: 2008-11-01 09:20:37 -0500 (Sat, 01 Nov 2008)
New Revision: 4889

Modified:
   branches/remove_fft_backends/scipy/fftpack/NOTES.txt
   branches/remove_fft_backends/scipy/fftpack/SConscript
Log:
Update NOTEST.

Modified: branches/remove_fft_backends/scipy/fftpack/NOTES.txt
===================================================================
--- branches/remove_fft_backends/scipy/fftpack/NOTES.txt	2008-11-01 14:13:25 UTC (rev 4888)
+++ branches/remove_fft_backends/scipy/fftpack/NOTES.txt	2008-11-01 14:20:37 UTC (rev 4889)
@@ -27,76 +27,14 @@
 
 ::
 
-  python tests/test_basic.py -l 10
-  python tests/test_pseudo_diffs.py -l 10
-  python tests/test_helper.py -l 10
+  python -c "import scipy.fftpack; scipy.fftpack.test()"
 
 or from python
 
->>> import fftpack
->>> fftpack.test(10)
+>>> import scipy.fftpack
+>>> scipy.fftpack.test(10)
 
 
-Building with high-performance FFT libraries
-============================================
-
-fftpack uses optimal combination of FFT libraries for different
-jobs. Currently, Fortran FFTPACK, FFTW, and DJBFFT libraries are
-supported. The last two are optional and used only if
-scipy/distutils/system_info.py detects them. 
-If they are available, then the output of
-
-::
-
-  python scipy/distutils/system_info.py
-
-should show, for example
-
-::
-
-  dfftw_info:
-    FOUND:
-      libraries = ['drfftw', 'dfftw']
-      library_dirs = ['/path/to/lib']
-      define_macros = [('SCIPY_DFFTW_H', None)]
-      include_dirs = ['/path/to/include']
-
-  djbfft_info:
-    FOUND:
-      extra_objects = ['/path/to/lib/djbfft.a']
-      define_macros = [('SCIPY_DJBFFT_H', None)]
-      include_dirs = ['/path/to/include']
-
-Note that when using fftw libraries provided by a Linux distribution
-then fftw-dev (or fftw-devel or similar) must be installed as well, 
-otherwise system_info.py won't detect fftw libraries.
-
-DJBFFT library is fastest for power-of-two (<=8192) Fourier
-transforms. FFTW is superior for non-power-of-two transforms and
-multi-dimensional transforms.
-
-Building notes for FFTW_
-------------------------
-Follow the instructions in
-
-  http://www.fftw.org/doc/fftw_6.html
-
-Note that fftpack uses double-precision FFTW. So, if you build
-libfftw.a, then it is assumed that it contains double-precision code.
-
-.. _FFTW: http://www.fftw.org
-
-Building notes for DJBFFT_
---------------------------
-.. _DJBFFT: http://cr.yp.to/djbfft.html
-
-Follow the installation instructions in
-
-  http://cr.yp.to/djbfft/install.html
-
-If djbfft is installed under these instructions then scipy_distutils
-picks up it for fftpack automatically.
-
 Differences between fftpack and FFT from Numeric
 ================================================
 

Modified: branches/remove_fft_backends/scipy/fftpack/SConscript
===================================================================
--- branches/remove_fft_backends/scipy/fftpack/SConscript	2008-11-01 14:13:25 UTC (rev 4888)
+++ branches/remove_fft_backends/scipy/fftpack/SConscript	2008-11-01 14:20:37 UTC (rev 4889)
@@ -1,32 +1,14 @@
-# Last Change: Thu Jun 12 07:00 PM 2008 J
+# Last Change: Sat Nov 01 10:00 PM 2008 J
 # vim:syntax=python
 from os.path import join as pjoin
 
-from numscons import GetNumpyEnvironment, write_info
-from numscons import CheckFFT, IsMKL, IsFFTW2, IsFFTW3
+from numscons import GetNumpyEnvironment
 
 env = GetNumpyEnvironment(ARGUMENTS)
 env.Tool('f2py')
 
-# Check fft implementation
-config = env.NumpyConfigure(custom_tests = {'CheckFFT': CheckFFT})
-has_fft = config.CheckFFT()
-config.Finish()
-write_info(env)
-
-# Tweak defineds depending on the fft used
-if has_fft:
-    if IsMKL(env, 'fft'):
-        env.Append(CPPDEFINES = "SCIPY_MKL_H")
-    elif IsFFTW3(env, 'fft'):
-        env.Append(CPPDEFINES = "SCIPY_FFTW3_H")
-    elif IsFFTW2(env, 'fft'):
-        env.Append(CPPDEFINES = "SCIPY_FFTW2_H")
-    else:
-        pass
-
 # Build dfftpack
-src = [pjoin("dfftpack", i) for i in [ "dcosqb.f", "dcosqf.f", "dcosqi.f",
+src = [pjoin("src/dfftpack", i) for i in [ "dcosqb.f", "dcosqf.f", "dcosqi.f",
 "dcost.f", "dcosti.f", "dfftb.f", "dfftb1.f", "dfftf.f", "dfftf1.f", "dffti.f",
 "dffti1.f", "dsinqb.f", "dsinqf.f", "dsinqi.f", "dsint.f", "dsint1.f",
 "dsinti.f", "zfftb.f", "zfftb1.f", "zfftf.f", "zfftf1.f", "zffti.f",



More information about the Scipy-svn mailing list