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 ForwardDiff jacobian! stats #2472

Merged
merged 1 commit into from
Sep 19, 2024
Merged

fix ForwardDiff jacobian! stats #2472

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/OrdinaryDiffEqDifferentiation/src/derivative_wrappers.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ function jacobian!(J::AbstractMatrix{<:Number}, f, x::AbstractArray{<:Number},
else
forwarddiff_color_jacobian!(J, f, x, jac_config)
end
OrdinaryDiffEqCore.increment_nf!(integrator.stats, 1)
OrdinaryDiffEqCore.increment_nf!(integrator.stats, maximum(jac_config.colorvec))
elseif alg_autodiff(alg) isa AutoFiniteDiff
isforward = alg_difftype(alg) === Val{:forward}
if isforward
Expand Down
98 changes: 23 additions & 75 deletions test/interface/stats_tests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,84 +5,32 @@ function f(u, p, t)
x[] += 1
return 5 * u
end
u0 = [1.0, 1.0]
tspan = (0.0, 1.0)
prob = ODEProblem(f, u0, tspan)

x[] = 0
sol = solve(prob, Vern7())
@test x[] == sol.stats.nf

x[] = 0
sol = solve(prob, Vern8())
@test x[] == sol.stats.nf

x[] = 0
sol = solve(prob, Vern9())
@test x[] == sol.stats.nf

x[] = 0
sol = solve(prob, Tsit5())
@test x[] == sol.stats.nf

x[] = 0
sol = solve(prob, BS3())
@test x[] == sol.stats.nf

x[] = 0
sol = solve(prob, KenCarp4(; autodiff = true))
@test x[] == sol.stats.nf

x[] = 0
sol = solve(prob, KenCarp4(; autodiff = false, diff_type = Val{:forward}))
@test x[] == sol.stats.nf

x[] = 0
sol = solve(prob, KenCarp4(; autodiff = false, diff_type = Val{:central}))
@test x[] == sol.stats.nf

x[] = 0
sol = solve(prob, KenCarp4(; autodiff = false, diff_type = Val{:complex}))
@test x[] == sol.stats.nf

x[] = 0
sol = solve(prob, Rosenbrock23(; autodiff = true))
@test x[] == sol.stats.nf

x[] = 0
sol = solve(prob, Rosenbrock23(; autodiff = false, diff_type = Val{:forward}))
@test x[] == sol.stats.nf

x[] = 0
sol = solve(prob, Rosenbrock23(; autodiff = false, diff_type = Val{:central}))
@test x[] == sol.stats.nf

x[] = 0
sol = solve(prob, Rosenbrock23(; autodiff = false, diff_type = Val{:complex}))
@test x[] == sol.stats.nf

x[] = 0
sol = solve(prob, Rodas5(; autodiff = true))
@test x[] == sol.stats.nf

x[] = 0
sol = solve(prob, Rodas5(; autodiff = false, diff_type = Val{:forward}))
@test x[] == sol.stats.nf

x[] = 0
sol = solve(prob, Rodas5(; autodiff = false, diff_type = Val{:central}))
@test x[] == sol.stats.nf

x[] = 0
sol = solve(prob, Rodas5(; autodiff = false, diff_type = Val{:complex}))
@test x[] == sol.stats.nf

function g(du, u, p, t)
x[] += 1
@. du = 5 * u
end

u0 = [1.0, 1.0]
tspan = (0.0, 1.0)
probop = ODEProblem(f, u0, tspan)
probip = ODEProblem(g, u0, tspan)

x[] = 0
sol = solve(probip, ROCK4())
@test x[] == sol.stats.nf
@testset "stats_tests" begin
@testset "$prob" for prob in [probop, probip]
@testset "$alg" for alg in [BS3, Tsit5, Vern7, Vern9, ROCK4]
x[] = 0
sol = solve(prob, alg())
@test x[] == sol.stats.nf
end
@testset "$alg" for alg in [Rodas5P, KenCarp4]
@testset "$kwargs" for kwargs in [(autodiff = true,),
(autodiff = false, diff_type = Val{:forward}),
(autodiff = false, diff_type = Val{:central}),
(autodiff = false, diff_type = Val{:complex}),]
x[] = 0
sol = solve(prob, alg(;kwargs...))
@test x[] == sol.stats.nf
end
end
end
end
Loading