Merge pull request #1928 from nouiz/scan_crash

theano/compile/debugmode.py

@@ -1630,7 +1630,7 @@ class _Linker(gof.link.LocalLinker):
                 thunks_py.append(None)
 
             # If the op define its own make_thunk, check it
-            if node.op.make_thunk.im_func not in default_make_thunk:
+            if get_unbound_function(node.op.make_thunk) not in default_make_thunk:
                 compute_map = {}
                 for k in node.inputs:
                     compute_map[k] = [True]

theano/scan_module/scan_utils.py

@@ -448,9 +448,7 @@ def equal_computations(xs, ys, in_xs=None, in_ys=None):
                     if dx != dy:
                         if (isinstance(dx, tensor.Constant) and
                             isinstance(dy, tensor.Constant)):
-                            if not (numpy.all(dx.data == dy.data) and
-                                dx.type.dtype == dy.type.dtype and
-                                dx.data.shape == dy.data.shape):
+                            if not dx.equals(dy):
                                 return False
                             else:
                                 pass

theano/tensor/var.py

@@ -405,7 +405,8 @@ class _tensor_py_operators:
                 return rval
             else:
                 return theano.tensor.subtensor.Subtensor(args)(
-                    self, *theano.tensor.subtensor.Subtensor.collapse(args,
+                    self, *theano.tensor.subtensor.Subtensor.collapse(
+                        args,
                         lambda entry: isinstance(entry, Variable)))
 
     def take(self, indices, axis=None, mode='raise'):
@@ -701,6 +702,7 @@ class TensorConstant(_tensor_py_operators, Constant):
             other = theano.tensor.basic.constant(other)
         return (isinstance(other, TensorConstant) and
                 self.signature() == other.signature())
+
     def __copy__(self):
         # We need to do this to remove the cached attribute
         return type(self)(self.type, self.data, self.name)