Merge pull request #645 from SciML/dmw/unpack

Remove UnPack

Author: ChrisRackauckas

Project.toml

@@ -1,7 +1,7 @@
 name = "StochasticDiffEq"
 uuid = "789caeaf-c7a9-5a7d-9973-96adeb23e2a0"
 authors = ["Chris Rackauckas <[email protected]>"]
-version = "6.85.0"
+version = "6.86.0"
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
@@ -30,7 +30,6 @@ SciMLOperators = "c0aeaf25-5076-4817-a8d5-81caf7dfa961"
 SimpleNonlinearSolve = "727e6d20-b764-4bd8-a329-72de5adea6c7"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
-UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
 
 [compat]
 ADTypes = "1"
@@ -61,7 +60,6 @@ SciMLOperators = "0.2.9, 0.3, 0.4, 1"
 SimpleNonlinearSolve = "2"
 SparseArrays = "1.6"
 StaticArrays = "0.11, 0.12, 1.0"
-UnPack = "0.1, 1.0"
 julia = "1.10"
 
 [extras]

src/SROCK_utils.jl

@@ -2,7 +2,7 @@
 # (absolute value wise) by power iteration.
 function maxeig!(integrator, cache::StochasticDiffEqConstantCache)
     isfirst = integrator.iter == 1 || integrator.u_modified
-    @unpack t, dt, uprev, u, p = integrator
+    (; t, dt, uprev, u, p) = integrator
     maxiter = 50
     safe = 1.2
     fsalfirst = integrator.f(uprev, p, t)
@@ -73,7 +73,7 @@ end
 
 function maxeig!(integrator, cache::StochasticDiffEqMutableCache)
     isfirst = integrator.iter == 1 || integrator.u_modified
-    @unpack t, dt, uprev, u, p = integrator
+    (; t, dt, uprev, u, p) = integrator
     fz, z, fsalfirst = cache.atmp, cache.tmp, cache.fsalfirst
     integrator.f(fsalfirst, uprev, p, t)
     ccache = cache.constantcache

src/StochasticDiffEq.jl

@@ -19,7 +19,7 @@ import OrdinaryDiffEqCore: default_controller, isstandard, ispredictive,
                            step_accept_controller!,
                            step_reject_controller!, PIController, DummyController, issplit
 
-using UnPack, RecursiveArrayTools, DataStructures
+using RecursiveArrayTools, DataStructures
 using DiffEqNoiseProcess, Random, ArrayInterface
 using SimpleNonlinearSolve, ForwardDiff, StaticArrays, MuladdMacro, FiniteDiff, Base.Threads
 using Adapt

src/caches/rossler_caches.jl

@@ -17,7 +17,7 @@ struct SRIConstantCache{VType1, VType2, MType, uType} <: StochasticDiffEqConstan
 end
 
 function SRIConstantCache(tableau, rate_prototype, error_terms)
-    @unpack c₀, c₁, A₀, A₁, B₀, B₁, α, β₁, β₂, β₃, β₄ = tableau
+    (; c₀, c₁, A₀, A₁, B₀, B₁, α, β₁, β₂, β₃, β₄) = tableau
     stages = length(α)
     H0 = Array{typeof(rate_prototype)}(undef, stages)
     H1 = Array{typeof(rate_prototype)}(undef, stages)

src/caches/sra_caches.jl

@@ -344,7 +344,7 @@ struct SRAConstantCache{VType1, VType2, MType, uType} <: StochasticDiffEqConstan
 end
 
 function SRAConstantCache(tableau, rate_prototype)
-    @unpack c₀, c₁, A₀, B₀, α, β₁, β₂ = tableau
+    (; c₀, c₁, A₀, B₀, α, β₁, β₂) = tableau
     stages = length(α)
     H0 = Vector{typeof(rate_prototype)}(undef, stages)
     SRAConstantCache(c₀, c₁, A₀', B₀', α, β₁, β₂, stages, H0)

src/dense.jl

@@ -105,7 +105,7 @@ Get the value at tvals where the solution is known at the
 times ts (sorted), with values timeseries and derivatives ks
 """
 function sde_interpolation(tvals, id, idxs, deriv, p, continuity::Symbol = :left)
-    @unpack ts, timeseries = id
+    (; ts, timeseries) = id
     @inbounds tdir = sign(ts[end]-ts[1])
     idx = sortperm(tvals, rev = tdir<0)
 
@@ -150,7 +150,7 @@ Get the value at tval where the solution is known at the
 times ts (sorted), with values timeseries and derivatives ks
 """
 function sde_interpolation(tval::Number, id, idxs, deriv, p, continuity::Symbol = :left)
