minor changes

doc/faq.txt

@@ -4,7 +4,6 @@
 ==========================
 Frequently Asked Questions
 ==========================
-3B
 TypeError: object of type 'TensorVariable' has no len()
 -------------------------------------------------------
 

theano/compile/function_module.py

@@ -1239,24 +1239,25 @@ class FunctionMaker(object):
         add_stack_trace_on_call_orig = gof.Op.add_stack_trace_on_call
         
         if need_opt:
-            # optimize the fgraph
-            theano.config.compute_test_value = theano.config.compute_test_value_opt
-            gof.Op.add_stack_trace_on_call = False
-            start_optimizer = time.time()
-            optimizer_profile = optimizer(fgraph)
-            end_optimizer = time.time()
-            opt_time = end_optimizer - start_optimizer
-            if profile:
-                profile.optimizer_time += opt_time
-                if theano.config.profile_optimizer:
-                    profile.optimizer_profile = (optimizer, optimizer_profile)
-            _logger.debug('Optimizing took %f seconds', opt_time)
-
-            #Add deep copy to respect the memory interface
-            insert_deepcopy(fgraph, inputs, outputs + additional_outputs)
-        # fgraph is already optimized
-        theano.config.compute_test_value = compute_test_value_orig
-        gof.Op.add_stack_trace_on_call = add_stack_trace_on_call_orig
+            try:
+                # optimize the fgraph
+                theano.config.compute_test_value = theano.config.compute_test_value_opt
+                gof.Op.add_stack_trace_on_call = False
+                start_optimizer = time.time()
+                optimizer_profile = optimizer(fgraph)
+                end_optimizer = time.time()
+                opt_time = end_optimizer - start_optimizer
+                if profile:
+                    profile.optimizer_time += opt_time
+                    if theano.config.profile_optimizer:
+                        profile.optimizer_profile = (optimizer, optimizer_profile)
+                _logger.debug('Optimizing took %f seconds', opt_time)
+
+                #Add deep copy to respect the memory interface
+                insert_deepcopy(fgraph, inputs, outputs + additional_outputs)
+            finally:
+                theano.config.compute_test_value = compute_test_value_orig
+                gof.Op.add_stack_trace_on_call = add_stack_trace_on_call_orig
         
         # initialize the linker
         if not hasattr(linker, 'accept'):