Merge branch 'overspecialize'

ChrisRackauckas · ChrisRackauckas · commit febc6c3c2772 · 2023-02-17T06:42:55.000-05:00
diff --git a/src/exp_generated/exp_1.jl b/src/exp_generated/exp_1.jl
@@ -1,6 +1,6 @@
 using LinearAlgebra
 
-@inline function exp_gen!(cache, A, ::Val{1})
+function exp_gen!(cache, A, ::Val{1})
     T = promote_type(eltype(A), Float64) # Make it work for many 'bigger' types (matrices and scalars)
     # max_memslots=4
     n = size(A, 1)
diff --git a/src/exp_generated/exp_10.jl b/src/exp_generated/exp_10.jl
@@ -1,6 +1,6 @@
 using LinearAlgebra
 
-@inline function exp_gen!(cache, A, ::Val{10})
+function exp_gen!(cache, A, ::Val{10})
     T = promote_type(eltype(A), Float64) # Make it work for many 'bigger' types (matrices and scalars)
     # max_memslots=6
     n = size(A, 1)
diff --git a/src/exp_generated/exp_11.jl b/src/exp_generated/exp_11.jl
@@ -1,6 +1,6 @@
 using LinearAlgebra
 
-@inline function exp_gen!(cache, A, ::Val{11})
+function exp_gen!(cache, A, ::Val{11})
     T = promote_type(eltype(A), Float64) # Make it work for many 'bigger' types (matrices and scalars)
     # max_memslots=6
     n = size(A, 1)
diff --git a/src/exp_generated/exp_12.jl b/src/exp_generated/exp_12.jl
@@ -1,6 +1,6 @@
 using LinearAlgebra
 
-@inline function exp_gen!(cache, A, ::Val{12})
+function exp_gen!(cache, A, ::Val{12})
     T = promote_type(eltype(A), Float64) # Make it work for many 'bigger' types (matrices and scalars)
     # max_memslots=6
     n = size(A, 1)
diff --git a/src/exp_generated/exp_13.jl b/src/exp_generated/exp_13.jl
@@ -1,6 +1,6 @@
 using LinearAlgebra
 
-@inline function exp_gen!(cache, A, ::Val{13})
+function exp_gen!(cache, A, ::Val{13})
     T = promote_type(eltype(A), Float64) # Make it work for many 'bigger' types (matrices and scalars)
     # max_memslots=6
     n = size(A, 1)
diff --git a/src/exp_generated/exp_2.jl b/src/exp_generated/exp_2.jl
@@ -1,6 +1,6 @@
 using LinearAlgebra
 
-@inline function exp_gen!(cache, A, ::Val{2})
+function exp_gen!(cache, A, ::Val{2})
     T = promote_type(eltype(A), Float64) # Make it work for many 'bigger' types (matrices and scalars)
     # max_memslots=5
     n = size(A, 1)
diff --git a/src/exp_generated/exp_3.jl b/src/exp_generated/exp_3.jl
@@ -1,6 +1,6 @@
 using LinearAlgebra
 
-@inline function exp_gen!(cache, A, ::Val{3})
+function exp_gen!(cache, A, ::Val{3})
     T = promote_type(eltype(A), Float64) # Make it work for many 'bigger' types (matrices and scalars)
     # max_memslots=6
     n = size(A, 1)
diff --git a/src/exp_generated/exp_4.jl b/src/exp_generated/exp_4.jl
@@ -1,6 +1,6 @@
 using LinearAlgebra
 
-@inline function exp_gen!(cache, A, ::Val{4})
+function exp_gen!(cache, A, ::Val{4})
     T = promote_type(eltype(A), Float64) # Make it work for many 'bigger' types (matrices and scalars)
     # max_memslots=6
     n = size(A, 1)
diff --git a/src/exp_generated/exp_5.jl b/src/exp_generated/exp_5.jl
@@ -1,6 +1,6 @@
 using LinearAlgebra
 
-@inline function exp_gen!(cache, A, ::Val{5})
+function exp_gen!(cache, A, ::Val{5})
     T = promote_type(eltype(A), Float64) # Make it work for many 'bigger' types (matrices and scalars)
     # max_memslots=6
     n = size(A, 1)
