Changed normal dict to ordered dict

theano/gof/opt.py

@@ -5,7 +5,7 @@ amount of useful generic optimization tools.
 """
 from __future__ import absolute_import, print_function, division
 
-from collections import deque
+from collections import deque, defaultdict
 import copy
 import inspect
 import logging
@@ -1264,7 +1264,7 @@ class LocalOptGroup(LocalOptimizer):
                                   for opt in optimizers)
 
         self.apply_all_opts = kwargs.pop('apply_all_opts', False)
-        self.track_map = OrderedDict()
+        self.track_map = defaultdict(lambda: [])
         assert len(kwargs) == 0
         self.time_opts = {}
         self.time_nodes = {}
@@ -1281,7 +1281,7 @@ class LocalOptGroup(LocalOptimizer):
             self.node_created.setdefault(o, 0)
 
             for c in o.tracks():
-                self.track_map.setdefault(c, []).append(o)
+                self.track_map[c].append(o)
 
     def __str__(self):
         return getattr(self, '__name__',
@@ -1300,9 +1300,9 @@ class LocalOptGroup(LocalOptimizer):
         if len(self.opts) == 0:
             return
 
-        def apply_mult_opts(node, fgraph=False, multiple_opts=False):
+        def apply_mult_opts(node, fgraph, multiple_opts=False):
             repl = False
-            opts = self.track_map.get(type(node.op), []) + self.track_map.get(node.op, []) + self.track_map.get(None, [])
+            opts = self.track_map[type(node.op)] + self.track_map[node.op] + self.track_map[None]
 
             for opt in opts:
                 opt_start = time.time()
@@ -1323,7 +1323,7 @@ class LocalOptGroup(LocalOptimizer):
                     new_node = repl[0].owner
                     if hasattr(new_node, 'fgraph'):
                         apply_mult_opts(new_node, new_node.fgraph, True)
-                    apply_mult_opts(new_node, False, True)
+                    apply_mult_opts(new_node, fgraph, True)
             return repl
         node_start = time.time()
         new_var = apply_mult_opts(node, node.fgraph, self.apply_all_opts)

theano/gof/optdb.py

@@ -322,7 +322,7 @@ class SequenceDB(DB):
     def register(self, name, obj, position, *tags):
         super(SequenceDB, self).register(name, obj, *tags)
         if position == 'last':
-            self.position[name] = max(self.position.values())
+            self.__position__[name] = max(self.__position__.values())
         else:
             assert isinstance(position, (integer_types, float))
             self.__position__[name] = position