reasons are being passed around during optimization... with an ugly hack to env.execute_callback

theano/gof/env.py

@@ -297,10 +297,7 @@ class Env(utils.object2):
         self.__import_r__([new_r])
         self.__add_clients__(new_r, [(node, i)])
         prune = self.__remove_clients__(r, [(node, i)], False)
-        if reason is None:
-            self.execute_callbacks('on_change_input', node, i, r, new_r)
-        else:
-            self.execute_callbacks('on_change_input_with_reason', node, i, r, new_r, reason)
+        self.execute_callbacks('on_change_input', node, i, r, new_r, reason=reason)
 
         if prune:
             self.__prune_r__([r])
@@ -367,7 +364,7 @@ class Env(utils.object2):
 
     ### callback utils ###
     
-    def execute_callbacks(self, name, *args):
+    def execute_callbacks(self, name, *args, **kwargs):
         """WRITEME
         Calls
           getattr(feature, name)(*args)
@@ -378,7 +375,16 @@ class Env(utils.object2):
                 fn = getattr(feature, name)
             except AttributeError:
                 continue
-            fn(self, *args)
+
+            #####HORRIBLE OPTIONAL ARGUMENT HACK
+            try:
+                fn(self, *args, **kwargs)
+            except TypeError, e:
+                if str(e) == "on_change_input() got an unexpected keyword argument 'reason'" and len(kwargs) == 1:
+                    fn(self, *args)
+                else:
+                    raise
+
 
     def collect_callbacks(self, name, *args):
         """WRITEME

theano/gof/opt.py

@@ -189,7 +189,7 @@ class MergeOptimizer(Optimizer):
                 # we adopt convention to keep the last name
                 if c.name:  
                     other_c.name = c.name
-                env.replace_validate(c, other_c)
+                env.replace_validate(c, other_c, reason='Constant Merge')
             else:
                 #this is a new constant
                 const_sig[c] = sig
@@ -219,7 +219,7 @@ class MergeOptimizer(Optimizer):
                     if output.name and not new_output.name:
                         new_output.name = output.name
                 try:
-                    env.replace_all_validate(pairs)
+                    env.replace_all_validate(pairs, reason='Merge (exptime)')
                 except InconsistencyError, e:
                     success = False
             if not success:
@@ -266,7 +266,7 @@ class MergeOptimizer(Optimizer):
                         if node_output.name:
                             cand_output.name = node_output.name
                     try:
-                        env.replace_all_validate(pairs)
+                        env.replace_all_validate(pairs, reason="Merge")
                     except InconsistencyError, e:
                         success = False
 
@@ -714,7 +714,7 @@ class NavigatorOptimizer(Optimizer):
             return False
         repl_pairs = zip(node.outputs, replacements)
         try:
-            env.replace_all_validate(repl_pairs)
+            env.replace_all_validate(repl_pairs, reason=lopt)
             return True
         except Exception, e:
             # This means the replacements were rejected by the env.

theano/gof/toolbox.py

@@ -36,11 +36,11 @@ class History:
         del env.revert
         del self.history[env]
 
-    def on_change_input(self, env, node, i, r, new_r):
+    def on_change_input(self, env, node, i, r, new_r, reason=None):
         if self.history[env] is None:
             return
         h = self.history[env]
-        h.append(lambda: env.change_input(node, i, r))
+        h.append(lambda: env.change_input(node, i, r, reason=("Revert", reason)))
     
     def revert(self, env, checkpoint):
         """
@@ -92,14 +92,14 @@ class ReplaceValidate(History, Validator):
         del env.replace_validate
         del env.replace_all_validate
 
-    def replace_validate(self, env, r, new_r):
-        self.replace_all_validate(env, [(r, new_r)])
+    def replace_validate(self, env, r, new_r, reason=None):
+        self.replace_all_validate(env, [(r, new_r)], reason=reason)
 
-    def replace_all_validate(self, env, replacements):
+    def replace_all_validate(self, env, replacements, reason=None):
         chk = env.checkpoint()
         for r, new_r in replacements:
             try:
-                env.replace(r, new_r)
+                env.replace(r, new_r, reason=reason)
             except Exception, e:
                 if 'The type of the replacement must be the same' not in str(e) and 'does not belong to this Env' not in str(e):
                     print >>sys.stderr, "<<!! BUG IN ENV.REPLACE OR A LISTENER !!>>", type(e), e

theano/tensor/opt.py

@@ -64,7 +64,8 @@ def insert_inplace_optimizer(env):
                                 *[inplace_pattern.get(i, None) \
                                         for i in xrange(len(node.outputs))])),
                         inplace_pattern).make_node(*node.inputs)
-                    env.replace_all_validate(zip(node.outputs, new.outputs))
+                    env.replace_all_validate(zip(node.outputs, new.outputs),
+                            reason="insert_inplace_optimizer")
                 except (ValueError, TypeError, InconsistencyError), e:
                     continue
                 candidate_inputs.remove(candidate_input)