-    @unpack ts, timeseries = id
+    (; ts, timeseries) = id
     @inbounds tdir = sign(ts[end]-ts[1])
 
     if continuity === :left
@@ -177,7 +177,7 @@ end
 
 function sde_interpolation!(
         out, tval::Number, id, idxs, deriv, p, continuity::Symbol = :left)
-    @unpack ts, timeseries = id
+    (; ts, timeseries) = id
     @inbounds tdir = sign(ts[end]-ts[1])
 
     if continuity === :left
@@ -203,7 +203,7 @@ function sde_interpolation!(
 end
 
 function sde_interpolation!(vals, tvals, id, idxs, deriv, p, continuity::Symbol = :left)
-    @unpack ts, timeseries = id
+    (; ts, timeseries) = id
     @inbounds tdir = sign(ts[end]-ts[1])
     idx = sortperm(tvals, rev = tdir<0)
 

src/iterated_integrals.jl

@@ -31,7 +31,7 @@ function get_iterated_I(dt, dW, dZ, alg::JDiagonal_oop, p = nothing, c = 1, γ =
 end
 
 function get_iterated_I!(dt, dW, dZ, alg::JDiagonal_iip, p = nothing, c = 1, γ = 1//1)
-    @unpack J = alg
+    (; J) = alg
     if dW isa Number
         alg.J = 1//2 .* dW .^ 2
     else
@@ -46,7 +46,7 @@ function get_iterated_I(dt, dW, dZ, alg::JCommute_oop, p = nothing, c = 1, γ =
 end
 
 function get_iterated_I!(dt, dW, dZ, alg::JCommute_iip, p = nothing, c = 1, γ = 1//1)
-    @unpack J = alg
+    (; J) = alg
     mul!(J, vec(dW), vec(dW)')
     @.. J *= 1//2
     return nothing
@@ -76,7 +76,7 @@ end
 
 function get_iterated_I!(
         dt, dW, dZ, alg::IteratedIntegralAlgorithm_iip, p = nothing, c = 1, γ = 1//1)
-    @unpack J, levyalg = alg
+    (; J, levyalg) = alg
     if isnothing(p)
         ε = c * dt^(γ + 1//2)
         p = terms_needed(length(dW), dt, ε, levyalg, MaxL2())

src/perform_step/SROCK_perform_step.jl

@@ -1,5 +1,5 @@
 @muladd function perform_step!(integrator, cache::SROCK1ConstantCache)
-    @unpack t, dt, uprev, u, W, p, f = integrator
+    (; t, dt, uprev, u, W, p, f) = integrator
 
     alg = unwrap_alg(integrator, true)
     alg.eigen_est === nothing ? maxeig!(integrator, cache) : alg.eigen_est(integrator)
@@ -95,8 +95,8 @@
 end
 
 @muladd function perform_step!(integrator, cache::SROCK1Cache)
-    @unpack uᵢ₋₁, uᵢ₋₂, k, gₘ₋₁, gₘ₋₂ = cache
-    @unpack t, dt, uprev, u, W, p, f = integrator
+    (; uᵢ₋₁, uᵢ₋₂, k, gₘ₋₁, gₘ₋₂) = cache
+    (; t, dt, uprev, u, W, p, f) = integrator
     ccache = cache.constantcache
     alg = unwrap_alg(integrator, true)
     alg.eigen_est === nothing ? maxeig!(integrator, cache) : alg.eigen_est(integrator)
@@ -190,8 +190,8 @@ end
 end
 
 @muladd function perform_step!(integrator, cache::SROCK2ConstantCache)
-    @unpack t, dt, uprev, u, W, p, f = integrator
-    @unpack recf, recf2, mα, mσ, mτ = cache
+    (; t, dt, uprev, u, W, p, f) = integrator
+    (; recf, recf2, mα, mσ, mτ) = cache
 
     gen_prob = !((is_diagonal_noise(integrator.sol.prob)) || (W.dW isa Number) ||
                  (length(W.dW) == 1))
@@ -323,11 +323,11 @@ end
 end
 
 @muladd function perform_step!(integrator, cache::SROCK2Cache)
-    @unpack uᵢ, uₓ, uᵢ₋₁, uᵢ₋₂, k, Gₛ, Gₛ₁, vec_χ, WikRange = cache
+    (; uᵢ, uₓ, uᵢ₋₁, uᵢ₋₂, k, Gₛ, Gₛ₁, vec_χ, WikRange) = cache
 
-    @unpack t, dt, uprev, u, W, p, f = integrator
+    (; t, dt, uprev, u, W, p, f) = integrator
 
-    @unpack recf, recf2, mα, mσ, mτ = cache.constantcache
+    (; recf, recf2, mα, mσ, mτ) = cache.constantcache
     ccache = cache.constantcache
     gen_prob = !((is_diagonal_noise(integrator.sol.prob)) || (W.dW isa Number) ||
                  (length(W.dW) == 1))
@@ -476,7 +476,7 @@ end
 end
 
 @muladd function perform_step!(integrator, cache::SROCKEMConstantCache)
-    @unpack t, dt, uprev, u, W, p, f = integrator
+    (; t, dt, uprev, u, W, p, f) = integrator
 
     alg = unwrap_alg(integrator, true)
     alg.eigen_est === nothing ? maxeig!(integrator, cache) : alg.eigen_est(integrator)
@@ -567,8 +567,8 @@ end
 end
 
 @muladd function perform_step!(integrator, cache::SROCKEMCache)
-    @unpack uᵢ₋₁, uᵢ₋₂, tmp, k, Gₛ, Gₛ₁, WikRange = cache
-    @unpack t, dt, uprev, u, W, p, f = integrator
+    (; uᵢ₋₁, uᵢ₋₂, tmp, k, Gₛ, Gₛ₁, WikRange) = cache
+    (; t, dt, uprev, u, W, p, f) = integrator
     ccache = cache.constantcache
     alg = unwrap_alg(integrator, true)
     alg.eigen_est === nothing ? maxeig!(integrator, cache) : alg.eigen_est(integrator)
@@ -662,7 +662,7 @@ end
 end
 
 @muladd function perform_step!(integrator, cache::SKSROCKConstantCache)
-    @unpack t, dt, uprev, u, W, p, f = integrator
+    (; t, dt, uprev, u, W, p, f) = integrator
 
     alg = unwrap_alg(integrator, true)
     alg.eigen_est === nothing ? maxeig!(integrator, cache) : alg.eigen_est(integrator)
@@ -747,8 +747,8 @@ end
 end
 
 @muladd function perform_step!(integrator, cache::SKSROCKCache)
-    @unpack uᵢ₋₁, uᵢ₋₂, k, Gₛ, WikRange = cache
-    @unpack t, dt, uprev, u, W, p, f = integrator
+    (; uᵢ₋₁, uᵢ₋₂, k, Gₛ, WikRange) = cache
+    (; t, dt, uprev, u, W, p, f) = integrator
 
     ccache = cache.constantcache
     alg = unwrap_alg(integrator, true)
@@ -838,8 +838,8 @@ end
 end
 
 @muladd function perform_step!(integrator, cache::TangXiaoSROCK2ConstantCache)
-    @unpack t, dt, uprev, u, W, p, f = integrator
-    @unpack recf, recf2, mα, mσ, mτ, mn̂, c1, c2 = cache
+    (; t, dt, uprev, u, W, p, f) = integrator
+    (; recf, recf2, mα, mσ, mτ, mn̂, c1, c2) = cache
 
     n̂ = mn̂[integrator.alg.version_num]
 
@@ -1000,9 +1000,9 @@ end
 end
 
 @muladd function perform_step!(integrator, cache::TangXiaoSROCK2Cache)
-    @unpack uᵢ, uₓ, uᵢ₋₁, uᵢ₋₂, Û₁, Û₂, k, Gₛ, Gₛ₁ = cache
-    @unpack t, dt, uprev, u, W, p, f = integrator
-    @unpack recf, recf2, mα, mσ, mτ, mn̂, c1, c2 = cache.constantcache
+    (; uᵢ, uₓ, uᵢ₋₁, uᵢ₋₂, Û₁, Û₂, k, Gₛ, Gₛ₁) = cache
+    (; t, dt, uprev, u, W, p, f) = integrator
+    (; recf, recf2, mα, mσ, mτ, mn̂, c1, c2) = cache.constantcache
 
     n̂ = mn̂[integrator.alg.version_num]
     ccache = cache.constantcache
@@ -1148,8 +1148,8 @@ end
 end
 
 @muladd function perform_step!(integrator, cache::KomBurSROCK2ConstantCache)
-    @unpack t, dt, uprev, u, W, p, f = integrator
-    @unpack recf, mσ, mτ, mδ = cache
+    (; t, dt, uprev, u, W, p, f) = integrator
+    (; recf, mσ, mτ, mδ) = cache
 
     gen_prob = !((is_diagonal_noise(integrator.sol.prob)) || (W.dW isa Number) ||
                  (length(W.dW) == 1))
@@ -1345,10 +1345,10 @@ end
 end
 
 @muladd function perform_step!(integrator, cache::KomBurSROCK2Cache)
-    @unpack utmp, uᵢ₋₁, uᵢ₋₂, k, yₛ₋₁, yₛ₋₂, yₛ₋₃, SXₛ₋₁, SXₛ₋₂,
-    SXₛ₋₃, Gₛ, Xₛ₋₁, Xₛ₋₂, Xₛ₋₃, vec_χ = cache
-    @unpack t, dt, uprev, u, W, p, f = integrator
-    @unpack recf, mσ, mτ, mδ = cache.constantcache
+    (; utmp, uᵢ₋₁, uᵢ₋₂, k, yₛ₋₁, yₛ₋₂, yₛ₋₃, SXₛ₋₁, SXₛ₋₂,
+    SXₛ₋₃, Gₛ, Xₛ₋₁, Xₛ₋₂, Xₛ₋₃, vec_χ) = cache
+    (; t, dt, uprev, u, W, p, f) = integrator
+    (; recf, mσ, mτ, mδ) = cache.constantcache
 
     ccache = cache.constantcache
     gen_prob = !((is_diagonal_noise(integrator.sol.prob)) || (W.dW isa Number) ||
@@ -1572,8 +1572,8 @@ end
 end
 
 @muladd function perform_step!(integrator, cache::SROCKC2ConstantCache)
-    @unpack t, dt, uprev, u, W, p, f = integrator
-    @unpack recf, mσ, mτ = cache
+    (; t, dt, uprev, u, W, p, f) = integrator
+    (; recf, mσ, mτ) = cache
 
     alg = unwrap_alg(integrator, true)
     alg.eigen_est === nothing ? maxeig!(integrator, cache) : alg.eigen_est(integrator)
@@ -1655,10 +1655,10 @@ end
 end
 
 @muladd function perform_step!(integrator, cache::SROCKC2Cache)
-    @unpack uᵢ, tmp, uᵢ₋₁, uᵢ₋₂, k, Gₛ, Gₛ₁, WikRange = cache
-    @unpack t, dt, uprev, u, W, p, f = integrator
+    (; uᵢ, tmp, uᵢ₋₁, uᵢ₋₂, k, Gₛ, Gₛ₁, WikRange) = cache
+    (; t, dt, uprev, u, W, p, f) = integrator
 
-    @unpack recf, mσ, mτ = cache.constantcache
+    (; recf, mσ, mτ) = cache.constantcache
     ccache = cache.constantcache
 
     alg = unwrap_alg(integrator, true)

src/perform_step/dynamical.jl

@@ -12,7 +12,7 @@ function throwex(integrator)
 end
 
 function initialize!(integrator, cache::BAOABConstantCache)
-    @unpack t, dt, uprev, u, p, W = integrator
+    (; t, dt, uprev, u, p, W) = integrator
     du1 = integrator.uprev.x[1]
     u1 = integrator.uprev.x[2]
 
@@ -21,7 +21,7 @@ function initialize!(integrator, cache::BAOABConstantCache)
 end
 
 function initialize!(integrator, cache::BAOABCache)
-    @unpack t, dt, uprev, u, p, W = integrator
+    (; t, dt, uprev, u, p, W) = integrator
     du1 = integrator.uprev.x[1]
     u1 = integrator.uprev.x[2]
 
@@ -30,8 +30,8 @@ function initialize!(integrator, cache::BAOABCache)
 end
 
 @muladd function perform_step!(integrator, cache::BAOABConstantCache)
-    @unpack t, dt, sqdt, uprev, u, p, W, f = integrator
-    @unpack half, c1, c2 = cache
+    (; t, dt, sqdt, uprev, u, p, W, f) = integrator
+    (; half, c1, c2) = cache
     du1 = uprev.x[1]
     u1 = uprev.x[2]
 
@@ -56,8 +56,8 @@ end
 end
 
 @muladd function perform_step!(integrator, cache::BAOABCache)
-    @unpack t, dt, sqdt, uprev, u, p, W, f = integrator
-    @unpack utmp, dutmp, k, gtmp, noise, half, c1, c2 = cache
+    (; t, dt, sqdt, uprev, u, p, W, f) = integrator
+    (; utmp, dutmp, k, gtmp, noise, half, c1, c2) = cache
     du1 = uprev.x[1]
     u1 = uprev.x[2]