merge

theano/compile/tests/test_debugmode.py

@@ -214,7 +214,7 @@ def test_badoptimization():
                 3,
                 numpy.asarray([[0.,1.,2.],[3.,4.,5.],[6.,7.,8.]]))
     except debugmode.BadOptimization, e:
-        assert str(e.reasons[e.new_r][0][0]) == 'insert_broken_csc'
+        assert str(e.reason) == 'insert_broken_csc'
         return #TEST PASS
 
     assert False

theano/tensor/tests/test_gc.py

@@ -73,7 +73,10 @@ def test_merge_opt_runtime():
         else:
             r = x
     t = time.time()
-    f = theano.function([x], r)
+    f = theano.function([x], r, mode='FAST_COMPILE')
+    # FAST_RUN does in-place optimizer which requires a lot of toposorting, which is actually
+    # pretty slow at the moment.  This test was designed to test MergeOptimizer... so I'm
+    # leaving toposort optimizations for a later date.
     dt = time.time() - t
 
     assert dt < 5.0 #it should never take longer than 5 seconds to compile this graph

theano/tensor/tests/test_opt.py

@@ -13,7 +13,7 @@ from theano import pprint
 import numpy
 #import scalar_opt
 
-from theano.sandbox.debugmode import DebugMode
+from theano.compile.debugmode import DebugMode
 from theano import function