Merge pull request #27 from louisponet/resize_fixes

Resize fixes

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
       matrix:
         version:
           - '1.6'
-          - '1.8.0-rc1'
+          - '1.8.0'
           - 'nightly'
         os:
           - ubuntu-latest

Project.toml

@@ -1,7 +1,7 @@
 name = "FastLapackInterface"
 uuid = "29a986be-02c6-4525-aec4-84b980013641"
 authors = ["Louis Ponet, Michel Juillard"]
-version = "1.2.4"
+version = "1.2.5"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

src/FastLapackInterface.jl

@@ -16,7 +16,7 @@ else
 end
 
 abstract type Workspace end
-
+include("exceptions.jl")
 include("lu.jl")
 export LUWs
 include("qr.jl")

src/bunch_kaufman.jl

@@ -82,20 +82,22 @@ for (sytrfs,  elty) in
      ((:csytrf_,:csytrf_rook_, :chetrf_,:chetrf_rook_),:ComplexF32))
 
     @eval begin
-        function Base.resize!(ws::BunchKaufmanWs, A::AbstractMatrix{$elty})
+        function Base.resize!(ws::BunchKaufmanWs, A::AbstractMatrix{$elty}; work = true)
             chkstride1(A)
             n = checksquare(A)
             if n == 0
                 return ws
             end
             resize!(ws.ipiv, n)
-            info  = Ref{BlasInt}()
-            ccall((@blasfunc($(sytrfs[1])), liblapack), Cvoid,
-                  (Ref{UInt8}, Ref{BlasInt}, Ptr{$elty}, Ref{BlasInt},
-                   Ptr{BlasInt}, Ptr{$elty}, Ref{BlasInt}, Ptr{BlasInt}, Clong),
-                  'U', n, A, stride(A,2), ws.ipiv, ws.work, -1, info, 1)
-            chkargsok(info[])
-            resize!(ws.work, BlasInt(real(ws.work[1])))
+            if work
+                info  = Ref{BlasInt}()
+                ccall((@blasfunc($(sytrfs[1])), liblapack), Cvoid,
+                      (Ref{UInt8}, Ref{BlasInt}, Ptr{$elty}, Ref{BlasInt},
+                       Ptr{BlasInt}, Ptr{$elty}, Ref{BlasInt}, Ptr{BlasInt}, Clong),
+                      'U', n, A, stride(A,2), ws.ipiv, ws.work, -1, info, 1)
+                chkargsok(info[])
+                resize!(ws.work, BlasInt(real(ws.work[1])))
+            end
             return ws
         end
         function BunchKaufmanWs(A::AbstractMatrix{$elty})
@@ -110,11 +112,12 @@ for (sytrfs,  elty) in
                 return A, ws.ipiv, zero(BlasInt)
             end
             chkuplo(uplo)
-            if n > length(ws.ipiv)
+            nws = length(ws.ipiv)
+            if n != nws 
                 if resize
-                    resize!(ws, A)
+                    resize!(ws, A, work=nws<n)
                 else
-                    throw(ArgumentError("Workspace is too small, use resize!(ws, A)."))
+                    throw(WorkspaceSizeError(nws, n))
                 end
             end
             info  = Ref{BlasInt}()

src/cholesky.jl

@@ -45,10 +45,12 @@ for (pstrf, elty, rtyp) in
      (:zpstrf_,:ComplexF64,:Float64),
      (:cpstrf_,:ComplexF32,:Float32))
     @eval begin
-        function Base.resize!(ws::CholeskyPivotedWs, A::AbstractMatrix{$elty})
+        function Base.resize!(ws::CholeskyPivotedWs, A::AbstractMatrix{$elty}; work = true)
             n = checksquare(A)
-            resize!(ws.work, 2n)
             resize!(ws.piv, n)
+            if work
+                resize!(ws.work, 2n)
+            end
             return ws
         end
         function CholeskyPivotedWs(A::AbstractMatrix{$elty})
@@ -61,11 +63,12 @@ for (pstrf, elty, rtyp) in
             chkuplo(uplo)
             rank = Ref{BlasInt}()
             info = Ref{BlasInt}()
-            if length(ws.piv) < n
+            nws = length(ws.piv)
+            if nws != n
                 if resize
-                    resize!(ws, A)
+                    resize!(ws, A; work = nws < n)
                 else
-                    throw(ArgumentError("Workspace is too small, use resize!(ws, A)."))
+                    throw(WorkspaceSizeError(nws, n))
                 end
             end