Merge pull request #635 from pascanur/fix_scan_debugmode

theano/scan_module/scan_op.py

@@ -370,31 +370,41 @@ class Scan(PureOp):
         # Check if we are dealing with same type of objects
         if not type(self) == type(other):
             return False
+        if not 'destroy_map' in self.info:
+            self.info['destroy_map'] = {}
+        if not 'destroy_map' in other.info:
+            other.info['destroy_map'] = {}
+        keys_to_check = ['truncate_gradient', 'profile',
+                         'n_seqs', 'tap_array', 'name',
+                         'as_while', 'n_mit_sot', 'destroy_map',
+                         'n_nit_sot', 'n_shared_outs',
+                         'n_sit_sot', 'gpu', 'n_mit_mot_outs',
+                         'n_mit_mot', 'mit_mot_out_slices']
         # This are some safety checks ( namely that the inner graph has the
         # same number of inputs and same number of outputs )
-        elif not len(self.inputs) == len(other.inputs):
+        if not len(self.inputs) == len(other.inputs):
             return False
         elif not len(self.outputs) == len(other.outputs):
             return False
-        elif self.info != other.info:
-            return False
-        else:
-            # If everything went OK up to here, there is still one thing to
-            # check. Namely, do the internal graph represent same
-            # computations
-            for self_in, other_in in izip(self.inputs, other.inputs):
-                if self_in.type != other_in.type:
-                    return False
-
-            if not scan_utils.equal_computations(self.outputs,
-                                                 other.outputs,
-                                                 self.inputs,
-                                                 other.inputs):
+        for key in keys_to_check:
+            if self.info[key] != other.info[key]:
+                return False
+        # If everything went OK up to here, there is still one thing to
+        # check. Namely, do the internal graph represent same
+        # computations
+        for self_in, other_in in izip(self.inputs, other.inputs):
+            if self_in.type != other_in.type:
                 return False
 
-            # If they do, then they need to match in other small details
-            # like name, mode, etc.
-            return True
+        if not scan_utils.equal_computations(self.outputs,
+                                             other.outputs,
+                                             self.inputs,
+                                             other.inputs):
+            return False
+
+        # If they do, then they need to match in other small details
+        # like name, mode, etc.
+        return True
 
     def __str__(self):
         if self.gpu:
@@ -528,8 +538,12 @@ class Scan(PureOp):
                                                     dtype='int32')
             cython_vector_outs = numpy.asarray(self.vector_outs,
                                                     dtype='int32')
-            cython_destroy_map = [x in self.destroy_map
+
+            if hasattr(self, 'destroy_map'):
+                cython_destroy_map = [x in self.destroy_map
                                   for x in xrange(len(node.outputs))]
+            else:
+                cython_destroy_map = [0 for x in xrange(len(node.outputs))]
             cython_destroy_map = numpy.asarray(cython_destroy_map,
                                                dtype='int32')
             import scan_perform_ext