[Scipy-svn] r4306 - in branches/refactor_fft/scipy/fftpack/src: . fftpack

[scipy-svn at scipy.org]

Author: cdavid
Date: 2008-05-13 02:33:26 -0500 (Tue, 13 May 2008)
New Revision: 4306

Added:
   branches/refactor_fft/scipy/fftpack/src/fftpack/api.h
Modified:
   branches/refactor_fft/scipy/fftpack/src/fftpack.cxx
   branches/refactor_fft/scipy/fftpack/src/fftpack/common.h
Log:
fftpack backend now works when split.

Added: branches/refactor_fft/scipy/fftpack/src/fftpack/api.h
===================================================================
--- branches/refactor_fft/scipy/fftpack/src/fftpack/api.h	2008-05-13 07:32:46 UTC (rev 4305)
+++ branches/refactor_fft/scipy/fftpack/src/fftpack/api.h	2008-05-13 07:33:26 UTC (rev 4306)
@@ -0,0 +1,16 @@
+#ifndef _SCIPY_FFTPACK_FFTPACK_API_H_
+#define _SCIPY_FFTPACK_FFTPACK_API_H_
+
+#include "fftpack.h"
+
+void drfft_fftpack(double * inout, int n, int direction, int howmany, 
+                  int normalize);
+
+void zfft_fftpack(complex_double * inout,
+		 int n, int direction, int howmany, int normalize);
+
+void zfftnd_fftpack(complex_double * inout, int rank,
+			 int *dims, int direction, int howmany,
+			 int normalize);
+
+#endif

Modified: branches/refactor_fft/scipy/fftpack/src/fftpack/common.h
===================================================================
--- branches/refactor_fft/scipy/fftpack/src/fftpack/common.h	2008-05-13 07:32:46 UTC (rev 4305)
+++ branches/refactor_fft/scipy/fftpack/src/fftpack/common.h	2008-05-13 07:33:26 UTC (rev 4306)
@@ -4,15 +4,16 @@
 #include <new>
 
 #include "cycliccache.h"
+#include "api.h"
 
-namespace fft {
-
 extern "C" {
 extern void F_FUNC(dfftf, DFFTF) (int *, double *, double *);
 extern void F_FUNC(dfftb, DFFTB) (int *, double *, double *);
 extern void F_FUNC(dffti, DFFTI) (int *, double *);
 };
 
+namespace fft {
+
 class RFFTPackCacheId : public CacheId {
         public:
                 RFFTPackCacheId(int n) : CacheId(n) {};

Modified: branches/refactor_fft/scipy/fftpack/src/fftpack.cxx
===================================================================
--- branches/refactor_fft/scipy/fftpack/src/fftpack.cxx	2008-05-13 07:32:46 UTC (rev 4305)
+++ branches/refactor_fft/scipy/fftpack/src/fftpack.cxx	2008-05-13 07:33:26 UTC (rev 4306)
@@ -39,10 +39,6 @@
  *  #endif
  */
 
-#include "fftpack/drfft.cxx"
-#include "fftpack/zfftnd.cxx"
-#include "fftpack/zfft.cxx"
-
 #ifdef WITH_FFTW3
     #include "fftw3/drfft.cxx"
     #include "fftw3/zfft.cxx"