Merge pull request #2905 from nouiz/tests

theano/sandbox/cuda/tests/test_opt.py

@@ -361,7 +361,7 @@ def test_opt_gpujoin_joinvectors_negativeaxes():
         f = theano.function(inputs=[], outputs=t)
         f()
         assert(False)
-    except ValueError:
+    except IndexError:
         assert(True)
 
 

theano/tensor/opt.py

@@ -356,15 +356,25 @@ def register_specialize(lopt, *tags, **kwargs):
 
 
 def register_uncanonicalize(lopt, *tags, **kwargs):
-    name = (kwargs and kwargs.pop('name')) or lopt.__name__
-    compile.optdb['uncanonicalize'].register(name, lopt, 'fast_run', *tags)
-    return lopt
+    if type(lopt) == str:
+        def register(inner_lopt):
+            return register_uncanonicalize(inner_lopt, lopt, *tags, **kwargs)
+        return register
+    else:
+        name = (kwargs and kwargs.pop('name')) or lopt.__name__
+        compile.optdb['uncanonicalize'].register(name, lopt, 'fast_run', *tags)
+        return lopt
 
 
 def register_specialize_device(lopt, *tags, **kwargs):
-    name = (kwargs and kwargs.pop('name')) or lopt.__name__
-    compile.optdb['specialize_device'].register(name, lopt, 'fast_run', *tags)
-    return lopt
+    if type(lopt) == str:
+        def register(inner_lopt):
+            return register_specialize_device(inner_lopt, lopt, *tags, **kwargs)
+        return register
+    else:
+        name = (kwargs and kwargs.pop('name')) or lopt.__name__
+        compile.optdb['specialize_device'].register(name, lopt, 'fast_run', *tags)
+        return lopt
 
 
 # Register merge_optimizer as a global opt during canonicalize
@@ -1240,9 +1250,10 @@ class ShapeOptimizer(Optimizer):
     def apply(self, fgraph):
         pass
 
-# -1 should make it run right before the first merge
+# Register it after merge1 optimization at 0. We don't want to track
+# the shape of merged node.
 theano.compile.mode.optdb.register('ShapeOpt', ShapeOptimizer(),
-                                   -1, 'fast_run', 'fast_compile')
+                                   0.1, 'fast_run', 'fast_compile')
 
 
 @register_specialize