moved new fft tests to the right file.

theano/tensor/fourier.py

@@ -3,7 +3,6 @@ import numpy
 import math
 from theano import gof, tensor, function, scalar
 from theano.sandbox.linalg.ops import diag
-from theano.tests import unittest_tools as utt
 
 
 class Fourier(gof.Op):
@@ -150,74 +149,3 @@ class Fourier(gof.Op):
 
 
 fft = Fourier()
-
-
-import numpy
-from theano import tensor, function, scalar
-from theano.sandbox.linalg.ops import diag
-from theano.tests import unittest_tools as utt
-#from theano import Fourier fft
-
-
-class TestFourier(utt.InferShapeTester):
-
-    rng = numpy.random.RandomState(43)
-
-    def setUp(self):
-        super(TestFourier, self).setUp()
-        self.op_class = Fourier
-        self.op = fft
-
-    def test_perform(self):
-        a = tensor.dmatrix()
-        f = function([a], self.op(a, n=10, axis=0))
-        a = numpy.random.rand(8, 6)
-        assert numpy.allclose(f(a), numpy.fft.fft(a, 10, 0))
-
-    def test_infer_shape(self):
-        a = tensor.dvector()
-        self._compile_and_check([a], [self.op(a, 16, 0)],
-                                [numpy.random.rand(12)],
-                               self.op_class)
-        a = tensor.dmatrix()
-        for var in [self.op(a, 16, 1), self.op(a, None, 1),
-                     self.op(a, 16, None), self.op(a, None, None)]:
-            self._compile_and_check([a], [var],
-                                    [numpy.random.rand(12, 4)],
-                                    self.op_class)
-        b = tensor.iscalar()
-        for var in [self.op(a, 16, b), self.op(a, None, b)]:
-            self._compile_and_check([a, b], [var],
-                                    [numpy.random.rand(12, 4), 0],
-                                    self.op_class)
-
-    def test_gradient(self):
-        def fft_test1(a):
-            return self.op(a, None, None)
-
-        def fft_test2(a):
-            return self.op(a, None, 0)
-
-        def fft_test3(a):
-            return self.op(a, 4, None)
-
-        def fft_test4(a):
-            return self.op(a, 4, 0)
-
-        pts = [numpy.random.rand(5, 2, 4, 3),
-               numpy.random.rand(2, 3, 4),
-               numpy.random.rand(2, 5),
-               numpy.random.rand(5)]
-        for fft_test in [fft_test1, fft_test2, fft_test3, fft_test4]:
-            for pt in pts:
-                theano.gradient.verify_grad(fft_test, [pt],
-                                            n_tests=1, rng=TestFourier.rng,
-                                            out_type='complex64')
-
-
-if __name__ == "__main__":
-    t = TestFourier('setUp')
-    t.setUp()
-    t.test_perform()
-    t.test_infer_shape()
-    t.test_gradient()

theano/tensor/tests/test_fourier.py

+import numpy
+import theano
+from theano import tensor
+from theano.tests import unittest_tools as utt
+from theano.tensor.fourier import Fourier, fft
+
+
+class TestFourier(utt.InferShapeTester):
+
+    rng = numpy.random.RandomState(43)
+
+    def setUp(self):
+        super(TestFourier, self).setUp()
+        self.op_class = Fourier
+        self.op = fft
+
+    def test_perform(self):
+        a = tensor.dmatrix()
+        f = theano.function([a], self.op(a, n=10, axis=0))
+        a = numpy.random.rand(8, 6)
+        assert numpy.allclose(f(a), numpy.fft.fft(a, 10, 0))
+
+    def test_infer_shape(self):
+        a = tensor.dvector()
+        self._compile_and_check([a], [self.op(a, 16, 0)],
+                                [numpy.random.rand(12)],
+                               self.op_class)
+        a = tensor.dmatrix()
+        for var in [self.op(a, 16, 1), self.op(a, None, 1),
+                     self.op(a, 16, None), self.op(a, None, None)]:
+            self._compile_and_check([a], [var],
+                                    [numpy.random.rand(12, 4)],
+                                    self.op_class)
+        b = tensor.iscalar()
+        for var in [self.op(a, 16, b), self.op(a, None, b)]:
+            self._compile_and_check([a, b], [var],
+                                    [numpy.random.rand(12, 4), 0],
+                                    self.op_class)
+
+    def test_gradient(self):
+        def fft_test1(a):
+            return self.op(a, None, None)
+
+        def fft_test2(a):
+            return self.op(a, None, 0)
+
+        def fft_test3(a):
+            return self.op(a, 4, None)
+
+        def fft_test4(a):
+            return self.op(a, 4, 0)
+
+        pts = [numpy.random.rand(5, 2, 4, 3),
+               numpy.random.rand(2, 3, 4),
+               numpy.random.rand(2, 5),
+               numpy.random.rand(5)]
+        for fft_test in [fft_test1, fft_test2, fft_test3, fft_test4]:
+            for pt in pts:
+                theano.gradient.verify_grad(fft_test, [pt],
+                                            n_tests=1, rng=TestFourier.rng,
+                                            out_type='complex64')
+
+
+if __name__ == "__main__":
+    t = TestFourier('setUp')
+    t.setUp()
+    t.test_perform()
+    t.test_infer_shape()
+    t.test_gradient()