Fix gesvd

Author: amontoison

lib/cusolver/dense.jl

@@ -394,9 +394,9 @@ for (bname, fname, elty, relty) in ((:cusolverDnSgesvd_bufferSize, :cusolverDnSg
 
             U = if jobu === 'A'
                 similar(A, $elty, (m, m))
-            elseif jobu == 'S' || jobu === 'O'
+            elseif jobu === 'S'
                 similar(A, $elty, (m, k))
-            elseif jobu === 'N'
+            elseif jobu === 'N' || jobu === 'O'
                 CU_NULL
             else
                 error("jobu must be one of 'A', 'S', 'O', or 'N'")
@@ -405,9 +405,9 @@ for (bname, fname, elty, relty) in ((:cusolverDnSgesvd_bufferSize, :cusolverDnSg
             S = similar(A, $relty, k)
             Vt = if jobvt === 'A'
                 similar(A, $elty, (n, n))
-            elseif jobvt === 'S' || jobvt === 'O'
+            elseif jobvt === 'S'
                 similar(A, $elty, (k, n))
-            elseif jobvt === 'N'
+            elseif jobvt === 'N' || jobvt === 'O'
                 CU_NULL
             else
                 error("jobvt must be one of 'A', 'S', 'O', or 'N'")

lib/cusolver/dense_generic.jl

@@ -222,21 +222,22 @@ function Xgesvd!(jobu::Char, jobvt::Char, A::StridedCuMatrix{T}) where {T <: Bla
     m, n = size(A)
     R = real(T)
     (m < n) && throw(ArgumentError("The number of rows of A ($m) must be greater or equal to the number of columns of A ($n)"))
+    k = min(m, n)
     U = if jobu == 'A'
         CuMatrix{T}(undef, m, m)
-    elseif jobu == 'S' || jobu == 'O'
-        CuMatrix{T}(undef, m, min(m, n))
-    elseif jobu == 'N'
+    elseif jobu == 'S'
+        CuMatrix{T}(undef, m, k)
+    elseif jobu == 'N' || jobvt == 'O'
         CU_NULL
     else
         throw(ArgumentError("jobu is incorrect. The values accepted are 'A', 'S', 'O' and 'N'."))
     end
-    Σ = CuVector{R}(undef, min(m, n))
+    Σ = CuVector{R}(undef, k)
     Vt = if jobvt == 'A'
         CuMatrix{T}(undef, n, n)
-    elseif jobvt == 'S' || jobvt == 'O'
-        CuMatrix{T}(undef, min(m, n), n)
-    elseif jobvt == 'N'
+    elseif jobvt == 'S'
+        CuMatrix{T}(undef, k, n)
+    elseif jobvt == 'N' || jobvt == 'O'
         CU_NULL
     else
         throw(ArgumentError("jobvt is incorrect. The values accepted are 'A', 'S', 'O' and 'N'."))

test/libraries/cusolver/dense.jl

@@ -202,6 +202,8 @@ k = 1
 
         for jobu in ('A', 'S', 'N', 'O')
             for jobvt in ('A', 'S', 'N', 'O')
+                (jobu == 'A') && (jobvt == 'A') && continue
+                (jobu == 'O') && (jobvt == 'O') && continue
                 d_A = CuMatrix(A)
                 U2, Σ2, Vt2 = CUSOLVER.gesvd!(jobu, jobvt, d_A)
                 @test Σ ≈ Σ2

test/libraries/cusolver/dense_generic.jl

@@ -152,6 +152,8 @@ p = 5
 
         for jobu in ('A', 'S', 'N', 'O')
             for jobvt in ('A', 'S', 'N', 'O')
+                (jobu == 'A') && (jobvt == 'A') && continue
+                (jobu == 'O') && (jobvt == 'O') && continue
                 d_A = CuMatrix(A)
                 U2, Σ2, Vt2 = CUSOLVER.Xgesvd!(jobu, jobvt, d_A)
                 @test Σ ≈ Σ2