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

fix: fix eager initialization in remake #911

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: fix eager initialization in remake #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
932822c
fix: fix eager initialization in `remake`
AayushSabharwal Jan 18, 2025
403f536
fix: implement `SII.is_time_dependent` for problem types
AayushSabharwal Jan 20, 2025
2878163
test: test eager initialization when `tspan == (nothing, nothing)`
AayushSabharwal Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/problems/problem_utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,3 +180,6 @@ function Base.summary(io::IO, prob::AbstractPDEProblem)
end

Base.copy(p::SciMLBase.NullParameters) = p

SymbolicIndexingInterface.is_time_dependent(::AbstractDEProblem) = true
SymbolicIndexingInterface.is_time_dependent(::AbstractNonlinearProblem) = false
109 changes: 37 additions & 72 deletions src/remake.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,18 +256,9 @@ function remake(prob::ODEProblem; f = missing,
ODEProblem{iip}(f, newu0, tspan, newp, prob.problem_type; kwargs...)
end

if lazy_initialization === nothing
lazy_initialization = !is_trivial_initialization(initialization_data)
end
if initialization_data !== nothing && !lazy_initialization
u0, p, _ = get_initial_values(
prob, prob, prob.f, OverrideInit(), Val(isinplace(prob)))
if u0 !== nothing && eltype(u0) == Any && isempty(u0)
u0 = nothing
end
@reset prob.u0 = u0
@reset prob.p = p
end
u0, p = maybe_eager_initialize_problem(prob, initialization_data, lazy_initialization)
@reset prob.u0 = u0
@reset prob.p = p

return prob
end
Expand Down Expand Up @@ -451,18 +442,10 @@ function remake(prob::SDEProblem;
else
SDEProblem{iip}(f, newu0, tspan, newp; noise, noise_rate_prototype, seed, kwargs...)
end
if lazy_initialization === nothing
lazy_initialization = !is_trivial_initialization(initialization_data)
end
if initialization_data !== nothing && !lazy_initialization
u0, p, _ = get_initial_values(
prob, prob, prob.f, OverrideInit(), Val(isinplace(prob)))
if u0 !== nothing && eltype(u0) == Any && isempty(u0)
u0 = nothing
end
@reset prob.u0 = u0
@reset prob.p = p
end

u0, p = maybe_eager_initialize_problem(prob, initialization_data, lazy_initialization)
@reset prob.u0 = u0
@reset prob.p = p

return prob
end
Expand Down Expand Up @@ -517,18 +500,10 @@ function remake(prob::DDEProblem; f = missing, h = missing, u0 = missing,
DDEProblem{iip}(f, newu0, h, tspan, newp; constant_lags, dependent_lags,
order_discontinuity_t0, neutral, kwargs...)
end
if lazy_initialization === nothing
lazy_initialization = !is_trivial_initialization(initialization_data)
end
if initialization_data !== nothing && !lazy_initialization
u0, p, _ = get_initial_values(
prob, prob, prob.f, OverrideInit(), Val(isinplace(prob)))
if u0 !== nothing && eltype(u0) == Any && isempty(u0)
u0 = nothing
end
@reset prob.u0 = u0
@reset prob.p = p
end

u0, p = maybe_eager_initialize_problem(prob, initialization_data, lazy_initialization)
@reset prob.u0 = u0
@reset prob.p = p

return prob
end
Expand Down Expand Up @@ -615,18 +590,9 @@ function remake(prob::SDDEProblem;
dependent_lags, order_discontinuity_t0, neutral, kwargs...)
end

if lazy_initialization === nothing
lazy_initialization = !is_trivial_initialization(initialization_data)
end
if initialization_data !== nothing && !lazy_initialization
u0, p, _ = get_initial_values(
prob, prob, prob.f, OverrideInit(), Val(isinplace(prob)))
if u0 !== nothing && eltype(u0) == Any && isempty(u0)
u0 = nothing
end
@reset prob.u0 = u0
@reset prob.p = p
end
u0, p = maybe_eager_initialize_problem(prob, initialization_data, lazy_initialization)
@reset prob.u0 = u0
@reset prob.p = p

return prob
end
Expand Down Expand Up @@ -736,18 +702,9 @@ function remake(prob::NonlinearProblem;
problem_type = problem_type; kwargs...)
end

if lazy_initialization === nothing
lazy_initialization = !is_trivial_initialization(initialization_data)
end
if initialization_data !== nothing && !lazy_initialization
u0, p, _ = get_initial_values(
prob, prob, prob.f, OverrideInit(), Val(isinplace(prob)))
if u0 !== nothing && eltype(u0) == Any && isempty(u0)
u0 = nothing
end
@reset prob.u0 = u0
@reset prob.p = p
end
u0, p = maybe_eager_initialize_problem(prob, initialization_data, lazy_initialization)
@reset prob.u0 = u0
@reset prob.p = p

return prob
end
Expand Down Expand Up @@ -786,18 +743,9 @@ function remake(prob::NonlinearLeastSquaresProblem; f = missing, u0 = missing, p
f, u0 = newu0, p = newp, kwargs...)
end

if lazy_initialization === nothing
lazy_initialization = !is_trivial_initialization(initialization_data)
end
if initialization_data !== nothing && !lazy_initialization
u0, p, _ = get_initial_values(
prob, prob, prob.f, OverrideInit(), Val(isinplace(prob)))
if u0 !== nothing && eltype(u0) == Any && isempty(u0)
u0 = nothing
end
@reset prob.u0 = u0
@reset prob.p = p
end
u0, p = maybe_eager_initialize_problem(prob, initialization_data, lazy_initialization)
@reset prob.u0 = u0
@reset prob.p = p

return prob
end
Expand Down Expand Up @@ -1125,6 +1073,23 @@ function process_p_u0_symbolic(prob, p, u0)
end
end

function maybe_eager_initialize_problem(prob::AbstractSciMLProblem, initialization_data, lazy_initialization::Union{Nothing, Bool})
if lazy_initialization === nothing
lazy_initialization = !is_trivial_initialization(initialization_data)
end
if initialization_data !== nothing && !lazy_initialization && (!is_time_dependent(prob) || current_time(prob) !== nothing)
u0, p, _ = get_initial_values(
prob, prob, prob.f, OverrideInit(), Val(isinplace(prob)))
if u0 !== nothing && eltype(u0) == Any && isempty(u0)
u0 = nothing
end
else
u0 = state_values(prob)
p = parameter_values(prob)
end
return u0, p
end

function remake(thing::AbstractJumpProblem; kwargs...)
parameterless_type(thing)(remake(thing.prob; kwargs...))
end
Expand Down
10 changes: 9 additions & 1 deletion test/initialization.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,10 @@ end
@testset "Trivial initialization" begin
initprob = NonlinearProblem(Returns(nothing), nothing, [1.0])
update_initializeprob! = function (iprob, integ)
iprob.p[1] = integ.u[1]
# just to access the current time and use it as a number, so this errors
# if run on a problem with `current_time(prob) === nothing`
iprob.p[1] = current_time(integ) + 1
iprob.p[1] = state_values(integ)[1]
end
initprobmap = function (nlsol)
u1 = parameter_values(nlsol)[1]
Expand All @@ -284,6 +287,11 @@ end
@test u0 ≈ [2.0, 2.0]
@test p ≈ 0.0
@test success

@testset "Doesn't run in `remake` if `tspan == (nothing, nothing)`" begin
prob = ODEProblem(fn, [2.0, 0.0], (nothing, nothing), 0.0)
@test_nowarn remake(prob)
end
end
end

Expand Down
Loading