[Scipy-svn] r4880 - branches/remove_fft_backends/scipy/fftpack/src

[scipy-svn at scipy.org]

Author: cdavid
Date: 2008-11-01 08:34:29 -0500 (Sat, 01 Nov 2008)
New Revision: 4880

Modified:
   branches/remove_fft_backends/scipy/fftpack/src/zfftnd.c
Log:
Remove any non-fftpack code for complex, multi-dimension fft.

Modified: branches/remove_fft_backends/scipy/fftpack/src/zfftnd.c
===================================================================
--- branches/remove_fft_backends/scipy/fftpack/src/zfftnd.c	2008-11-01 13:33:43 UTC (rev 4879)
+++ branches/remove_fft_backends/scipy/fftpack/src/zfftnd.c	2008-11-01 13:34:29 UTC (rev 4880)
@@ -19,27 +19,5 @@
         zfftnd_##name(inout, rank, dims, direction, howmany, normalize);\
 }
 
-#if defined(WITH_FFTW) || defined(WITH_MKL)
-static
-int equal_dims(int rank,int *dims1,int *dims2) {
-  int i;
-  for (i=0;i<rank;++i)
-    if (dims1[i]!=dims2[i])
-      return 0;
-  return 1;
-}
-#endif
-
-#ifdef WITH_FFTW3
-    #include "zfftnd_fftw3.c"
-    GEN_PUBLIC_API(fftw3)
-#elif defined WITH_FFTW
-    #include "zfftnd_fftw.c"
-    GEN_PUBLIC_API(fftw)
-#elif defined WITH_MKL
-    #include "zfftnd_mkl.c"
-    GEN_PUBLIC_API(mkl)
-#else /* Use fftpack by default */
-    #include "zfftnd_fftpack.c"
-    GEN_PUBLIC_API(fftpack)
-#endif
+#include "zfftnd_fftpack.c"
+GEN_PUBLIC_API(fftpack)