summaryrefslogtreecommitdiff
path: root/numpy/fft
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/fft')
-rw-r--r--numpy/fft/fftpack.c41
-rw-r--r--numpy/fft/fftpack.h12
-rw-r--r--numpy/fft/fftpack.py2
-rw-r--r--numpy/fft/fftpack_litemodule.c50
-rw-r--r--numpy/fft/setup.py1
-rw-r--r--numpy/fft/tests/test_fftpack.py2
-rw-r--r--numpy/fft/tests/test_helper.py4
7 files changed, 53 insertions, 59 deletions
diff --git a/numpy/fft/fftpack.c b/numpy/fft/fftpack.c
index 9c8fd118a..355076a30 100644
--- a/numpy/fft/fftpack.c
+++ b/numpy/fft/fftpack.c
@@ -8,6 +8,9 @@ Algorithmically based on Fortran-77 FFTPACK by Paul N. Swarztrauber (Version 4,
#include <math.h>
#include <stdio.h>
+#include <Python.h>
+#include <numpy/ndarraytypes.h>
+
#define DOUBLE
#ifdef DOUBLE
@@ -29,7 +32,7 @@ extern "C" {
/* ----------------------------------------------------------------------
passf2, passf3, passf4, passf5, passf. Complex FFT passes fwd and bwd.
----------------------------------------------------------------------- */
+----------------------------------------------------------------------- */
static void passf2(int ido, int l1, const Treal cc[], Treal ch[], const Treal wa1[], int isign)
/* isign==+1 for backward transform */
@@ -1142,9 +1145,9 @@ static void radbg(int ido, int ip, int l1, int idl1,
}
} /* radbg */
- /* ----------------------------------------------------------------------
-cfftf1, cfftf, cfftb, cffti1, cffti. Complex FFTs.
----------------------------------------------------------------------- */
+ /* ------------------------------------------------------------
+cfftf1, npy_cfftf, npy_cfftb, cffti1, npy_cffti. Complex FFTs.
+--------------------------------------------------------------- */
static void cfftf1(int n, Treal c[], Treal ch[], const Treal wa[], const int ifac[MAXFAC+2], int isign)
{
@@ -1204,24 +1207,24 @@ static void cfftf1(int n, Treal c[], Treal ch[], const Treal wa[], const int ifa
} /* cfftf1 */
-void cfftf(int n, Treal c[], Treal wsave[])
+NPY_VISIBILITY_HIDDEN void npy_cfftf(int n, Treal c[], Treal wsave[])
{
int iw1, iw2;
if (n == 1) return;
iw1 = 2*n;
iw2 = iw1 + 2*n;
cfftf1(n, c, wsave, wsave+iw1, (int*)(wsave+iw2), -1);
- } /* cfftf */
+ } /* npy_cfftf */
-void cfftb(int n, Treal c[], Treal wsave[])
+NPY_VISIBILITY_HIDDEN void npy_cfftb(int n, Treal c[], Treal wsave[])
{
int iw1, iw2;
if (n == 1) return;
iw1 = 2*n;
iw2 = iw1 + 2*n;
cfftf1(n, c, wsave, wsave+iw1, (int*)(wsave+iw2), +1);
- } /* cfftb */
+ } /* npy_cfftb */
static void factorize(int n, int ifac[MAXFAC+2], const int ntryh[NSPECIAL])
@@ -1304,17 +1307,17 @@ static void cffti1(int n, Treal wa[], int ifac[MAXFAC+2])
} /* cffti1 */
-void cffti(int n, Treal wsave[])
+NPY_VISIBILITY_HIDDEN void npy_cffti(int n, Treal wsave[])
{
int iw1, iw2;
if (n == 1) return;
iw1 = 2*n;
iw2 = iw1 + 2*n;
cffti1(n, wsave+iw1, (int*)(wsave+iw2));
- } /* cffti */
+ } /* npy_cffti */
- /* ----------------------------------------------------------------------
-rfftf1, rfftb1, rfftf, rfftb, rffti1, rffti. Treal FFTs.
+ /* -------------------------------------------------------------------
+rfftf1, rfftb1, npy_rfftf, npy_rfftb, rffti1, npy_rffti. Treal FFTs.
---------------------------------------------------------------------- */
static void rfftf1(int n, Treal c[], Treal ch[], const Treal wa[], const int ifac[MAXFAC+2])
@@ -1378,7 +1381,7 @@ static void rfftf1(int n, Treal c[], Treal ch[], const Treal wa[], const int ifa
} /* rfftf1 */
-void rfftb1(int n, Treal c[], Treal ch[], const Treal wa[], const int ifac[MAXFAC+2])
+static void rfftb1(int n, Treal c[], Treal ch[], const Treal wa[], const int ifac[MAXFAC+2])
{
int i;
int k1, l1, l2, na, nf, ip, iw, ix2, ix3, ix4, ido, idl1;
@@ -1434,18 +1437,18 @@ void rfftb1(int n, Treal c[], Treal ch[], const Treal wa[], const int ifac[MAXFA
} /* rfftb1 */
-void rfftf(int n, Treal r[], Treal wsave[])
+NPY_VISIBILITY_HIDDEN void npy_rfftf(int n, Treal r[], Treal wsave[])
{
if (n == 1) return;
rfftf1(n, r, wsave, wsave+n, (int*)(wsave+2*n));
- } /* rfftf */
+ } /* npy_rfftf */
-void rfftb(int n, Treal r[], Treal wsave[])
+NPY_VISIBILITY_HIDDEN void npy_rfftb(int n, Treal r[], Treal wsave[])
{
if (n == 1) return;
rfftb1(n, r, wsave, wsave+n, (int*)(wsave+2*n));
- } /* rfftb */
+ } /* npy_rfftb */
static void rffti1(int n, Treal wa[], int ifac[MAXFAC+2])
@@ -1490,11 +1493,11 @@ static void rffti1(int n, Treal wa[], int ifac[MAXFAC+2])
} /* rffti1 */
-void rffti(int n, Treal wsave[])
+NPY_VISIBILITY_HIDDEN void npy_rffti(int n, Treal wsave[])
{
if (n == 1) return;
rffti1(n, wsave+n, (int*)(wsave+2*n));
- } /* rffti */
+ } /* npy_rffti */
#ifdef __cplusplus
}
diff --git a/numpy/fft/fftpack.h b/numpy/fft/fftpack.h
index d134784a2..5e8f4631c 100644
--- a/numpy/fft/fftpack.h
+++ b/numpy/fft/fftpack.h
@@ -15,13 +15,13 @@ extern "C" {
#define Treal float
#endif
-extern void cfftf(int N, Treal data[], const Treal wrk[]);
-extern void cfftb(int N, Treal data[], const Treal wrk[]);
-extern void cffti(int N, Treal wrk[]);
+extern NPY_VISIBILITY_HIDDEN void npy_cfftf(int N, Treal data[], const Treal wrk[]);
+extern NPY_VISIBILITY_HIDDEN void npy_cfftb(int N, Treal data[], const Treal wrk[]);
+extern NPY_VISIBILITY_HIDDEN void npy_cffti(int N, Treal wrk[]);
-extern void rfftf(int N, Treal data[], const Treal wrk[]);
-extern void rfftb(int N, Treal data[], const Treal wrk[]);
-extern void rffti(int N, Treal wrk[]);
+extern NPY_VISIBILITY_HIDDEN void npy_rfftf(int N, Treal data[], const Treal wrk[]);
+extern NPY_VISIBILITY_HIDDEN void npy_rfftb(int N, Treal data[], const Treal wrk[]);
+extern NPY_VISIBILITY_HIDDEN void npy_rffti(int N, Treal wrk[]);
#ifdef __cplusplus
}
diff --git a/numpy/fft/fftpack.py b/numpy/fft/fftpack.py
index 706fcdd2f..4efb2a9a0 100644
--- a/numpy/fft/fftpack.py
+++ b/numpy/fft/fftpack.py
@@ -43,7 +43,7 @@ _fft_cache = {}
_real_fft_cache = {}
def _raw_fft(a, n=None, axis=-1, init_function=fftpack.cffti,
- work_function=fftpack.cfftf, fft_cache = _fft_cache ):
+ work_function=fftpack.cfftf, fft_cache=_fft_cache):
a = asarray(a)
if n is None:
diff --git a/numpy/fft/fftpack_litemodule.c b/numpy/fft/fftpack_litemodule.c
index 95da3194f..7b37ce9b7 100644
--- a/numpy/fft/fftpack_litemodule.c
+++ b/numpy/fft/fftpack_litemodule.c
@@ -1,16 +1,14 @@
#define NPY_NO_DEPRECATED_API NPY_API_VERSION
-#include "fftpack.h"
#include "Python.h"
#include "numpy/arrayobject.h"
+#include "fftpack.h"
static PyObject *ErrorObject;
-/* ----------------------------------------------------- */
+static const char fftpack_cfftf__doc__[] = "";
-static char fftpack_cfftf__doc__[] = "";
-
-PyObject *
+static PyObject *
fftpack_cfftf(PyObject *NPY_UNUSED(self), PyObject *args)
{
PyObject *op1, *op2;
@@ -47,7 +45,7 @@ fftpack_cfftf(PyObject *NPY_UNUSED(self), PyObject *args)
Py_BEGIN_ALLOW_THREADS;
NPY_SIGINT_ON;
for (i = 0; i < nrepeats; i++) {
- cfftf(npts, dptr, wsave);
+ npy_cfftf(npts, dptr, wsave);
dptr += npts*2;
}
NPY_SIGINT_OFF;
@@ -61,9 +59,9 @@ fail:
return NULL;
}
-static char fftpack_cfftb__doc__[] = "";
+static const char fftpack_cfftb__doc__[] = "";
-PyObject *
+static PyObject *
fftpack_cfftb(PyObject *NPY_UNUSED(self), PyObject *args)
{
PyObject *op1, *op2;
@@ -100,7 +98,7 @@ fftpack_cfftb(PyObject *NPY_UNUSED(self), PyObject *args)
Py_BEGIN_ALLOW_THREADS;
NPY_SIGINT_ON;
for (i = 0; i < nrepeats; i++) {
- cfftb(npts, dptr, wsave);
+ npy_cfftb(npts, dptr, wsave);
dptr += npts*2;
}
NPY_SIGINT_OFF;
@@ -114,7 +112,7 @@ fail:
return NULL;
}
-static char fftpack_cffti__doc__[] ="";
+static const char fftpack_cffti__doc__[] = "";
static PyObject *
fftpack_cffti(PyObject *NPY_UNUSED(self), PyObject *args)
@@ -126,7 +124,7 @@ fftpack_cffti(PyObject *NPY_UNUSED(self), PyObject *args)
if (!PyArg_ParseTuple(args, "l", &n)) {
return NULL;
}
- /*Magic size needed by cffti*/
+ /*Magic size needed by npy_cffti*/
dim = 4*n + 15;
/*Create a 1 dimensional array of dimensions of type double*/
op = (PyArrayObject *)PyArray_SimpleNew(1, &dim, NPY_DOUBLE);
@@ -136,16 +134,16 @@ fftpack_cffti(PyObject *NPY_UNUSED(self), PyObject *args)
Py_BEGIN_ALLOW_THREADS;
NPY_SIGINT_ON;
- cffti(n, (double *)PyArray_DATA((PyArrayObject*)op));
+ npy_cffti(n, (double *)PyArray_DATA((PyArrayObject*)op));
NPY_SIGINT_OFF;
Py_END_ALLOW_THREADS;
return (PyObject *)op;
}
-static char fftpack_rfftf__doc__[] ="";
+static const char fftpack_rfftf__doc__[] = "";
-PyObject *
+static PyObject *
fftpack_rfftf(PyObject *NPY_UNUSED(self), PyObject *args)
{
PyObject *op1, *op2;
@@ -187,12 +185,11 @@ fftpack_rfftf(PyObject *NPY_UNUSED(self), PyObject *args)
rptr = (double *)PyArray_DATA(ret);
dptr = (double *)PyArray_DATA(data);
-
Py_BEGIN_ALLOW_THREADS;
NPY_SIGINT_ON;
for (i = 0; i < nrepeats; i++) {
memcpy((char *)(rptr+1), dptr, npts*sizeof(double));
- rfftf(npts, rptr+1, wsave);
+ npy_rfftf(npts, rptr+1, wsave);
rptr[0] = rptr[1];
rptr[1] = 0.0;
rptr += rstep;
@@ -211,10 +208,9 @@ fail:
return NULL;
}
-static char fftpack_rfftb__doc__[] ="";
+static const char fftpack_rfftb__doc__[] = "";
-
-PyObject *
+static PyObject *
fftpack_rfftb(PyObject *NPY_UNUSED(self), PyObject *args)
{
PyObject *op1, *op2;
@@ -257,7 +253,7 @@ fftpack_rfftb(PyObject *NPY_UNUSED(self), PyObject *args)
for (i = 0; i < nrepeats; i++) {
memcpy((char *)(rptr + 1), (dptr + 2), (npts - 1)*sizeof(double));
rptr[0] = dptr[0];
- rfftb(npts, rptr, wsave);
+ npy_rfftb(npts, rptr, wsave);
rptr += npts;
dptr += npts*2;
}
@@ -274,8 +270,7 @@ fail:
return NULL;
}
-
-static char fftpack_rffti__doc__[] ="";
+static const char fftpack_rffti__doc__[] = "";
static PyObject *
fftpack_rffti(PyObject *NPY_UNUSED(self), PyObject *args)
@@ -287,7 +282,7 @@ fftpack_rffti(PyObject *NPY_UNUSED(self), PyObject *args)
if (!PyArg_ParseTuple(args, "l", &n)) {
return NULL;
}
- /*Magic size needed by rffti*/
+ /*Magic size needed by npy_rffti*/
dim = 2*n + 15;
/*Create a 1 dimensional array of dimensions of type double*/
op = (PyArrayObject *)PyArray_SimpleNew(1, &dim, NPY_DOUBLE);
@@ -296,7 +291,7 @@ fftpack_rffti(PyObject *NPY_UNUSED(self), PyObject *args)
}
Py_BEGIN_ALLOW_THREADS;
NPY_SIGINT_ON;
- rffti(n, (double *)PyArray_DATA((PyArrayObject*)op));
+ npy_rffti(n, (double *)PyArray_DATA((PyArrayObject*)op));
NPY_SIGINT_OFF;
Py_END_ALLOW_THREADS;
@@ -316,11 +311,6 @@ static struct PyMethodDef fftpack_methods[] = {
{NULL, NULL, 0, NULL} /* sentinel */
};
-
-/* Initialization function for the module (*must* be called initfftpack) */
-
-static char fftpack_module_documentation[] = "" ;
-
#if PY_MAJOR_VERSION >= 3
static struct PyModuleDef moduledef = {
PyModuleDef_HEAD_INIT,
@@ -349,6 +339,8 @@ initfftpack_lite(void)
#if PY_MAJOR_VERSION >= 3
m = PyModule_Create(&moduledef);
#else
+ static const char fftpack_module_documentation[] = "";
+
m = Py_InitModule4("fftpack_lite", fftpack_methods,
fftpack_module_documentation,
(PyObject*)NULL,PYTHON_API_VERSION);
diff --git a/numpy/fft/setup.py b/numpy/fft/setup.py
index 79f681e55..cd99a82d7 100644
--- a/numpy/fft/setup.py
+++ b/numpy/fft/setup.py
@@ -12,7 +12,6 @@ def configuration(parent_package='',top_path=None):
sources=['fftpack_litemodule.c', 'fftpack.c']
)
-
return config
if __name__ == '__main__':
diff --git a/numpy/fft/tests/test_fftpack.py b/numpy/fft/tests/test_fftpack.py
index ac892c83b..45b5ac784 100644
--- a/numpy/fft/tests/test_fftpack.py
+++ b/numpy/fft/tests/test_fftpack.py
@@ -48,11 +48,11 @@ class TestFFTThreadSafe(TestCase):
for i in range(self.threads)]
[x.start() for x in t]
+ [x.join() for x in t]
# Make sure all threads returned the correct value
for i in range(self.threads):
assert_array_equal(q.get(timeout=5), expected,
'Function returned wrong value in multithreaded context')
- [x.join() for x in t]
def test_fft(self):
a = np.ones(self.input_shape) * 1+0j
diff --git a/numpy/fft/tests/test_helper.py b/numpy/fft/tests/test_helper.py
index 7eaa99fdb..1a51f8e3a 100644
--- a/numpy/fft/tests/test_helper.py
+++ b/numpy/fft/tests/test_helper.py
@@ -30,8 +30,8 @@ class TestFFTShift(TestCase):
assert_array_almost_equal(fft.ifftshift(fft.fftshift(x)), x)
def test_axes_keyword(self):
- freqs = [[ 0, 1, 2], [ 3, 4, -4], [-3, -2, -1]]
- shifted = [[-1, -3, -2], [ 2, 0, 1], [-4, 3, 4]]
+ freqs = [[0, 1, 2], [3, 4, -4], [-3, -2, -1]]
+ shifted = [[-1, -3, -2], [2, 0, 1], [-4, 3, 4]]
assert_array_almost_equal(fft.fftshift(freqs, axes=(0, 1)), shifted)
assert_array_almost_equal(fft.fftshift(freqs, axes=0),
fft.fftshift(freqs, axes=(0,)))
View Lorry Controller Status