fixed autotests for the new module hierarchy

autotest.py

@@ -47,9 +47,13 @@ if __name__ == '__main__':
     elif len(sys.argv)>2:
         printUsage()
 
-    try:
-        os.system('cd gof; %s autotest.py %s' % (sys.argv[1],debugparam))
-    except IndexError, e:
-        os.system('cd gof; python autotest.py %s' % debugparam)
+    if len(sys.argv) >= 2:
+        cmd = sys.argv[1]
+    else:
+        cmd = 'python'
+
+    for dir in 'gof compile scalar tensor sparse'.split():
+        os.system('cd %s; %s autotest.py %s' % (dir, cmd, debugparam))
     test_root_dir(debugparam!="")
 
+

compile/__init__.py

 
-#import function
+import function_module
 
-from function import *
+from function_module import *

compile/_test_function.py

 import unittest
 import gof, gof.opt
 
-import compile
-from compile import *
-from scalar import *
-import tensor
+from theano import compile
+from theano.compile.function_module import *
+from theano.scalar import *
+
+from theano import tensor
+from theano import tensor as T
+import random
+import numpy as N
 
 
 PatternOptimizer = lambda p1, p2, ign=True: gof.OpKeyOptimizer(gof.PatternSub(p1, p2), ignore_newtrees=ign)
@@ -142,9 +146,6 @@ def checkfor(testcase, fn, E):
 #         assert compile._fcache[(e, )]() == 14.0
 
 
-import tensor as T
-import random
-import numpy as N
 
 class T_OpFromGraph(unittest.TestCase):
 

compile/autotest.py

+import unittest, os, sys, traceback
+
+if __name__ == '__main__':
+    def printUsage():
+        print >>sys.stderr, "Bad argument: ",sys.argv
+        print >>sys.stderr, "only --debug is supported"
+        sys.exit(1)
+    debugparam=""
+
+    if len(sys.argv)==2:
+        if sys.argv[1]=="--debug":
+            debugparam="--debug"
+            sys.argv.remove(debugparam)
+        else:
+            printUsage()
+    elif len(sys.argv)>2:
+        printUsage()
+
+
+
+    suite = None
+    filenames = os.listdir('.')
+    for filename in filenames:
+        if filename[-3:] == '.py':
+            modname = filename[:-3]
+            if modname in ['__init__', 'autotest']: continue
+            #print >>sys.stderr, 'Loading', modname
+
+            try:
+                module = __import__(modname)
+            except Exception, e:
+                if 'relative import' not in e.message:
+                    print >>sys.stderr, "===================================================="
+                    print >>sys.stderr, "Failed to load module %s" % modname
+                    print >>sys.stderr, "===================================================="
+                    traceback.print_exc()
+                    print >>sys.stderr, "===================================================="
+                continue
+                
+            tests = unittest.TestLoader().loadTestsFromModule(module)
+            if tests.countTestCases() > 0:
+                print >>sys.stderr, 'Testing', modname
+                if suite is None:
+                    suite = tests
+                else:
+                    suite.addTests(tests)
+    if debugparam:
+        suite.debug()
+    else:
+        unittest.TextTestRunner(verbosity=1).run(suite)
+

compile/function.py → compile/function_module.py

@@ -882,7 +882,7 @@ class OpFromGraph(gof.Op):
         self.input_types = [input.type for input in inputs]
         self.output_types = [output.type for output in outputs]
         if grad_depth > 0:
-            import gradient as G
+            from theano import gradient as G
             output_grads = [t() for t in self.output_types]
             gd = G.grad_sources_inputs(zip(self.outputs, output_grads), self.inputs)
             gs = map(gd.get, self.inputs)

scalar/_test_basic.py

 
 import unittest
 
-from ..gof import Result, Op, Env
-from .. import gof
+from theano.gof import Result, Op, Env
+from theano import gof
 
-from basic import *
+from theano.scalar.basic import *
 
 
 def inputs():

scalar/autotest.py

+import unittest, os, sys, traceback
+
+if __name__ == '__main__':
+    def printUsage():
+        print >>sys.stderr, "Bad argument: ",sys.argv
+        print >>sys.stderr, "only --debug is supported"
+        sys.exit(1)
+    debugparam=""
+
+    if len(sys.argv)==2:
+        if sys.argv[1]=="--debug":
+            debugparam="--debug"
+            sys.argv.remove(debugparam)
+        else:
+            printUsage()
+    elif len(sys.argv)>2:
+        printUsage()
+
+
+
+    suite = None
+    filenames = os.listdir('.')
+    for filename in filenames:
+        if filename[-3:] == '.py':
+            modname = filename[:-3]
+            if modname in ['__init__', 'autotest']: continue
+            #print >>sys.stderr, 'Loading', modname
+
+            try:
+                module = __import__(modname)
+            except Exception, e:
+                if 'relative import' not in e.message:
+                    print >>sys.stderr, "===================================================="
+                    print >>sys.stderr, "Failed to load module %s" % modname
+                    print >>sys.stderr, "===================================================="
+                    traceback.print_exc()
+                    print >>sys.stderr, "===================================================="
+                continue
+                
+            tests = unittest.TestLoader().loadTestsFromModule(module)
+            if tests.countTestCases() > 0:
+                print >>sys.stderr, 'Testing', modname
+                if suite is None:
+                    suite = tests
+                else:
+                    suite.addTests(tests)
+    if debugparam:
+        suite.debug()
+    else:
+        unittest.TextTestRunner(verbosity=1).run(suite)
+

sparse/_test_basic.py

-from sparse import *
+from theano.sparse import *
 
 import unittest
-from .. import compile
-from .. import gradient
+from theano import compile
+from theano import gradient
 
