Declare classes outside of test class so the Op can be pickled

theano/gof/tests/test_compute_test_value.py

@@ -14,6 +14,30 @@ from theano.scan_module import scan
 from theano.tensor.basic import _allclose
 
 
+# Used in TestComputeTestValue.test_no_perform
+class IncOneC(Op):
+    """An Op with only a C (c_code) implementation"""
+
+    def __eq__(self, other):
+        return type(self) == type(other)
+
+    def __hash__(self):
+        return hash(type(self))
+
+    def make_node(self, input):
+        input = scalar.as_scalar(input)
+        output = input.type()
+        return Apply(self, [input], [output])
+
+    def c_code_cache_version(self):
+        return (1,)
+
+    def c_code(self, node, name, inputs, outputs, sub):
+        x, = inputs
+        z, = outputs
+        return "%(z)s = %(x)s + 1;" % locals()
+
+
 class TestComputeTestValue(unittest.TestCase):
 
     def test_variable_only(self):
@@ -338,28 +362,6 @@ class TestComputeTestValue(unittest.TestCase):
     def test_no_perform(self):
         if not theano.config.cxx:
             raise SkipTest("G++ not available, so we need to skip this test.")
-        class IncOneC(Op):
-            """An Op with only a C (c_code) implementation"""
-
-            def __eq__(self, other):
-                return type(self) == type(other)
-
-            def __hash__(self):
-                return hash(type(self))
-
-            def make_node(self, input):
-                input = scalar.as_scalar(input)
-                output = input.type()
-                return Apply(self, [input], [output])
-
-            def c_code_cache_version(self):
-                return (1,)
-
-            def c_code(self, node, name, inputs, outputs, sub):
-                x, = inputs
-                z, = outputs
-                return "%(z)s = %(x)s + 1;" % locals()
-
 
         orig_compute_test_value = theano.config.compute_test_value
         try:
@@ -368,6 +370,8 @@ class TestComputeTestValue(unittest.TestCase):
             i = scalar.int32('i')
             i.tag.test_value = 3
 
+            # Class IncOneC is defined outside of the TestComputeTestValue
+            # so it can be pickled and unpickled
             o = IncOneC()(i)
 
             # Check that the perform function is not implemented

theano/tests/test_tutorial.py

@@ -879,15 +879,8 @@ class T_using_gpu(unittest.TestCase):
                                   for x in f.maker.fgraph.toposort()])
 
 
-class T_fibby(unittest.TestCase):
-    ## All tests here belong to
-    ## http://deeplearning.net/software/theano/extending/fibby.html
-    ## Theano/doc/extending/fibby.txt
-    ## Any change you do here also add it to the tutorial !
-
-    def test_fibby_1(self):
-
-        class Fibby(theano.Op):
+# Used in T_fibby
+class Fibby(theano.Op):
 
     """
     An arbitrarily generalized Fibbonacci sequence
@@ -935,6 +928,17 @@ class T_fibby(unittest.TestCase):
     def c_code_cache_version(self):
         return (1,)
 
+
+class T_fibby(unittest.TestCase):
+    ## All tests here belong to
+    ## http://deeplearning.net/software/theano/extending/fibby.html
+    ## Theano/doc/extending/fibby.txt
+    ## Any change you do here also add it to the tutorial !
+
+    def test_fibby_1(self):
+
+        # The definition of class Fibby is done outside of the test,
+        # so the object can be pickled.
         fibby = Fibby()
 
         from theano.tensor.opt import (get_scalar_constant_value,