Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add reinitialization map #641

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add reinitialization map #641

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 25 additions & 14 deletions src/scimlfunctions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ numerically-defined functions.
"""
struct ODEFunction{iip, specialize, F, TMM, Ta, Tt, TJ, JVP, VJP, JP, SP, TW, TWt, WP, TPJ,
O, TCV,
SYS, IProb, IProbMap} <: AbstractODEFunction{iip}
SYS, IProb, IProbMap, RProbMap} <: AbstractODEFunction{iip}
f::F
mass_matrix::TMM
analytic::Ta
Expand All @@ -421,6 +421,7 @@ struct ODEFunction{iip, specialize, F, TMM, Ta, Tt, TJ, JVP, VJP, JP, SP, TW, TW
sys::SYS
initializeprob::IProb
initializeprobmap::IProbMap
reinitializemap::RProbMap
end

@doc doc"""
Expand Down Expand Up @@ -1504,7 +1505,7 @@ automatically symbolically generating the Jacobian and more from the
numerically-defined functions.
"""
struct DAEFunction{iip, specialize, F, Ta, Tt, TJ, JVP, VJP, JP, SP, TW, TWt, TPJ, O, TCV,
SYS, IProb, IProbMap} <:
SYS, IProb, IProbMap, RProbMap} <:
AbstractDAEFunction{iip}
f::F
analytic::Ta
Expand All @@ -1522,6 +1523,7 @@ struct DAEFunction{iip, specialize, F, Ta, Tt, TJ, JVP, VJP, JP, SP, TW, TWt, TP
sys::SYS
initializeprob::IProb
initializeprobmap::IProbMap
reinitializemap::RProbMap
end

"""
Expand Down Expand Up @@ -2248,6 +2250,7 @@ function ODEFunction{iip, specialize}(f;
sys = __has_sys(f) ? f.sys : nothing,
initializeprob = __has_initializeprob(f) ? f.initializeprob : nothing,
initializeprobmap = __has_initializeprobmap(f) ? f.initializeprobmap : nothing
reinitializemap = __has_reinitializemap(f) ? f.reinitializemap : nothing
) where {iip,
specialize
}
Expand Down Expand Up @@ -2308,7 +2311,7 @@ function ODEFunction{iip, specialize}(f;
typeof(sys), Any, Any}(_f, mass_matrix, analytic, tgrad, jac,
jvp, vjp, jac_prototype, sparsity, Wfact,
Wfact_t, W_prototype, paramjac,
observed, _colorvec, sys, initializeprob, initializeprobmap)
observed, _colorvec, sys, initializeprob, initializeprobmap, reinitializemap)
elseif specialize === false
ODEFunction{iip, FunctionWrapperSpecialize,
typeof(_f), typeof(mass_matrix), typeof(analytic), typeof(tgrad),
Expand All @@ -2318,10 +2321,11 @@ function ODEFunction{iip, specialize}(f;
typeof(observed),
typeof(_colorvec),
typeof(sys), typeof(initializeprob),
typeof(initializeprobmap)}(_f, mass_matrix, analytic, tgrad, jac,
typeof(initializeprobmap), typeof(reinitializemap)}(
_f, mass_matrix, analytic, tgrad, jac,
jvp, vjp, jac_prototype, sparsity, Wfact,
Wfact_t, W_prototype, paramjac,
observed, _colorvec, sys, initializeprob, initializeprobmap)
observed, _colorvec, sys, initializeprob, initializeprobmap, reinitializemap)
else
ODEFunction{iip, specialize,
typeof(_f), typeof(mass_matrix), typeof(analytic), typeof(tgrad),
Expand All @@ -2331,10 +2335,10 @@ function ODEFunction{iip, specialize}(f;
typeof(observed),
typeof(_colorvec),
typeof(sys), typeof(initializeprob),
typeof(initializeprobmap)}(_f, mass_matrix, analytic, tgrad, jac,
typeof(initializeprobmap), typeof(reinitializemap)}(_f, mass_matrix, analytic, tgrad, jac,
jvp, vjp, jac_prototype, sparsity, Wfact,
Wfact_t, W_prototype, paramjac,
observed, _colorvec, sys, initializeprob, initializeprobmap)
observed, _colorvec, sys, initializeprob, initializeprobmap, reinitializemap)
end
end

