Fixed qr function to fit numpy update.

theano/sandbox/linalg/ops.py

@@ -1021,8 +1021,8 @@ class QRFull(Op):
     """
     _numop = staticmethod(numpy.linalg.qr)
 
-    def __init__(self):
-        self.mode = "full"
+    def __init__(self, mode):
+        self.mode = mode
 
     def __hash__(self):
         return hash((type(self), self.props()))
@@ -1060,8 +1060,7 @@ class QRIncomplete(Op):
     """
     _numop = staticmethod(numpy.linalg.qr)
 
-    def __init__(self, mode="raw"):
-        assert mode != "full"
+    def __init__(self, mode):
         self.mode = mode
 
     def __hash__(self):
@@ -1132,8 +1131,8 @@ def qr(a, mode="full"):
 
     """
     x = [[2, 1], [3, 4]]
-    if hasattr(numpy.linalg.qr(x,mode), tuple):
-        return QRFull()(a)
+    if isinstance(numpy.linalg.qr(x,mode), tuple):
+        return QRFull(mode)(a)
     else:
         return QRIncomplete(mode)(a)
 

theano/sandbox/linalg/tests/test_linalg.py

@@ -177,8 +177,8 @@ def test_matrix_dot():
 def test_qr():
     rng = numpy.random.RandomState(utt.fetch_seed())
     A = tensor.matrix("A", dtype=theano.config.floatX)
-    Q, R = qr(A)
-    fn = function([A], [Q, R])
+    Q = qr(A)
+    fn = function([A], Q)
     a = rng.rand(4, 4).astype(theano.config.floatX)
     n_q, n_r = numpy.linalg.qr(a)
     t_q, t_r = fn(a)
@@ -190,7 +190,7 @@ def test_qr_reduced():
     rng = numpy.random.RandomState(utt.fetch_seed())
     A = tensor.matrix("A", dtype=theano.config.floatX)
     Q = qr(A, mode="reduced")
-    fn = function([A], [Q])
+    fn = function([A], Q)
 
     a = rng.rand(4, 4).astype(theano.config.floatX)