fix 1.7 additions

Author: Will Kimmerer

src/factorization.jl

@@ -395,33 +395,51 @@ function FastQRFactorization()
     # but QRFactorization uses 16.
 end
 
-function init_cacheval(alg::FastQRFactorization{NoPivot}, A, b, u, Pl, Pr,
-                       maxiters, abstol, reltol, verbose)
-    ws = QRWYWs(A; blocksize = alg.blocksize)
-    return WorkspaceAndFactors(ws, LinearAlgebra.QRCompactWY(LAPACK.geqrt!(ws, A)...))
-end
+@static if VERSION < v"1.7beta"
+    function init_cacheval(alg::FastQRFactorization{Val{false}}, A, b, u, Pl, Pr,
+        maxiters, abstol, reltol, verbose)
+        ws = QRWYWs(A; blocksize = alg.blocksize)
+        return WorkspaceAndFactors(ws, LinearAlgebra.QRCompactWY(LAPACK.geqrt!(ws, A)...))
+    end
 
-function init_cacheval(::FastQRFactorization{LinearAlgebra.ColumnNorm}, A, b, u, Pl, Pr,
-                       maxiters, abstol, reltol, verbose)
-    ws = QRpWs(A)
-    return WorkspaceAndFactors(ws, LinearAlgebra.QRPivoted(LAPACK.geqp3!(ws, A)...))
+    function init_cacheval(::FastQRFactorization{Val{true}}, A, b, u, Pl, Pr,
+        maxiters, abstol, reltol, verbose)
+        ws = QRpWs(A)
+        return WorkspaceAndFactors(ws, LinearAlgebra.QRPivoted(LAPACK.geqp3!(ws, A)...))
+    end
+else
+    function init_cacheval(alg::FastQRFactorization{NoPivot}, A, b, u, Pl, Pr,
+        maxiters, abstol, reltol, verbose)
+        ws = QRWYWs(A; blocksize = alg.blocksize)
+        return WorkspaceAndFactors(ws, LinearAlgebra.QRCompactWY(LAPACK.geqrt!(ws, A)...))
+    end
+    function init_cacheval(::FastQRFactorization{ColumnNorm}, A, b, u, Pl, Pr,
+        maxiters, abstol, reltol, verbose)
+        ws = QRpWs(A)
+        return WorkspaceAndFactors(ws, LinearAlgebra.QRPivoted(LAPACK.geqp3!(ws, A)...))
+    end
 end
 
+
+
 function SciMLBase.solve(cache::LinearCache, alg::FastQRFactorization{P}) where {P}
     A = cache.A
     A = convert(AbstractMatrix, A)
     ws_and_fact = cache.cacheval
     if cache.isfresh
         # we will fail here if A is a different *size* than in a previous version of the same cache.
         # it may instead be desirable to resize the workspace.
-        if P === NoPivot
+        nopivot = @static if VERSION < v"1.7beta"
+            Val{false}
+        else
+            NoPivot
+        end
+        if P === nopivot
             @set! ws_and_fact.factors = LinearAlgebra.QRCompactWY(LAPACK.geqrt!(ws_and_fact.workspace,
                                                                                 A)...)
-        elseif P === LinearAlgebra.ColumnNorm
+        else
             @set! ws_and_fact.factors = LinearAlgebra.QRPivoted(LAPACK.geqp3!(ws_and_fact.workspace,
                                                                               A)...)
-        else
-            error("No FastLAPACK Factorization defined for $P")
         end
         cache = set_cacheval(cache, ws_and_fact)
     end