-from basic import _is_dense, _is_sparse, _is_dense_result, _is_sparse_result
-from basic import _mtypes, _mtype_to_str
+from theano.sparse.basic import _is_dense, _is_sparse, _is_dense_result, _is_sparse_result
+from theano.sparse.basic import _mtypes, _mtype_to_str
 
 import random
-from .. import gof
+from theano import gof
 
 def eval_outputs(outputs):
     return compile.function([], outputs)()[0]

sparse/autotest.py

+import unittest, os, sys, traceback
+
+if __name__ == '__main__':
+    def printUsage():
+        print >>sys.stderr, "Bad argument: ",sys.argv
+        print >>sys.stderr, "only --debug is supported"
+        sys.exit(1)
+    debugparam=""
+
+    if len(sys.argv)==2:
+        if sys.argv[1]=="--debug":
+            debugparam="--debug"
+            sys.argv.remove(debugparam)
+        else:
+            printUsage()
+    elif len(sys.argv)>2:
+        printUsage()
+
+
+
+    suite = None
+    filenames = os.listdir('.')
+    for filename in filenames:
+        if filename[-3:] == '.py':
+            modname = filename[:-3]
+            if modname in ['__init__', 'autotest']: continue
+            #print >>sys.stderr, 'Loading', modname
+
+            try:
+                module = __import__(modname)
+            except Exception, e:
+                if 'relative import' not in e.message:
+                    print >>sys.stderr, "===================================================="
+                    print >>sys.stderr, "Failed to load module %s" % modname
+                    print >>sys.stderr, "===================================================="
+                    traceback.print_exc()
+                    print >>sys.stderr, "===================================================="
+                continue
+                
+            tests = unittest.TestLoader().loadTestsFromModule(module)
+            if tests.countTestCases() > 0:
+                print >>sys.stderr, 'Testing', modname
+                if suite is None:
+                    suite = tests
+                else:
+                    suite.addTests(tests)
+    if debugparam:
+        suite.debug()
+    else:
+        unittest.TextTestRunner(verbosity=1).run(suite)
+

tensor/_test_basic.py

 import traceback
 import operator
 
-from tensor import *
-import tensor # for hidden symbols
+from theano.tensor import *
+from theano.tensor import basic as tensor # for hidden symbols
 
 import unittest
 from copy import copy
-import compile
-import gradient
+from theano import compile
+from theano import gradient
 import gof, gof.graph
-from gof.python25 import any
-import gof
-from gof.utils import AbstractFunctionError
-import tensor_opt
+from theano.gof.python25 import any
+from theano import gof
+from theano.gof.utils import AbstractFunctionError
 
-from elemwise import DimShuffle
+from theano.tensor.elemwise import DimShuffle
 
 default_mode = compile.Mode(optimizer = None,
                             linker = 'c&py')

tensor/_test_elemwise.py

@@ -2,13 +2,13 @@
 import time
 import unittest
 
-from gof import Result, Op
-import gof
+from theano.gof import Result, Op
+from theano import gof
 
-from scalar import *
+from theano.scalar import *
 
-import tensor
-from elemwise import *
+from theano import tensor
+from theano.tensor.elemwise import *
 
 
 def Env(i, o):

tensor/_test_opt.py

@@ -4,11 +4,11 @@
 import unittest
 
 import gof
-from tensor_opt import *
-import tensor
-from tensor import Tensor
-from gof import Env
-from elemwise import DimShuffle
+from theano.tensor.opt import *
+from theano import tensor
+from theano.tensor import Tensor
+from theano.gof import Env
+from theano.tensor.elemwise import DimShuffle
 import numpy
 #import scalar_opt
 
@@ -98,7 +98,7 @@ class _test_dimshuffle_lift(unittest.TestCase):
 
 
 
-from tensor import *
+from theano.tensor import *
 
 #from sandbox import pprint
 

tensor/_test_raw_random.py

@@ -2,9 +2,9 @@
 
 import unittest
 
-from tensor_random import *
+from theano.tensor.raw_random import *
 
-import compile
+from theano import compile
 
 def Uniform(s, n):
     return NumpyGenerator(s, n, numpy.random.RandomState.uniform)

tensor/autotest.py

+import unittest, os, sys, traceback
+
+if __name__ == '__main__':
+    def printUsage():
+        print >>sys.stderr, "Bad argument: ",sys.argv
+        print >>sys.stderr, "only --debug is supported"
+        sys.exit(1)
+    debugparam=""
+
+    if len(sys.argv)==2:
+        if sys.argv[1]=="--debug":
+            debugparam="--debug"
+            sys.argv.remove(debugparam)
+        else:
+            printUsage()
+    elif len(sys.argv)>2:
+        printUsage()
+
+
+
+    suite = None
+    filenames = os.listdir('.')
+    for filename in filenames:
+        if filename[-3:] == '.py':
+            modname = filename[:-3]
+            if modname in ['__init__', 'autotest']: continue
+            #print >>sys.stderr, 'Loading', modname
+
+            try:
+                module = __import__(modname)
+            except Exception, e:
+                if 'relative import' not in e.message:
+                    print >>sys.stderr, "===================================================="
+                    print >>sys.stderr, "Failed to load module %s" % modname
+                    print >>sys.stderr, "===================================================="
+                    traceback.print_exc()
+                    print >>sys.stderr, "===================================================="
+                continue
+                
+            tests = unittest.TestLoader().loadTestsFromModule(module)
+            if tests.countTestCases() > 0:
+                print >>sys.stderr, 'Testing', modname
+                if suite is None:
+                    suite = tests
+                else:
+                    suite.addTests(tests)
+    if debugparam:
+        suite.debug()
+    else:
+        unittest.TextTestRunner(verbosity=1).run(suite)
+