[Scipy-svn] r4320 - in branches/refactor_fft/scipy/fftpack/src: . fftw fftw3

[scipy-svn at scipy.org]

Author: cdavid
Date: 2008-05-13 04:18:42 -0500 (Tue, 13 May 2008)
New Revision: 4320

Modified:
   branches/refactor_fft/scipy/fftpack/src/fftpack.h
   branches/refactor_fft/scipy/fftpack/src/fftw/drfft.cxx
   branches/refactor_fft/scipy/fftpack/src/fftw3/common.h
Log:
Putting fftw specific macro in fftw backends.

Modified: branches/refactor_fft/scipy/fftpack/src/fftpack.h
===================================================================
--- branches/refactor_fft/scipy/fftpack/src/fftpack.h	2008-05-13 09:15:02 UTC (rev 4319)
+++ branches/refactor_fft/scipy/fftpack/src/fftpack.h	2008-05-13 09:18:42 UTC (rev 4320)
@@ -63,31 +63,4 @@
 #endif
 #endif
 
-#define COPYRFFTW2STD(SRC,DEST,N) { \
-  int j,n2=(N)/2; \
-  *(DEST) = *(SRC); \
-  for (j=1;j<n2;++j) { \
-    *(DEST+2*j-1) = *(SRC+j); \
-    *(DEST+2*j) = *(SRC+(N)-j); \
-  } \
-  if (N>1) { \
-    *(DEST+2*n2-1) = *(SRC+n2); \
-    if ((N)%2) \
-      *(DEST+2*n2) = *(SRC+(N)-n2); \
-  } \
-}
-#define COPYINVRFFTW2STD(SRC,DEST,N) { \
-  int j,n2=(N)/2; \
-  *(DEST) = *(SRC); \
-  for (j=1;j<n2;++j) { \
-    *(DEST+j) = *(SRC+2*j-1); \
-    *(DEST+(N)-j) = *(SRC+2*j); \
-  } \
-  if (N>1) {\
-    *(DEST+n2) = *(SRC+2*n2-1); \
-    if ((N)%2) \
-      *(DEST+(N)-n2) = *(SRC+2*n2); \
-  } \
-}
-
 #endif

Modified: branches/refactor_fft/scipy/fftpack/src/fftw/drfft.cxx
===================================================================
--- branches/refactor_fft/scipy/fftpack/src/fftw/drfft.cxx	2008-05-13 09:15:02 UTC (rev 4319)
+++ branches/refactor_fft/scipy/fftpack/src/fftw/drfft.cxx	2008-05-13 09:18:42 UTC (rev 4320)
@@ -1,5 +1,5 @@
 /*
- * Last Change: Tue May 13 02:00 PM 2008 J
+ * Last Change: Tue May 13 06:00 PM 2008 J
  *
  * FFTW2 implementation
  *
@@ -12,6 +12,7 @@
 
 #include "cycliccache.h"
 #include "api.h"
+#include "common.h"
 
 using namespace fft;
 

Modified: branches/refactor_fft/scipy/fftpack/src/fftw3/common.h
===================================================================
--- branches/refactor_fft/scipy/fftpack/src/fftw3/common.h	2008-05-13 09:15:02 UTC (rev 4319)
+++ branches/refactor_fft/scipy/fftpack/src/fftw3/common.h	2008-05-13 09:18:42 UTC (rev 4320)
@@ -5,6 +5,33 @@
 
 #include <stddef.h>
 
+#define COPYRFFTW2STD(SRC,DEST,N) { \
+  int j,n2=(N)/2; \
+  *(DEST) = *(SRC); \
+  for (j=1;j<n2;++j) { \
+    *(DEST+2*j-1) = *(SRC+j); \
+    *(DEST+2*j) = *(SRC+(N)-j); \
+  } \
+  if (N>1) { \
+    *(DEST+2*n2-1) = *(SRC+n2); \
+    if ((N)%2) \
+      *(DEST+2*n2) = *(SRC+(N)-n2); \
+  } \
+}
+#define COPYINVRFFTW2STD(SRC,DEST,N) { \
+  int j,n2=(N)/2; \
+  *(DEST) = *(SRC); \
+  for (j=1;j<n2;++j) { \
+    *(DEST+j) = *(SRC+2*j-1); \
+    *(DEST+(N)-j) = *(SRC+2*j); \
+  } \
+  if (N>1) {\
+    *(DEST+n2) = *(SRC+2*n2-1); \
+    if ((N)%2) \
+      *(DEST+(N)-n2) = *(SRC+2*n2); \
+  } \
+}
+
 namespace fft {
 
 inline bool is_simd_aligned(const void * p)