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

Draft: trial better ode wrapper #859

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

Draft: trial better ode wrapper #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9112637
Wrap ODE functions in a fully transparent wrapper function
oscardssmith Nov 11, 2024
67b0cc3
simplify
oscardssmith Nov 12, 2024
d93e431
fix
oscardssmith Nov 12, 2024
39bd54a
fix
oscardssmith Nov 13, 2024
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
6 changes: 5 additions & 1 deletion src/problems/ode_problems.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,11 @@ function ODEProblem(f, u0, tspan, p = NullParameters(); kwargs...)
iip = isinplace(f, 4)
_u0 = prepare_initial_state(u0)
_tspan = promote_tspan(tspan)
_f = ODEFunction{iip, DEFAULT_SPECIALIZATION}(f)
_f = if iip
ODEFunction{iip, FullSpecialize}(DUMB_WRAPPER(first(_tspan), ODE_F_WRAPPER(f)))
else
_f = ODEFunction{iip, DEFAULT_SPECIALIZATION}(f)
end
ODEProblem(_f, _u0, _tspan, p; kwargs...)
end

Expand Down
21 changes: 20 additions & 1 deletion src/scimlfunctions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2415,8 +2415,27 @@ end
(f::BVPFunction)(args...) = f.f(args...)
(f::DynamicalBVPFunction)(args...) = f.f(args...)

######### Basic Constructor
#### fun hack to make NOSPECIALIZE fast
mutable struct ODE_F_WRAPPER{F}
const f::F
end
mutable struct DUMB_WRAPPER{P, T}
p::P
t::T
f::ODE_F_WRAPPER
end
function (w::ODE_F_WRAPPER)(out, u, d::DUMB_WRAPPER)
w.f(out, u, d.p, d.t)
return nothing
end
function (w::DUMB_WRAPPER)(out, u, p, t)
w.p = p
w.t = t
w.f(out, u, w)
return nothing
end

######### Basic Constructor
function ODEFunction{iip, specialize}(f;
mass_matrix = __has_mass_matrix(f) ? f.mass_matrix :
I,
Expand Down
Loading