made Features use OrderedDicts

theano/gof/link.py

@@ -518,7 +518,8 @@ def add_clear_storage(f, computed, storage_map):
 
 
 class WrapLinker(Linker):
-    """ WRITEME
+    """
+    WRITEME
     This class makes it easier to run several L{LocalLinker}s in parallel, and
     offers some control over how each thunk is run.
 
@@ -643,10 +644,12 @@ class WrapLinker(Linker):
                     raise_with_op(node)
         f.thunk_groups = thunk_groups
 
+        print 'WrapLinker make_thunk returning: ',id(f)
         return f, inputs0, outputs0
 
 def WrapLinkerMany(linkers, wrappers):
-    """ Variant on WrapLinker that runs a series of wrapper functions instead of
+    """
+    Variant on WrapLinker that runs a series of wrapper functions instead of
     just one.
     """
     def wrapper(*args):

theano/gof/toolbox.py

@@ -2,10 +2,12 @@ import sys
 import time
 
 from theano.gof.python25 import partial
+from theano.gof.python25 import OrderedDict
 
 import graph
 
 
+
 class AlreadyThere(Exception):
     """Raised by a Feature's on_attach callback method if the FunctionGraph
     attempting to attach the feature already has a functionally identical
@@ -89,7 +91,7 @@ class Feature(object):
         If you raise an exception in this function, the state of the graph
         might be broken for all intents and purposes.
         """
-        return {}
+        return OrderedDict()
 
 
 class Bookkeeper(Feature):

theano/gof/vm.py

 """
 VMs that run Theano graph computations.
 A VM is not actually different from a Linker, we just decided
-VM was a better name at some point
+VM was a better name at some point.
 """
 import link
 import logging