Merge pull request #316 from pascanur/fix_scan_savemem

theano/scan_module/scan_op.py

@@ -1593,7 +1593,7 @@ class Scan(PureOp):
         # Outputs
         n_mit_mot_outs = int(numpy.sum([len(x) for x in
                                         self.mit_mot_out_slices]))
-        info['n_mit_mot_outs'] = n_mit_mot_outs
+        info['n_mit_mot_outs'] = n_mit_mot_outs*2
         b = 0
         e = n_mit_mot_outs
         inner_out_mit_mot = self_outputs[b:e] + rop_outs[b:e]

theano/scan_module/scan_opt.py

@@ -640,13 +640,17 @@ class ScanSaveMem(gof.Optimizer):
                             isinstance(nw_inputs[offset + idx].owner.op,
                                        tensor.IncSubtensor)):
                             _nw_input = nw_inputs[offset + idx].owner.inputs[1]
+                            val = tensor.as_tensor_variable(val)
+                            initl = tensor.as_tensor_variable(init_l[i])
                             tmp = pre_greedy_local_optimizer(list_opt_slice,
-                                    tensor.as_tensor_variable(val - init_l[i]))
+                                    tensor.maximum(val - initl, 0))
                             tmp = pre_constant_merge([tmp])[0]
                             nw_input = scan_utils.expand(_nw_input, tmp)
                         else:
-                            tmp = pre_greedy_local_optimizer(list_opt_slice,
-                                    tensor.as_tensor_variable(val))
+                            tmp = tensor.as_tensor_variable(val)
+                            initl = tensor.as_tensor_variable(init_l[i])
+                            tmp = tensor.maximum(tmp, initl)
+                            tmp = pre_greedy_local_optimizer(list_opt_slice, tmp)
                             tmp = pre_constant_merge([tmp])[0]
                             nw_input = nw_inputs[offset + idx][:tmp]