[Scipy-svn] r4255 - branches/refactor_fft/scipy/fftpack/src/mkl

scipy-svn at scipy.org scipy-svn at scipy.org
Sun May 11 05:20:52 EDT 2008


Author: cdavid
Date: 2008-05-11 04:20:47 -0500 (Sun, 11 May 2008)
New Revision: 4255

Modified:
   branches/refactor_fft/scipy/fftpack/src/mkl/zfftnd.cxx
Log:
Reindent zfftnd mkl implementation, to match PEP 7.

Modified: branches/refactor_fft/scipy/fftpack/src/mkl/zfftnd.cxx
===================================================================
--- branches/refactor_fft/scipy/fftpack/src/mkl/zfftnd.cxx	2008-05-11 09:13:36 UTC (rev 4254)
+++ branches/refactor_fft/scipy/fftpack/src/mkl/zfftnd.cxx	2008-05-11 09:20:47 UTC (rev 4255)
@@ -3,18 +3,19 @@
  *
  * Original code by David M. Cooke
  *
- * Last Change: Wed Aug 08 03:00 PM 2007 J
+ * Last Change: Sun May 11 06:00 PM 2008 J
  */
 
 static long *convert_dims(int n, int *dims)
 {
-    long *ndim;
-    int i;
-    ndim = (long *) malloc(sizeof(long) * n);
-    for (i = 0; i < n; i++) {
-        ndim[i] = (long) dims[i];
-    }
-    return ndim;
+        long *ndim;
+        int i;
+
+        ndim = (long *) malloc(sizeof(*ndim) * n);
+        for (i = 0; i < n; i++) {
+                ndim[i] = (long) dims[i];
+        }
+        return ndim;
 }
 
 GEN_CACHE(zfftnd_mkl, (int n, int *dims)
@@ -38,29 +39,29 @@
 		       int *dims, int direction, int howmany,
 		       int normalize)
 {
-    int i, sz;
-    complex_double *ptr = inout;
+        int i, sz, id;
+        complex_double *ptr = inout;
 
-    DFTI_DESCRIPTOR_HANDLE desc_handle;
-    sz = 1;
-    for (i = 0; i < rank; ++i) {
-        sz *= dims[i];
-    }
+        DFTI_DESCRIPTOR_HANDLE desc_handle;
+        sz = 1;
+        for (i = 0; i < rank; ++i) {
+                sz *= dims[i];
+        }
 
-    desc_handle =
-	caches_zfftnd_mkl[get_cache_id_zfftnd_mkl(rank, dims)].desc_handle;
-    for (i = 0; i < howmany; ++i, ptr += sz) {
-        if (direction == 1) {
-            DftiComputeForward(desc_handle, (double *) ptr);
-        } else if (direction == -1) {
-            DftiComputeBackward(desc_handle, (double *) ptr);
+        id = get_cache_id_zfftnd_mkl(rank, dims);
+        desc_handle = caches_zfftnd_mkl[id].desc_handle;
+        for (i = 0; i < howmany; ++i, ptr += sz) {
+                if (direction == 1) {
+                        DftiComputeForward(desc_handle, (double *) ptr);
+                } else if (direction == -1) {
+                        DftiComputeBackward(desc_handle, (double *) ptr);
+                }
         }
-    }
-    if (normalize) {
-        ptr = inout;
-        for (i = sz * howmany - 1; i >= 0; --i) {
-            *((double *) (ptr)) /= sz;
-            *((double *) (ptr++) + 1) /= sz;
+        if (normalize) {
+                ptr = inout;
+                for (i = sz * howmany - 1; i >= 0; --i) {
+                        *((double *) (ptr)) /= sz;
+                        *((double *) (ptr++) + 1) /= sz;
+                }
         }
-    }
 }




More information about the Scipy-svn mailing list