Merge pull request #1112 from nouiz/fix_eighgrad_dtype

theano/sandbox/linalg/ops.py

@@ -1033,7 +1033,15 @@ class EighGrad(Op):
 
     def make_node(self, x, w, v, gw, gv):
         x, w, v, gw, gv = map(as_tensor_variable, (x, w, v, gw, gv))
-        return Apply(self, [x, w, v, gw, gv], [x.type()])
+        assert x.ndim == 2
+        assert w.ndim == 1
+        assert v.ndim == 2
+        assert gw.ndim == 1
+        assert gv.ndim == 2
+        out_dtype = theano.scalar.upcast(x.dtype, w.dtype, v.dtype,
+                                         gw.dtype, gv.dtype)
+        out = theano.tensor.matrix(dtype=out_dtype)
+        return Apply(self, [x, w, v, gw, gv], [out])
 
     def perform(self, node, inputs, outputs):
         r"""
@@ -1057,7 +1065,13 @@ class EighGrad(Op):
         # opposite triangle contributes to variation of two elements
         # of Hermitian (symmetric) matrix. The following line
         # implements the necessary logic.
-        outputs[0][0] = self.tri0(g) + self.tri1(g).T
+        out = self.tri0(g) + self.tri1(g).T
+
+        # The call to self.tri0 in perform upcast from float32 to
+        # float64 or from int* to int64 in numpy 1.6.1 but not in
+        # 1.6.2. We do not want version dependent dtype in Theano.
+        # We think it should be the same as the output.
+        outputs[0][0] = numpy.asarray(out, dtype=node.outputs[0].dtype)
 
     def infer_shape(self, node, shapes):
         return [shapes[0]]