merge

theano/compile/profilemode.py

@@ -411,7 +411,10 @@ class ProfileMode(Mode):
                     apply_time, op_cimpl, message, outputs_size,
                     other_time)
 
-        if outputs_size:
+        if not outputs_size:
+            print """\nProfile of Theano intermediate memory disabled.
+ To enabled, put the Theano flag ProfileMode.profile_memory to True."""
+        else:
             fct_memory={}#env->dict(node->(outputs size))
             var_mem = {}
             for node,val in outputs_size.items():
@@ -421,6 +424,7 @@ class ProfileMode(Mode):
                     var_mem[out]=v
             print
             print "Profile of Theano functions memory:"
+            print "(This check only the output of each apply node. It don't check the temporary memory used by the op in the apply node.)"
             nb_skipped = 0
             for env,nodes_mem in fct_memory.iteritems():
                 size_sum=sum([sum(val) for key,val in nodes_mem.iteritems()])

theano/misc/do_nightly_build

@@ -10,7 +10,10 @@ ls ${COMPILEDIR}|wc -l
 FLAGS=warn.argmax_pushdown_bug=False,warn.gpusum_01_011_0111_bug=False,warn.sum_sum_bug=False,warn.sum_div_dimshuffle_bug=False,compiledir=${COMPILEDIR}
 export PYTHONPATH=${ROOT_CWD}:$PYTHONPATH
 
-cd ${ROOT_CWD}
+cd ${ROOT_CWD}/Theano
+hg summary
+cd ..
+
 echo "executing nosetests with mode=FAST_COMPILE"
 THEANO_FLAGS=${FLAGS},mode=FAST_COMPILE ${NOSETESTS} Theano
 echo "nb element in the compiledir:"

theano/scalar/basic.py

@@ -1126,26 +1126,23 @@ int_div = IntDiv(upcast_out, name = 'int_div')
 floor_div = int_div
 
 
-def raise_complex_error():
-    raise ComplexError(
-                "Theano does not support the mod operator (%) on "
-                "complex numbers, since numpy deprecated it.")
-
-
 def mod_check(x, y):
     if (as_scalar(x).type in complex_types or
         as_scalar(y).type in complex_types):
         # Currently forbidden.
-        raise_complex_error()
+        raise Mod.complex_error
     else:
         return mod(x, y)
 
 
 class Mod(BinaryScalarOp):
+    complex_error = ComplexError(
+                "Theano does not support the mod operator (%) on "
+                "complex numbers, since numpy deprecated it.")
 
     def impl(self, x, y):
         if isinstance(x, numpy.complex) or isinstance(y, numpy.complex):
-            raise_complex_error()
+            raise self.complex_error
         return x % y
 
     def c_code_cache_version(self):
@@ -1184,7 +1181,7 @@ class Mod(BinaryScalarOp):
             x_mod_ypm = "fmod(%(x)s,-%(y)s)"%locals()
             x_mod_ymp = "fmod(-%(x)s,%(y)s)"%locals()
         elif str(t) in imap(str, complex_types):
-            raise_complex_error()
+            raise self.complex_error
         else:
             raise NotImplementedError('type not supported', type)