Expand All @@ -2354,7 +2358,7 @@ function unwrapped_f(f::ODEFunction, newf = unwrapped_f(f.f))
typeof(f.sys), Any, Any}(newf, f.mass_matrix, f.analytic, f.tgrad, f.jac,
f.jvp, f.vjp, f.jac_prototype, f.sparsity, f.Wfact,
f.Wfact_t, f.W_prototype, f.paramjac,
f.observed, f.colorvec, f.sys, f.initializeprob, f.initializeprobmap)
f.observed, f.colorvec, f.sys, f.initializeprob, f.initializeprobmap, f.reinitializemap)
else
ODEFunction{isinplace(f), specialization(f), typeof(newf), typeof(f.mass_matrix),
typeof(f.analytic), typeof(f.tgrad),
Expand All @@ -2363,11 +2367,11 @@ function unwrapped_f(f::ODEFunction, newf = unwrapped_f(f.f))
typeof(f.paramjac),
typeof(f.observed), typeof(f.colorvec),
typeof(f.sys), typeof(f.initializeprob),
typeof(f.initializeprobmap)}(newf, f.mass_matrix, f.analytic, f.tgrad, f.jac,
typeof(f.initializeprobmap), typeof(f.reinitializemap)}(newf, f.mass_matrix, f.analytic, f.tgrad, f.jac,
f.jvp, f.vjp, f.jac_prototype, f.sparsity, f.Wfact,
f.Wfact_t, f.W_prototype, f.paramjac,
f.observed, f.colorvec, f.sys, f.initializeprob,
f.initializeprobmap)
f.initializeprobmap, f.reinitializemap)
end
end

Expand Down Expand Up @@ -3159,7 +3163,9 @@ function DAEFunction{iip, specialize}(f;
colorvec = __has_colorvec(f) ? f.colorvec : nothing,
sys = __has_sys(f) ? f.sys : nothing,
initializeprob = __has_initializeprob(f) ? f.initializeprob : nothing,
initializeprobmap = __has_initializeprobmap(f) ? f.initializeprobmap : nothing) where {
initializeprobmap = __has_initializeprobmap(f) ? f.initializeprobmap : nothing
reinitializemap = __has_reinitializemap(f) ? f.reinitializemap : nothing
) where {
iip,
specialize
}
Expand Down Expand Up @@ -3202,18 +3208,19 @@ function DAEFunction{iip, specialize}(f;
Any, typeof(_colorvec), Any, Any, Any}(_f, analytic, tgrad, jac, jvp,
vjp, jac_prototype, sparsity,
Wfact, Wfact_t, paramjac, observed,
_colorvec, sys, initializeprob, initializeprobmap)
_colorvec, sys, initializeprob, initializeprobmap, reinitializemap)
else
DAEFunction{iip, specialize, typeof(_f), typeof(analytic), typeof(tgrad),
typeof(jac), typeof(jvp), typeof(vjp), typeof(jac_prototype),
typeof(sparsity), typeof(Wfact), typeof(Wfact_t),
typeof(paramjac),
typeof(observed), typeof(_colorvec),
typeof(sys), typeof(initializeprob), typeof(initializeprobmap)}(
typeof(sys), typeof(initializeprob), typeof(initializeprobmap),
typeof(reinitializemap)}(
_f, analytic, tgrad, jac, jvp, vjp,
jac_prototype, sparsity, Wfact, Wfact_t,
paramjac, observed,
_colorvec, sys, initializeprob, initializeprobmap)
_colorvec, sys, initializeprob, initializeprobmap, reinitializemap)
end
end

Expand Down Expand Up @@ -3928,6 +3935,7 @@ __has_analytic_full(f) = isdefined(f, :analytic_full)
__has_resid_prototype(f) = isdefined(f, :resid_prototype)
__has_initializeprob(f) = isdefined(f, :initializeprob)
__has_initializeprobmap(f) = isdefined(f, :initializeprobmap)
__has_reinitializemap(f) = isdefined(f, :reinitializemap)

# compatibility
has_invW(f::AbstractSciMLFunction) = false
Expand All @@ -3946,6 +3954,9 @@ end
function has_initializeprobmap(f::AbstractSciMLFunction)
__has_initializeprobmap(f) && f.initializeprobmap !== nothing
end
function has_reinitializemap(f::AbstractSciMLFunction)
__has_reinitializemap(f) && f.reinitializemap !== nothing
end

function has_syms(f::AbstractSciMLFunction)
if __has_syms(f)
Expand Down