[Scipy-svn] r4380 - branches/refactor_fft/scipy/fftpack/fftpack
scipy-svn at scipy.org
scipy-svn at scipy.org
Sat May 24 11:15:59 EDT 2008
Author: cdavid
Date: 2008-05-24 10:15:52 -0500 (Sat, 24 May 2008)
New Revision: 4380
Added:
branches/refactor_fft/scipy/fftpack/fftpack/fftpack.pyf
Removed:
branches/refactor_fft/scipy/fftpack/fftpack/fft_template.pyf.src
branches/refactor_fft/scipy/fftpack/fftpack/fftpack.pyf.src
Modified:
branches/refactor_fft/scipy/fftpack/fftpack/setup.py
Log:
Do not use template anymore: it brings too much complexity for too little benefit.
Deleted: branches/refactor_fft/scipy/fftpack/fftpack/fft_template.pyf.src
===================================================================
--- branches/refactor_fft/scipy/fftpack/fftpack/fft_template.pyf.src 2008-05-24 10:44:59 UTC (rev 4379)
+++ branches/refactor_fft/scipy/fftpack/fftpack/fft_template.pyf.src 2008-05-24 15:15:52 UTC (rev 4380)
@@ -1,75 +0,0 @@
-!%f90 -*- f90 -*-
-! Author: Pearu Peterson, August 2002
-! This file is included by the files <backend>/<backend>.pyf.src
-! **********************************************************************
-! NOTE: IF YOU UPDATE THIS FILE, YOU SHOULD UPDATE IT FOR BACKENDS TOO !
-! **********************************************************************
-
- subroutine zfft<modulename>(x,n,direction,howmany,normalize)
- ! y = fft(x[,n,direction,normalize,overwrite_x])
- intent(c) zfft<modulename>
- complex*16 intent(c,in,out,copy,out=y) :: x(*)
- integer optional,depend(x),intent(c,in) :: n=size(x)
- check(n>0) n
- integer depend(x,n),intent(c,hide) :: howmany = size(x)/n
- check(n*howmany==size(x)) howmany
- integer optional,intent(c,in) :: direction = 1
- integer optional,intent(c,in),depend(direction) &
- :: normalize = (direction<0)
- end subroutine zfft<modulename>
-
- subroutine drfft<modulename>(x,n,direction,howmany,normalize)
- ! y = drfft(x[,n,direction,normalize,overwrite_x])
- intent(c) drfft<modulename>
- real*8 intent(c,in,out,copy,out=y) :: x(*)
- integer optional,depend(x),intent(c,in) :: n=size(x)
- check(n>0&&n<=size(x)) n
- integer depend(x,n),intent(c,hide) :: howmany = size(x)/n
- check(n*howmany==size(x)) howmany
- integer optional,intent(c,in) :: direction = 1
- integer optional,intent(c,in),depend(direction) &
- :: normalize = (direction<0)
- end subroutine drfft<modulename>
-
- subroutine zrfft<modulename>(x,n,direction,howmany,normalize)
- ! y = zrfft(x[,n,direction,normalize,overwrite_x])
- intent(c) zrfft<modulename>
- complex*16 intent(c,in,out,overwrite,out=y) :: x(*)
- integer optional,depend(x),intent(c,in) :: n=size(x)
- check(n>0&&n<=size(x)) n
- integer depend(x,n),intent(c,hide) :: howmany = size(x)/n
- check(n*howmany==size(x)) howmany
- integer optional,intent(c,in) :: direction = 1
- integer optional,intent(c,in),depend(direction) &
- :: normalize = (direction<0)
- end subroutine zrfft<modulename>
-
- subroutine zfftnd<modulename>(x,r,s,direction,howmany,normalize,j)
- ! y = zfftnd(x[,s,direction,normalize,overwrite_x])
- intent(c) zfftnd<modulename>
- complex*16 intent(c,in,out,copy,out=y) :: x(*)
- integer intent(c,hide),depend(x) :: r=old_rank(x)
- integer intent(c,hide) :: j=0
- integer optional,depend(r),dimension(r),intent(c,in) &
- :: s=old_shape(x,j++)
- check(r>=len(s)) s
- integer intent(c,hide) :: howmany = 1
- integer optional,intent(c,in) :: direction = 1
- integer optional,intent(c,in),depend(direction) :: &
- normalize = (direction<0)
- callprotoargument complex_double*,int,int*,int,int,int
- callstatement {&
- int i,sz=1,xsz=size(x); &
- for (i=0;i<r;++i) sz *= s[i]; &
- howmany = xsz/sz; &
- if (sz*howmany==xsz) &
- (*f2py_func)(x,r,s,direction,howmany,normalize); &
- else {&
- f2py_success = 0; &
- PyErr_SetString(<modulename>_error, &
- "inconsistency in x.shape and s argument"); &
- } &
- }
- end subroutine zfftnd<modulename>
-
-! See http://cens.ioc.ee/projects/f2py2e/
Copied: branches/refactor_fft/scipy/fftpack/fftpack/fftpack.pyf (from rev 4379, branches/refactor_fft/scipy/fftpack/fftpack/fft_template.pyf.src)
===================================================================
--- branches/refactor_fft/scipy/fftpack/fftpack/fft_template.pyf.src 2008-05-24 10:44:59 UTC (rev 4379)
+++ branches/refactor_fft/scipy/fftpack/fftpack/fftpack.pyf 2008-05-24 15:15:52 UTC (rev 4380)
@@ -0,0 +1,77 @@
+!%f90 -*- f90 -*-
+! Author: Pearu Peterson, August 2002
+
+python module _fftpack
+ interface
+
+ subroutine zfft_fftpack(x,n,direction,howmany,normalize)
+ ! y = fft(x[,n,direction,normalize,overwrite_x])
+ intent(c) zfft_fftpack
+ complex*16 intent(c,in,out,copy,out=y) :: x(*)
+ integer optional,depend(x),intent(c,in) :: n=size(x)
+ check(n>0) n
+ integer depend(x,n),intent(c,hide) :: howmany = size(x)/n
+ check(n*howmany==size(x)) howmany
+ integer optional,intent(c,in) :: direction = 1
+ integer optional,intent(c,in),depend(direction) &
+ :: normalize = (direction<0)
+ end subroutine zfft_fftpack
+
+ subroutine drfft_fftpack(x,n,direction,howmany,normalize)
+ ! y = drfft(x[,n,direction,normalize,overwrite_x])
+ intent(c) drfft_fftpack
+ real*8 intent(c,in,out,copy,out=y) :: x(*)
+ integer optional,depend(x),intent(c,in) :: n=size(x)
+ check(n>0&&n<=size(x)) n
+ integer depend(x,n),intent(c,hide) :: howmany = size(x)/n
+ check(n*howmany==size(x)) howmany
+ integer optional,intent(c,in) :: direction = 1
+ integer optional,intent(c,in),depend(direction) &
+ :: normalize = (direction<0)
+ end subroutine drfft_fftpack
+
+ subroutine zrfft_fftpack(x,n,direction,howmany,normalize)
+ ! y = zrfft(x[,n,direction,normalize,overwrite_x])
+ intent(c) zrfft_fftpack
+ complex*16 intent(c,in,out,overwrite,out=y) :: x(*)
+ integer optional,depend(x),intent(c,in) :: n=size(x)
+ check(n>0&&n<=size(x)) n
+ integer depend(x,n),intent(c,hide) :: howmany = size(x)/n
+ check(n*howmany==size(x)) howmany
+ integer optional,intent(c,in) :: direction = 1
+ integer optional,intent(c,in),depend(direction) &
+ :: normalize = (direction<0)
+ end subroutine zrfft_fftpack
+
+ subroutine zfftnd_fftpack(x,r,s,direction,howmany,normalize,j)
+ ! y = zfftnd(x[,s,direction,normalize,overwrite_x])
+ intent(c) zfftnd_fftpack
+ complex*16 intent(c,in,out,copy,out=y) :: x(*)
+ integer intent(c,hide),depend(x) :: r=old_rank(x)
+ integer intent(c,hide) :: j=0
+ integer optional,depend(r),dimension(r),intent(c,in) &
+ :: s=old_shape(x,j++)
+ check(r>=len(s)) s
+ integer intent(c,hide) :: howmany = 1
+ integer optional,intent(c,in) :: direction = 1
+ integer optional,intent(c,in),depend(direction) :: &
+ normalize = (direction<0)
+ callprotoargument complex_double*,int,int*,int,int,int
+ callstatement {&
+ int i,sz=1,xsz=size(x); &
+ for (i=0;i<r;++i) sz *= s[i]; &
+ howmany = xsz/sz; &
+ if (sz*howmany==xsz) &
+ (*f2py_func)(x,r,s,direction,howmany,normalize); &
+ else {&
+ f2py_success = 0; &
+ PyErr_SetString(_fftpack_error, &
+ "inconsistency in x.shape and s argument"); &
+ } &
+ }
+ end subroutine zfftnd_fftpack
+
+ end interface
+end python module _fftpack
+
+! See http://cens.ioc.ee/projects/f2py2e/
Deleted: branches/refactor_fft/scipy/fftpack/fftpack/fftpack.pyf.src
===================================================================
--- branches/refactor_fft/scipy/fftpack/fftpack/fftpack.pyf.src 2008-05-24 10:44:59 UTC (rev 4379)
+++ branches/refactor_fft/scipy/fftpack/fftpack/fftpack.pyf.src 2008-05-24 15:15:52 UTC (rev 4380)
@@ -1,8 +0,0 @@
-! -*- f90 -*-
-! <modulename=_fftpack>
-
-python module _fftpack
- interface
- include 'fft_template.pyf.src'
- end interface
-end python module _fftpack
Modified: branches/refactor_fft/scipy/fftpack/fftpack/setup.py
===================================================================
--- branches/refactor_fft/scipy/fftpack/fftpack/setup.py 2008-05-24 10:44:59 UTC (rev 4379)
+++ branches/refactor_fft/scipy/fftpack/fftpack/setup.py 2008-05-24 15:15:52 UTC (rev 4380)
@@ -10,7 +10,7 @@
config.add_library('dfftpack',
sources=[join('DFFTPACK','*.f')])
- sources = ['fftpack.pyf.src', 'src/zrfft.c']
+ sources = ['fftpack.pyf', 'src/zrfft.c']
for s in ["zfft.cxx", "zfftnd.cxx", "drfft.cxx"]:
sources.append(join('src/fftpack', s))
More information about the Scipy-svn
mailing list