one more round of eig changes

Author: lkdvos

ext/MatrixAlgebraKitCUDAExt/MatrixAlgebraKitCUDAExt.jl

@@ -22,7 +22,7 @@ function MatrixAlgebraKit.default_svd_algorithm(::Type{T}; kwargs...) where {T <
     return QRIteration(; kwargs...)
 end
 function MatrixAlgebraKit.default_eig_algorithm(::Type{T}; kwargs...) where {T <: StridedCuVecOrMat{<:BlasFloat}}
-    return QRIteration(; balanced = false, kwargs...)
+    return QRIteration(; kwargs...)
 end
 function MatrixAlgebraKit.default_eigh_algorithm(::Type{T}; kwargs...) where {T <: StridedCuVecOrMat{<:BlasFloat}}
     return DivideAndConquer(; kwargs...)

ext/MatrixAlgebraKitGenericSchurExt.jl

@@ -9,10 +9,9 @@ using GenericSchur
 const GSFloat = Union{Float16, ComplexF16, BigFloat, Complex{BigFloat}}
 
 function MatrixAlgebraKit.default_eig_algorithm(
-        ::Type{T};
-        balanced::Bool = false, driver::Driver = GS(), kwargs...
+        ::Type{T}; driver::Driver = GS(), kwargs...
     ) where {T <: StridedMatrix{<:GSFloat}}
-    return QRIteration(; driver, balanced, kwargs...)
+    return QRIteration(; driver, kwargs...)
 end
 
 function geev!(::GS, A::AbstractMatrix, Dd::AbstractVector, V::AbstractMatrix; kwargs...)

src/implementations/eig.jl

@@ -91,18 +91,16 @@ end
 #      IMPLEMENTATIONS
 # ==========================
 
-geev!(driver::Driver, args...; kwargs...) = throw(ArgumentError("$driver does not provide $f!"))
+geev!(driver::Driver, args...; kwargs...) = throw(ArgumentError("$driver does not provide `geev!`"))
 function geevx!(driver::Driver, A, Dd, V; kwargs...)
     @warn "$driver does not provide `geevx!`, falling back to `geev!`" maxlog = 1
-    return geev!(driver, A, Dd, V; kwargs...)
+    return geev!(driver, A, Dd, V)
 end
-_has_geevx!(::Driver) = false
 
 # LAPACK implementations
 for f! in (:geev!, :geevx!)
     @eval $f!(::LAPACK, args...; kwargs...) = YALAPACK.$f!(args...; kwargs...)
 end
-_has_geevx!(::LAPACK) = true
 
 # driver dispatch
 @inline qr_iteration_eig_full!(A, Dd, V; driver::Driver = DefaultDriver(), kwargs...) =
@@ -118,17 +116,17 @@ _has_geevx!(::LAPACK) = true
 # Implementation
 function qr_iteration_eig_full!(
         driver::Driver, A, Dd, V;
-        fixgauge::Bool = default_fixgauge(), balanced::Bool = _has_geevx!(driver), kwargs...
+        fixgauge::Bool = default_fixgauge(), scale::Bool = true, permute::Bool = true
     )
-    (balanced ? geevx! : geev!)(driver, A, Dd, V; kwargs...)
+    (scale & permute) ? geev!(driver, A, Dd, V) : geevx!(driver, A, Dd, V; scale, permute)
     fixgauge && gaugefix!(eig_full!, V)
     return Dd, V
 end
 function qr_iteration_eig_vals!(
         driver::Driver, A, D, V;
-        fixgauge::Bool = default_fixgauge(), balanced::Bool = _has_geevx!(driver), kwargs...
+        fixgauge::Bool = default_fixgauge(), scale::Bool = true, permute::Bool = true
     )
-    (balanced ? geevx! : geev!)(driver, A, D, V; kwargs...)
+    (scale & permute) ? geev!(driver, A, D, V) : geevx!(driver, A, D, V; scale, permute)
     return D
 end
 
@@ -188,15 +186,15 @@ end
 
 # Deprecations
 # ------------
-for (lapack_algtype, balanced_val) in ((:LAPACK_Simple, false), (:LAPACK_Expert, true))
+for lapack_algtype in (:LAPACK_Simple, :LAPACK_Expert)
     @eval begin
         Base.@deprecate(
             eig_full!(A, DV, alg::$lapack_algtype),
-            eig_full!(A, DV, QRIteration(; balanced = $balanced_val, alg.kwargs...))
+            eig_full!(A, DV, QRIteration(; alg.kwargs...))
         )
         Base.@deprecate(
             eig_vals!(A, D, alg::$lapack_algtype),
-            eig_vals!(A, D, QRIteration(; balanced = $balanced_val, alg.kwargs...))
+            eig_vals!(A, D, QRIteration(; alg.kwargs...))
         )
     end
 end

src/implementations/schur.jl

@@ -53,8 +53,10 @@ end
 #      IMPLEMENTATIONS
 # ==========================
 
-for f! in (:gees!, :geesx!)
-    @eval $f!(driver::Driver, args...) = throw(ArgumentError("$driver does not provide $f!"))
+gees!(driver::Driver, args...) = throw(ArgumentError("$driver does not provide `gees!`"))
+function geesx!(driver::Driver, A, Dd, V; kwargs...)
+    @warn "$driver does not provide `geesx!`, falling back to `gees!`" maxlog = 1
+    return gees!(driver, A, Dd, V)
 end
 
 # LAPACK implementations
@@ -74,13 +76,13 @@ end
     qr_iteration_schur_vals!(default_driver(QRIteration, A), A, Z, vals; kwargs...)
 
 # Implementation
-function qr_iteration_schur_full!(driver::Driver, A, T, Z, vals; balanced::Bool = false)
-    (balanced ? geesx! : gees!)(driver, A, Z, vals)
+function qr_iteration_schur_full!(driver::Driver, A, T, Z, vals; expert::Bool = false)
+    expert ? geesx!(driver, A, Z, vals) : gees!(driver, A, Z, vals)
     T === A || copy!(T, A)
     return T, Z, vals
 end
-function qr_iteration_schur_vals!(driver::Driver, A, Z, vals; balanced::Bool = false)
-    (balanced ? geesx! : gees!)(driver, A, Z, vals)
+function qr_iteration_schur_vals!(driver::Driver, A, Z, vals; expert::Bool = false)
+    expert ? geesx!(driver, A, Z, vals) : gees!(driver, A, Z, vals)
     return vals
 end
 
@@ -100,15 +102,15 @@ end
 
 # Deprecations
 # ------------
-for (lapack_algtype, balanced_val) in ((:LAPACK_Simple, false), (:LAPACK_Expert, true))
+for (lapack_algtype, expert_val) in ((:LAPACK_Simple, false), (:LAPACK_Expert, true))
     @eval begin
         Base.@deprecate(
             schur_full!(A, TZv, alg::$lapack_algtype),
-            schur_full!(A, TZv, QRIteration(; balanced = $balanced_val, alg.kwargs...))
+            schur_full!(A, TZv, QRIteration(; expert = $expert_val, alg.kwargs...))
         )
         Base.@deprecate(
             schur_vals!(A, vals, alg::$lapack_algtype),
-            schur_vals!(A, vals, QRIteration(; balanced = $balanced_val, alg.kwargs...))
+            schur_vals!(A, vals, QRIteration(; expert = $expert_val, alg.kwargs...))
         )
     end
 end

test/eig.jl

@@ -35,7 +35,10 @@ for T in (BLASFloats..., GenericFloats...)
     if !is_buildkite
         TestSuite.test_eig(T, (m, m))
         if T ∈ BLASFloats
-            LAPACK_EIG_ALGS = (QRIteration(), QRIteration(balanced = true))
+            LAPACK_EIG_ALGS = (
+                QRIteration(),
+                QRIteration(scale = false), # to trigger geevx!
+            )
             TestSuite.test_eig_algs(T, (m, m), LAPACK_EIG_ALGS)
         elseif T ∈ GenericFloats
             GS_EIG_ALGS = (QRIteration(; driver = GS()),)

test/schur.jl

@@ -28,7 +28,7 @@ for T in (BLASFloats..., GenericFloats...)
     if !is_buildkite
         TestSuite.test_schur(T, (m, m))
         if T ∈ BLASFloats
-            LAPACK_SCHUR_ALGS = (QRIteration(), QRIteration(balanced = true))
+            LAPACK_SCHUR_ALGS = (QRIteration(), QRIteration(expert = true))
             TestSuite.test_schur_algs(T, (m, m), LAPACK_SCHUR_ALGS)
         end
         #AT = Diagonal{T, Vector{T}}