Merge pull request #1718 from nouiz/pickle_eval

theano/compile/function_module.py

@@ -709,6 +709,8 @@ def _pickle_Function(f):
     return rval
 
 def _constructor_Function(maker, input_storage, inputs_data):
+    if not theano.config.unpickle_function:
+        return None
     f = maker.create(input_storage, trustme = True)
     assert len(f.input_storage) == len(inputs_data)
     for container, x in zip(f.input_storage, inputs_data):
@@ -1204,7 +1206,10 @@ def _pickle_FunctionMaker(self):
 
 
 def _constructor_FunctionMaker(kwargs):
+    if theano.config.unpickle_function:
         return FunctionMaker(**kwargs)
+    else:
+        return None
 
 copy_reg.pickle(FunctionMaker, _pickle_FunctionMaker)
 

theano/configdefaults.py

@@ -410,6 +410,13 @@ AddConfigVar('compute_test_value_opt',
              EnumStr('off', 'ignore', 'warn', 'raise', 'pdb'),
              in_c_key=False)
 
+AddConfigVar('unpickle_function',
+             ("Replace unpickled Theano function with None",
+              "This is useful to unpickle old graph that pickled"
+              " them when it shouldn't"),
+             BoolParam(True),
+             in_c_key=False)
+
 """Note to developers:
     Generally your exceptions should use an apply node's __str__
     method when exception_verbosity == 'low'. When exception_verbosity

theano/gof/graph.py

@@ -424,6 +424,10 @@ class Variable(Node):
 
         return rval
 
+    def __getstate__(self):
+        d = self.__dict__.copy()
+        d.pop("_fn", None)
+        return d
     env = property(env_getter, env_setter, env_deleter)
 
 

theano/gof/tests/test_graph.py

+import pickle
 import unittest
 
 from theano import tensor
@@ -292,7 +293,6 @@ class TestIsSameGraph(unittest.TestCase):
             debug=False)
 
 
-
 ################
 # eval         #
 ################
@@ -305,3 +305,6 @@ def test_eval():
     result = z.eval({x : 1., y : 2.})
 
     assert result == 3.
+
+    # We don't want to pickle the tmp function.
+    assert not hasattr(pickle.loads(pickle.dumps(z)), '_fn')