dot, gemm, fixing tests

_test_tensor.py

@@ -194,6 +194,7 @@ class T_subtensor(unittest.TestCase):
             t = n[0]
         except ValueError, e:
             self.failUnless(e[0] is Subtensor.e_invalid)
+            return
         self.fail()
     def test1_err_bounds(self):
         n = tinit(numpy.ones(3))
@@ -372,6 +373,7 @@ class T_abs(unittest.TestCase):
             verify_grad(self, T_abs.AbsBadGrad, [numpy.ones(())])
         except Exception, e:
             self.failUnless(str(e) == verify_grad.E_grad, str(e))
+            return
         self.fail()
 
 class T_fill(unittest.TestCase):
@@ -441,6 +443,7 @@ class T_mul(unittest.TestCase):
                     [numpy.ones(3), numpy.ones(4)], 1.0)
         except ValueError, e:
             self.failUnless(e[0] is tensor._assert_same_shapes.E_shape)
+            return
         self.fail()
 
 class T_div(unittest.TestCase):

autotest.py

@@ -4,10 +4,9 @@ def test_root_dir():
     suite = None
     filenames = os.listdir('.')
     for filename in filenames:
-        if filename[-3:] == '.py':
-            modname = filename[:-3]
-            if modname in ['__init__', 'autotest']: continue
+        if filename[-3:] == '.py' and filename[0:5] == '_test':
             #print >>sys.stderr, 'Loading', modname
+            modname = filename[0:-3]
             tests = unittest.TestLoader().loadTestsFromModule(__import__(modname))
             if tests.countTestCases() > 0:
                 print >>sys.stderr, 'Testing', modname

blas.py

 import os, sys
-from gof import PatternOptimizer as pattern_opt, OpSubOptimizer as op_sub
 import scipy.weave as weave
 
 """

opt.py

 
-from core import *
-import gof
-
-from gof import PatternOptimizer as pattern_opt, OpSubOptimizer as op_sub
-
 """
 This variable is used in compile.prog as the optimizer for all programs built
 using either compile.single, compile.to_func, and compile.prog.
 
-"""
 
-def optimizer(lst):
-    begin = gof.SeqOptimizer([])
-    end   = gof.SeqOptimizer([gof.DummyRemover])
-    seq_opt = gof.SeqOptimizer(begin + lst + end)
-    return gof.PythonOpt(gof.MergeOptMerge(seq_opt))
+if 0:
+    def optimizer(lst):
+        begin = gof.SeqOptimizer([])
+        end   = gof.SeqOptimizer([gof.DummyRemover])
+        seq_opt = gof.SeqOptimizer(begin + lst + end)
+        return gof.PythonOpt(gof.MergeOptMerge(seq_opt))
 
 if 0:
     optimizer_begin = gof.SeqOptimizer([opt for name, opt in [
@@ -34,3 +29,4 @@ if 0:
                  (iadd_elemwise, 'y', 'x'))]]])
 #         ['remove_copies',               gof.OpRemover(array_copy)],
 #         [None,                          gof.DummyRemover] # has to be at the end
+"""

sparse.py

@@ -3,13 +3,11 @@ import unittest
 import numpy
 from scipy import sparse
 
-import gof.lib
-import core
-import grad
+import gof
 
 # Wrapper type
 
-class SparseR(core.ResultBase):
+class SparseR(gof.ResultBase):
     """
     Attribute:
     format - a subclass of sparse.spmatrix indicating self.data.__class__