replace toposort with schedule in Linker code

theano/compile/debugmode.py

@@ -1574,7 +1574,7 @@ class _Linker(gof.link.LocalLinker):
         fgraph = self.fgraph
         input_storage_ = input_storage
         output_storage_ = output_storage
-        #order = fgraph.toposort()
+        #order = self.schedule(fgraph)
 
         #Compute a topological ordering that IGNORES the destroy_map of destructive Ops.
         #This will be OK, because every thunk is evaluated on a copy of its input.
@@ -1582,7 +1582,7 @@ class _Linker(gof.link.LocalLinker):
         order_outputs.reverse()
         order = graph.io_toposort(fgraph.inputs, order_outputs)
 
-        active_order = fgraph.toposort()  # an ordering of just the active nodes
+        active_order = self.schedule(fgraph) # an ordering of just the active nodes
         active_order_set = set(active_order)
 
         no_recycling = self.no_recycling

theano/compile/profilemode.py

@@ -538,7 +538,7 @@ class ProfileMode(Mode):
                 items.sort(key=lambda a: a[1])
                 items.reverse()
 
-                order = fgraph.toposort()
+                order = self.linker.schedule(fgraph)
                 computed, last_user = gof.link.gc_helper(order)
                 for node in order:
                     post_thunk_old_storage.append([ input_idx

theano/gof/cc.py

@@ -436,7 +436,7 @@ class CLinker(link.Linker):
         self.temps = list(set(self.variables).difference(
                 self.inputs).difference(self.outputs).difference(self.orphans))
         self.consts = []
-        self.node_order = fgraph.toposort()
+        self.node_order = self.schedule(fgraph)
 
     def code_gen(self):
         """WRITEME
@@ -994,8 +994,7 @@ class CLinker(link.Linker):
                           c_compiler=self.c_compiler(),
                           )
 
-    @staticmethod
-    def cmodule_key_(fgraph, no_recycling, compile_args=None, libraries=None,
+    def cmodule_key_(self, fgraph, no_recycling, compile_args=None, libraries=None,
                      header_dirs=None, insert_config_md5=True, c_compiler=None):
         """
         Do the actual computation of cmodule_key in a static method
@@ -1007,7 +1006,7 @@ class CLinker(link.Linker):
             libraries = []
         if header_dirs is None:
             header_dirs = []
-        order = list(fgraph.toposort())
+        order = self.schedule(fgraph)
         #set of variables that have been computed by nodes we have
         # seen 'so far' in the loop below
         fgraph_computed_set = set()
@@ -1430,7 +1429,7 @@ class OpWiseCLinker(link.LocalLinker):
         try:
 
             fgraph = self.fgraph
-            order = fgraph.toposort()
+            order = self.schedule(fgraph)
             no_recycling = self.no_recycling
 
             input_storage, output_storage, storage_map = link.map_storage(

theano/gof/link.py

@@ -52,6 +52,7 @@ def thunk_hook(type, value, trace):
 sys.excepthook = thunk_hook
 
 
+# TODO: Make this work with linker defined schedule
 def raise_with_op(op, exc_info=None):
     """
     Re-raise an exception while annotating the exception object with
@@ -173,6 +174,8 @@ class Linker(object):
 
         return execute
 
+    def schedule(self, fgraph):
+        return fgraph.toposort()
 
 #TODO: Move this class to the compile module, where it is used (and for which it exists).
 class Container(object):
@@ -414,7 +417,7 @@ class PerformLinker(LocalLinker):
     """WRITEME
 
     Basic L{Linker} subclass that calls the perform method on each L{Op} in
-    the L{FunctionGraph} in the order given by L{FunctionGraph.toposort}.
+    the L{FunctionGraph} in the order given by L{Linker.schedule}.
     """
 
     def __init__(self, allow_gc=True):
@@ -449,7 +452,7 @@ class PerformLinker(LocalLinker):
 
         """
         fgraph = self.fgraph
-        order = list(fgraph.toposort())
+        order = self.schedule(fgraph)
         no_recycling = self.no_recycling
 
         input_storage, output_storage, storage_map = map_storage(fgraph, order, input_storage, output_storage)

theano/gof/vm.py

@@ -780,7 +780,7 @@ class VM_Linker(link.LocalLinker):
                  output_storage=None,
                 ):
         fgraph = self.fgraph
-        order = list(fgraph.toposort())
+        order = self.schedule(fgraph)
         no_recycling = self.no_recycling
 
         input_storage, output_storage, storage_map = link.map_storage(

theano/scan_module/scan_op.py

@@ -184,7 +184,7 @@ class Scan(PureOp):
             tmp_in, tmp_out = scan_utils.reconstruct_graph(self.inputs,
                                                        self.outputs)
             local_fgraph = gof.FunctionGraph(tmp_in, tmp_out)
-            self._cmodule_key = gof.CLinker.cmodule_key_(local_fgraph, [])
+            self._cmodule_key = gof.CLinker().cmodule_key_(local_fgraph, [])
             self._hash_inner_graph = hash(self._cmodule_key)
         else:
             self._hash_inner_graph = self.info['gpu_hash']