Merged

theano/compile/io.py

@@ -163,7 +163,12 @@ class In(SymbolicInput):
             mutable=None, strict=False, autoname=True,
             implicit=None):
         if implicit is None:
-            implicit = isinstance(value, gof.Container)
+            # TODO Having a default value being a Variable only makes sense
+            # if this is a SharedVariable. This should be changed once shared
+            # variables are part of Theano instead of living in a separate
+            # repository.
+            implicit = (isinstance(value, gof.Container) or
+                    isinstance(value, gof.Variable))
         super(In, self).__init__(variable, name, update, mutable, strict,
                 autoname, implicit = implicit)
         self.value = value

theano/tensor/opt.py

@@ -725,8 +725,14 @@ class Canonizer(gof.LocalOptimizer):
         return getattr(self, 'name', 'Canonizer(%s, %s, %s)' % (self.main, self.inverse, self.reciprocal))
 
 
-def mul_calculate(num, denum, aslist = False):
-    v = reduce(N.multiply, num, 1.0) / reduce(N.multiply, denum, 1.0)
+def mul_calculate(num, denum, aslist=False):
+    if not num and not denum:
+        # Smallest 1 possible.
+        return [] if aslist else N.int8(1)
+    # Make sure we do not accidently upcast data types.
+    first = num[0] if num else denum[0]
+    one = N.asarray(first).dtype.type(1)
+    v = reduce(N.multiply, num, one) / reduce(N.multiply, denum, one)
     if aslist:
         if N.all(v == 1):
             return []