Automated merge with ssh://projects@lgcm.iro.umontreal.ca/hg/theano

theano/compile/module.py

@@ -394,10 +394,13 @@ class Method(Component):
         for input in gof.graph.inputs((list(outputs) if isinstance(outputs, (list, tuple)) else [outputs])
                                       + [x.update for x in inputs if getattr(x, 'update', False)],
                                       blockers = _inputs):
-            if input not in _inputs and not isinstance(input, gof.Value):
+            if input not in _inputs:
                 # Add this input to the inputs; we require that storage already exists for them,
                 # but otherwise they are immutable.
-                storage = get_storage(input, not allocate_all)
+                if isinstance(input, gof.Value):
+                    storage = get_storage(input)
+                else:
+                    storage = get_storage(input, not allocate_all)
                 inputs.append(storage)
 
         return F.function(inputs, outputs, mode)

theano/tensor/opt.py

@@ -575,7 +575,7 @@ local_mul_canonizer = Canonizer(T.mul, T.div, T.inv, mul_calculate, False)
 @gof.local_optimizer([T.neg])
 def local_neg_to_mul(node):
     if node.op == T.neg:
-        return [-1 * node.inputs[0]]
+        return [T.mul(-1, node.inputs[0])]
     else:
         return False
 register_canonicalize(local_neg_to_mul)