merge

theano/__init__.py

@@ -25,6 +25,13 @@ To learn more, check out:
 
 __docformat__ = "restructuredtext en"
 
+# Set a default logger. It is important to do this before importing some other
+# theano code, since this code may want to log some messages.
+import logging
+logging_default_handler = logging.StreamHandler()
+logging.getLogger("theano").addHandler(logging_default_handler)
+logging.getLogger("theano").setLevel(logging.WARNING)
+
 import configparser, configdefaults
 
 config = configparser.TheanoConfigParser()
@@ -159,12 +166,3 @@ def dot(l, r):
     return rval
 
 
-### 
-#   Set a default logger
-#
-import logging
-logging_default_handler = logging.StreamHandler()
-logging.getLogger("theano").addHandler(logging_default_handler)
-logging.getLogger("theano").setLevel(logging.WARNING)
-
-

theano/tensor/opt.py

@@ -624,7 +624,7 @@ def local_upcast_elemwise_constant_inputs(node):
     if isinstance(node.op, T.Elemwise):
         scalar_op = node.op.scalar_op
         #print "aa", scalar_op.output_types_preference
-        if scalar_op.output_types_preference in (T.scal.upgrade_to_float, T.scal.upcast_out):
+        if getattr(scalar_op,'output_types_preference',None) in (T.scal.upgrade_to_float, T.scal.upcast_out):
             # this is the kind of op that we can screw with the input dtypes by upcasting
             # explicitly
             #print "HELLO??"