other places

theano/gof/cc.py

@@ -1792,10 +1792,12 @@ class OpWiseCLinker(link.LocalLinker):
                 # There are ops that don't have _op_use_c_code property
                 # for example ifelse (or any ops that come with their own
                 # make_thunk
-                old_value = getattr(node.op, '_op_use_c_code', False)
-                try:
                 if theano.config.cxx:
-                        node.op._op_use_c_code = True
+                    thunks += [node.op.make_c_thunk(node,
+                                                    storage_map,
+                                                    compute_map,
+                                                    no_recycling)]
+                else:
                     thunks += [node.op.make_thunk(node,
                                                   storage_map,
                                                   compute_map,
@@ -1803,9 +1805,6 @@ class OpWiseCLinker(link.LocalLinker):
                 thunks[-1].inputs = [storage_map[v] for v in node.inputs]
                 thunks[-1].outputs = [storage_map[v] for v in node.outputs]
 
-                finally:
-                    node.op._op_use_c_code = old_value
-
             for node in order:
                 if self.allow_gc:
                     post_thunk_old_storage.append(

theano/gof/vm.py

@@ -1044,7 +1044,11 @@ class VM_Linker(link.LocalLinker):
         for node in order:
             try:
                 if self.c_thunks is False:
-                    node.op._op_use_c_code = False
+                    thunks.append(node.op.make_py_thunk(node,
+                                                        storage_map,
+                                                        compute_map,
+                                                        no_recycling))
+                else:
                     thunks.append(node.op.make_thunk(node,
                                                      storage_map,
                                                      compute_map,

theano/tensor/opt.py

@@ -6297,15 +6297,10 @@ def constant_folding(node):
         compute_map[o] = [False]
     if (hasattr(node.op, 'python_constant_folding') and
             node.op.python_constant_folding(node)):
-        old_value = getattr(node.op, '_op_use_c_code', False)
-        try:
-            node.op._op_use_c_code = False
-            thunk = node.op.make_thunk(node,
+        thunk = node.op.make_py_thunk(node,
                                    storage_map,
                                    compute_map,
                                    [])
-        finally:
-            node.op._op_use_c_code = old_value
     else:
         thunk = node.op.make_thunk(node, storage_map, compute_map,
                                    no_recycling=[])