diff --git a/src/exp_generated/exp_6.jl b/src/exp_generated/exp_6.jl
@@ -1,6 +1,6 @@
 using LinearAlgebra
 
-@inline function exp_gen!(cache, A, ::Val{6})
+function exp_gen!(cache, A, ::Val{6})
     T = promote_type(eltype(A), Float64) # Make it work for many 'bigger' types (matrices and scalars)
     # max_memslots=6
     n = size(A, 1)
diff --git a/src/exp_generated/exp_7.jl b/src/exp_generated/exp_7.jl
@@ -1,6 +1,6 @@
 using LinearAlgebra
 
-@inline function exp_gen!(cache, A, ::Val{7})
+function exp_gen!(cache, A, ::Val{7})
     T = promote_type(eltype(A), Float64) # Make it work for many 'bigger' types (matrices and scalars)
     # max_memslots=6
     n = size(A, 1)
diff --git a/src/exp_generated/exp_8.jl b/src/exp_generated/exp_8.jl
@@ -1,6 +1,6 @@
 using LinearAlgebra
 
-@inline function exp_gen!(cache, A, ::Val{8})
+function exp_gen!(cache, A, ::Val{8})
     T = promote_type(eltype(A), Float64) # Make it work for many 'bigger' types (matrices and scalars)
     # max_memslots=6
     n = size(A, 1)
diff --git a/src/exp_generated/exp_9.jl b/src/exp_generated/exp_9.jl
@@ -1,6 +1,6 @@
 using LinearAlgebra
 
-@inline function exp_gen!(cache, A, ::Val{9})
+function exp_gen!(cache, A, ::Val{9})
     T = promote_type(eltype(A), Float64) # Make it work for many 'bigger' types (matrices and scalars)
     # max_memslots=6
     n = size(A, 1)
diff --git a/src/krylov_phiv.jl b/src/krylov_phiv.jl
@@ -43,7 +43,7 @@ function expv(t, A, b; mode = :happy_breakdown, kwargs...)
     end
 end
 function _expv_hb(t::Tt, A, b;
-                  expmethod = ExpMethodHigham2005(),
+                  expmethod = ExpMethodHigham2005Base(),
                   cache = nothing, kwargs_arnoldi...) where {Tt}
     # Happy-breakdown mode: first construct Krylov subspace then expv!
     Ks = arnoldi(A, b; kwargs_arnoldi...)
@@ -52,7 +52,7 @@ function _expv_hb(t::Tt, A, b;
 end
 function _expv_ee(t::Tt, A, b; m = min(30, size(A, 1)), tol = 1e-7, rtol = √(tol),
                   ishermitian::Bool = LinearAlgebra.ishermitian(A),
-                  expmethod = ExpMethodHigham2005()) where {Tt}
+                  expmethod = ExpMethodHigham2005Base()) where {Tt}
     # Error-estimate mode: construction of Krylov subspace and expv! at the same time
     n = size(A, 1)
     T = promote_type(typeof(t), eltype(A), eltype(b))
