Merge pull request #5318 from nouiz/local_reshape_dimshuffle

theano/tensor/basic.py

@@ -6105,6 +6105,8 @@ class ExtractDiag(Op):
         (x,) = inputs
         (z,) = outputs
         z[0] = x.diagonal(self.offset, self.axis1, self.axis2)
+        if not self.view:
+            z[0] = z[0].copy()
 
     def grad(self, inputs, gout):
         (x,) = inputs

theano/tensor/opt_uncanonicalize.py

@@ -133,7 +133,8 @@ def local_reshape_dimshuffle(node):
                     return False
                 else:
                     offset += 1
-            return [T.reshape(input_.owner.inputs[0], node.inputs[1])]
+            return [T.reshape(input_.owner.inputs[0], node.inputs[1],
+                              ndim=node.outputs[0].ndim)]
     return False