added test code for kiss_fftnd

FFTs can now have an arbitrary # of dimensions
Also, buffer copies are eliminated.

test/Makefile

@@ -39,10 +39,10 @@ CFLAGS=-Wall -O3 -pedantic -march=pentiumpro -ffast-math -fomit-frame-pointer
 # If the above flags do not work, try the following
 #CFLAGS=-Wall -O3
 
-$(FFTUTIL): ../kiss_fft.c fftutil.c kiss_fft2d.c kiss_fftr.c
+$(FFTUTIL): ../kiss_fft.c fftutil.c kiss_fftnd.c kiss_fftr.c
 	$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -lm $+
 
-$(SELFTEST): ../kiss_fft.c $(SELFTESTSRC) kiss_fft2d.c
+$(SELFTEST): ../kiss_fft.c $(SELFTESTSRC) kiss_fftnd.c
 	$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -lm $+
 
 $(TESTKFC): ../kiss_fft.c kfc.c

test/compfft.py

@@ -7,6 +7,7 @@ import math
 import random
 import sys
 import struct
+import fft
 
 pi=math.pi
 e=math.e
@@ -28,23 +29,24 @@ def main():
     util = opts.get('-u','./kf_float')
 
     try:
-        n = int(opts['-n'])
+        dims = [ int(d) for d in opts['-n'].split(',')]
         cpx = opts.get('-R') is None
         fmt=opts.get('-t','f')
     except KeyError:
         sys.stderr.write("""
         usage: compfft.py 
-        -n nfft
-        -u utilname : see sample_code/fftutil.c
+        -n d1[,d2,d3...]  : FFT dimension(s)
+        -u utilname : see sample_code/fftutil.c, default = ./kf_float
         -R : real-optimized version\n""")
         sys.exit(1)
 
-    x = randbuf(n,cpx)
+    x = fft.make_random( dims )
 
-    cmd = '%s -n %d ' % ( util, n )
+    cmd = '%s -n %s ' % ( util, ','.join([ str(d) for d in dims]) )
     if cpx:
-        xout = FFT.fft(x)
-    else:        
+        xout = FFT.fftnd(x)
+        xout = reshape(xout,(size(xout),))
+    else:
         cmd += '-R '
         xout = FFT.real_fft(x)
 
@@ -53,18 +55,22 @@ def main():
     proc.tochild.write( dopack( x , fmt ,cpx ) )
     proc.tochild.close()
     xoutcomp = dounpack( proc.fromchild.read( ) , fmt ,1 )
+    #xoutcomp = reshape( xoutcomp , dims )
+
+    sig = xout * conjugate(xout)
+    sigpow = sum( sig )
 
-    sigpow = sum( xout * conjugate(xout) )
-    print len(xout)
-    print len(xoutcomp)
-    
     diff = xout-xoutcomp
     noisepow = sum( diff * conjugate(diff) )
 
     snr = 10 * math.log10(abs( sigpow / noisepow ) )
-    print 'NFFT=%d,SNR = %f dB' % (n,snr)
+    if snr<100:
+        print xout
+        print xoutcomp
+    print 'NFFT=%s,SNR = %f dB' % (str(dims),snr)
 
 def dopack(x,fmt,cpx):
+    x = reshape( x, ( size(x),) )
     if cpx:
         s = ''.join( [ struct.pack('ff',c.real,c.imag) for c in x ] )
     else:

test/fft.py

@@ -148,7 +148,6 @@ def randmat( ndims ):
 def test_fftnd(ndims=3):
     import FFT
     import Numeric
-    random.seed(2)
 
     x=randmat( ndims )
     print 'dimensions=%s' % str( Numeric.shape(x) )
@@ -174,15 +173,15 @@ def myfftnd(x):
 
 def fftndwork(x,dims):
     import Numeric
-    gg=Numeric.product( dims )
+    dimprod=Numeric.product( dims )
 
     for k in range( len(dims) ):
-        d=dims[ k ]
-        g=gg/d
-        next_stage = [complex(0,0)]*len(x)
-        for i in range(g):
-            next_stage[i*d:(i+1)*d] = fft(x[i:(i+d)*g:g],0)
-        x = next_stage
+        cur_dim=dims[ k ]
+        stride=dimprod/cur_dim
+        next_x = [complex(0,0)]*len(x)
+        for i in range(stride):
+            next_x[i*cur_dim:(i+1)*cur_dim] = fft(x[i:(i+cur_dim)*stride:stride],0)
+        x = next_x
     return x
 
 if __name__ == "__main__":

test/selftest.c

@@ -1,5 +1,5 @@
 #include "kiss_fft.h"
-#include "kiss_fft2d.h"
+#include "kiss_fftnd.h"
 #include "_kiss_fft_guts.h"
 
 #define xstr(s) str(s)
@@ -164,8 +164,8 @@ int test_stride()
     if ( memcmp(buf1out,buf2out,sizeof(buf1out) ) ){
         printf("kiss_fft_stride not working for stride =%d\n",SKIP_FACTOR);
         for (i=0;i<FFT_SIZE;++i) {
-            printf(stderr,"good[%d]=",i);pcpx(buf1out+i);
-            printf(stderr,"bad [%d]=",i);pcpx(buf2out+i);
+            printf("good[%d]=",i);pcpx(buf1out+i);
+            printf("bad [%d]=",i);pcpx(buf2out+i);
         }
         free(cfg);
         return 1;
@@ -178,6 +178,7 @@ int test_stride()
 int test2d()
 {
     void *cfg;
+    int dims[]={3,9};
     kiss_fft_cpx in[3*9]={
         {1,0},{0,0},{0,0},{0,0},{0,0},{0,0},{3,0},{0,0},{0,0},
         {0,0},{0,0},{0,0},{0,0},{5,0},{0,0},{0,0},{0,0},{0,0},
@@ -186,8 +187,8 @@ int test2d()
     kiss_fft_cpx ver[3*9]= {
     {16.00000,0.00000},{0.16385,5.38749},{4.54576,7.50952},{-2.00000,1.73205},{-6.20961,9.91626},{-6.20961,-9.91626},{-2.00000,-1.73205},{4.54576,-7.50952},{0.16385,-5.38749},{-2.00000,1.73205},{-6.20961,9.91626},{-6.20961,-9.91626},{-2.00000,-1.73205},{4.54576,-7.50952},{0.16385,-5.38749},{16.00000,0.00000},{0.16385,5.38749},{4.54576,7.50952},{-2.00000,-1.73205},{4.54576,-7.50952},{0.16385,-5.38749},{16.00000,-0.00000},{0.16385,5.38749},{4.54576,7.50952},{-2.00000,1.73205},{-6.20961,9.91626},{-6.20961,-9.91626} };
     
-    cfg = kiss_fft2d_alloc(3,9,0,0,0);
-    kiss_fft2d(cfg,in,out);
+    cfg = kiss_fftnd_alloc(dims,2,0,0,0);
+    kiss_fftnd(cfg,in,out);
     free(cfg);
 
     if ( snr_compare( out,ver, 3*9) < 100 ) {