@@ -74,7 +74,7 @@ end
 Non-allocating version of `expv` that uses precomputed Krylov subspace `Ks`.
 """
 function expv!(w::AbstractVector{Tw}, t::Real, Ks::KrylovSubspace{T, U};
-               cache = nothing, expmethod = ExpMethodHigham2005()) where {Tw, T, U}
+               cache = nothing, expmethod = ExpMethodHigham2005Base()) where {Tw, T, U}
     m, beta, V, H = Ks.m, Ks.beta, getV(Ks), getH(Ks)
     @assert length(w)==size(V, 1) "Dimension mismatch"
     if cache == nothing
@@ -102,7 +102,7 @@ end
 #       or Tw can be Float64, while t is ComplexF32 and T is Float64
 #       thus they can not share the same TypeVar.
 function expv!(w::AbstractVector{Complex{Tw}}, t::Complex{Tt}, Ks::KrylovSubspace{T, U};
-               cache = nothing, expmethod = ExpMethodHigham2005()) where {Tw, Tt, T, U}
+               cache = nothing, expmethod = ExpMethodHigham2005Base()) where {Tw, Tt, T, U}
     m, beta, V, H = Ks.m, Ks.beta, getV(Ks), getH(Ks)
     @assert length(w)==size(V, 1) "Dimension mismatch"
     if cache === nothing
@@ -132,7 +132,7 @@ end
 function ExponentialUtilities.expv!(w::GPUArraysCore.AbstractGPUVector{Tw},
                                     t::Real, Ks::KrylovSubspace{T, U};
                                     cache = nothing,
-                                    expmethod = ExpMethodHigham2005()) where {Tw, T, U}
+                                    expmethod = ExpMethodHigham2005Base()) where {Tw, T, U}
     m, beta, V, H = Ks.m, Ks.beta, getV(Ks), getH(Ks)
     @assert length(w)==size(V, 1) "Dimension mismatch"
     if cache === nothing
diff --git a/src/krylov_phiv_error_estimate.jl b/src/krylov_phiv_error_estimate.jl
@@ -59,8 +59,8 @@ function expv!(w::AbstractVector{T}, t::Number, A, b::AbstractVector{T},
                atol::B = 1.0e-8, rtol::B = 1.0e-4,
                m = min(Ks.maxiter, size(A, 1)),
                verbose::Bool = false,
-               expmethod = ExpMethodHigham2005()) where {B, T <: Number,
-                                                         HSC <: HermitianSubspaceCache}
+               expmethod = ExpMethodHigham2005Base()) where {B, T <: Number,
+                                                             HSC <: HermitianSubspaceCache}
     if m > Ks.maxiter
         resize!(Ks, m)
     else
diff --git a/src/phi.jl b/src/phi.jl
@@ -18,7 +18,7 @@ package for computing matrix exponentials. ACM Transactions on Mathematical
 Software (TOMS), 24(1), 130-156. Theorem 1).
 """
 function phi(z::T, k::Integer; cache = nothing,
-             expmethod = ExpMethodHigham2005()) where {T <: Number}
+             expmethod = ExpMethodHigham2005Base()) where {T <: Number}
     # Construct the matrix
     if cache == nothing
         cache = fill(zero(T), k + 1, k + 1)
@@ -60,7 +60,8 @@ Non-allocating version of `phiv_dense`.
 """
 function phiv_dense!(w::AbstractMatrix{T}, A::AbstractMatrix{T},
                      v::AbstractVector{T}, k::Integer;
-                     cache = nothing, expmethod = ExpMethodHigham2005()) where {T <: Number}
+                     cache = nothing,
+                     expmethod = ExpMethodHigham2005Base()) where {T <: Number}
     @assert size(w, 1)==size(A, 1)==size(A, 2)==length(v) "Dimension mismatch"
     @assert size(w, 2)==k + 1 "Dimension mismatch"
     m = length(v)
@@ -117,7 +118,7 @@ end
 Non-allocating version of `phi` for non-diagonal matrix inputs.
 """
 function phi!(out::Vector{Matrix{T}}, A::AbstractMatrix{T}, k::Integer; caches = nothing,
-              expmethod = ExpMethodHigham2005(A)) where {T <: Number}
+              expmethod = ExpMethodHigham2005Base()) where {T <: Number}
     m = size(A, 1)
     @assert length(out) == k + 1&&all(P -> size(P) == (m, m), out) "Dimension mismatch"
     if caches == nothing
diff --git a/src/precompile.jl b/src/precompile.jl
@@ -32,14 +32,15 @@
     end
 
     precomp_ms = [
-        ExpMethodHigham2005(),
+        #ExpMethodHigham2005(),
         ExpMethodHigham2005Base(),
-        ExpMethodGeneric(),
-        ExpMethodNative(),
-        ExpMethodDiagonalization(),
+        #ExpMethodGeneric(),
+        #ExpMethodNative(),
+        #ExpMethodDiagonalization(),
     ]
 
-    Txs = [Float64, ComplexF64]
+    Txs = [Float64]
+    #Txs = [Float64, ComplexF64]
 
     @precompile_all_calls begin [precomp_fx(; method, Tx) for method in precomp_ms
                                  for Tx in Txs] end
