Moved everything into function.py. Added sorting on output variables.

theano/compile/dictionaryOutputWrapper.py

-'''
-Generates a wrapper around theano functions that allows the user to receive outputs in a dictionary.  
-'''
-
-def createFunctionReturningDictionary(args, kwargs, fn, keys):
-
-    outputLst = fn(*args, **kwargs)
-
-    outputDict = {}
-
-    for i in range(0, len(keys)):
-        outputDict[keys[i]] = outputLst[i]
-
-    return outputDict
-
-

theano/compile/function.py

@@ -17,7 +17,6 @@ import warnings
 from theano import gof
 from theano import compat
 
-from theano.compile.dictionaryOutputWrapper import createFunctionReturningDictionary
 
 def function_dump(filename, inputs, outputs=None, mode=None, updates=None,
                   givens=None,
@@ -38,6 +37,18 @@ def function_dump(filename, inputs, outputs=None, mode=None, updates=None,
     with open(filename, 'wb') as f:
         cPickle.dump(d, f, -1)
 
+def output_dictionary_wrapper(args, kwargs, fn, keys):
+
+    outputLst = fn(*args, **kwargs)
+
+    outputDict = {}
+
+    for i in range(0, len(keys)):
+        outputDict[keys[i]] = outputLst[i]
+
+    return outputDict
+
+
 
 def function(inputs, outputs=None, mode=None, updates=None, givens=None,
              no_default_updates=False, accept_inplace=False, name=None,
@@ -189,8 +200,17 @@ def function(inputs, outputs=None, mode=None, updates=None, givens=None,
 
     if type(outputs) is dict:
         outputsDictFormat = True
-        outputKeys = outputs.keys()
-        outputs = outputs.values()
+        outputItems = outputs.items()
+
+        outputItemsSorted = sorted(outputItems, key = lambda x: x[0])
+
+        outputKeys = []
+        outputs = []
+        for pair in outputItemsSorted: 
+            outputKeys.append(pair[0])
+            outputs.append(pair[1])
+
+
     else:
         outputsDictFormat = False
 
@@ -280,7 +300,7 @@ def function(inputs, outputs=None, mode=None, updates=None, givens=None,
 
     if outputsDictFormat:
 
-        fnDictOutput = (lambda *args, **kwargs: createFunctionReturningDictionary(args, kwargs, fn = fn, keys = outputKeys))
+        fnDictOutput = (lambda *args, **kwargs: output_dictionary_wrapper(args, kwargs, fn = fn, keys = outputKeys))
 
         return fnDictOutput