Skip to content

switch destats to stats #398

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

Merged
merged 1 commit into from
Mar 14, 2023
Merged

switch destats to stats #398

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 Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ CEnum = "0.2, 0.3, 0.4"
DataStructures = "0.18"
DiffEqBase = "6.44"
Reexport = "0.2, 1.0"
SciMLBase = "1.71"
SciMLBase = "1.89"
SnoopPrecompile = "1"
Sundials_jll = "5.2"
julia = "1.6"
Expand Down
66 changes: 33 additions & 33 deletions src/common_interface/solve.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ function DiffEqBase.__init(prob::DiffEqBase.AbstractODEProblem{uType, tupType, i
dures) :
DiffEqBase.LinearInterpolation(ts, ures),
timeseries_errors = timeseries_errors,
destats = DiffEqBase.DEStats(0),
stats = DiffEqBase.Stats(0),
calculate_error = false)
opts = DEOptions(saveat_internal,
tstops_internal,
Expand Down Expand Up @@ -905,7 +905,7 @@ function DiffEqBase.__init(prob::DiffEqBase.AbstractODEProblem{uType, tupType, i
dures) :
DiffEqBase.LinearInterpolation(ts, ures),
timeseries_errors = timeseries_errors,
destats = DiffEqBase.DEStats(0),
stats = DiffEqBase.Stats(0),
calculate_error = false)
opts = DEOptions(saveat_internal,
tstops_internal,
Expand Down Expand Up @@ -1337,7 +1337,7 @@ function DiffEqBase.__init(prob::DiffEqBase.AbstractDAEProblem{uType, duType, tu
calculate_error = false,
timeseries_errors = timeseries_errors,
retcode = retcode,
destats = DiffEqBase.DEStats(0),
stats = DiffEqBase.Stats(0),
dense_errors = dense_errors)

opts = DEOptions(saveat_internal,
Expand Down Expand Up @@ -1526,7 +1526,7 @@ function DiffEqBase.solve!(integrator::AbstractSundialsIntegrator; early_free =
progress="done")
end

fill_destats!(integrator)
fill_stats!(integrator)

if early_free
empty!(integrator.mem)
Expand Down Expand Up @@ -1559,73 +1559,73 @@ function handle_tstop!(integrator::AbstractSundialsIntegrator)
end
end

function fill_destats!(integrator::AbstractSundialsIntegrator) end
function fill_stats!(integrator::AbstractSundialsIntegrator) end

function fill_destats!(integrator::CVODEIntegrator)
destats = integrator.sol.destats
function fill_stats!(integrator::CVODEIntegrator)
stats = integrator.sol.stats
mem = integrator.mem
tmp = Ref(Clong(-1))
CVodeGetNumRhsEvals(mem, tmp)
destats.nf = tmp[]
stats.nf = tmp[]
CVodeGetNumLinSolvSetups(mem, tmp)
destats.nw = tmp[]
stats.nw = tmp[]
CVodeGetNumErrTestFails(mem, tmp)
destats.nreject = tmp[]
stats.nreject = tmp[]
CVodeGetNumSteps(mem, tmp)
destats.naccept = tmp[] - destats.nreject
stats.naccept = tmp[] - stats.nreject
CVodeGetNumNonlinSolvIters(mem, tmp)
destats.nnonliniter = tmp[]
stats.nnonliniter = tmp[]
CVodeGetNumNonlinSolvConvFails(mem, tmp)
destats.nnonlinconvfail = tmp[]
stats.nnonlinconvfail = tmp[]
if method_choice(integrator.alg) == :Newton
CVodeGetNumJacEvals(mem, tmp)
destats.njacs = tmp[]
stats.njacs = tmp[]
end
end

function fill_destats!(integrator::ARKODEIntegrator)
destats = integrator.sol.destats
function fill_stats!(integrator::ARKODEIntegrator)
stats = integrator.sol.stats
mem = integrator.mem
tmp = Ref(Clong(-1))
tmp2 = Ref(Clong(-1))
ARKStepGetNumRhsEvals(mem, tmp, tmp2)
destats.nf = tmp[]
destats.nf2 = tmp2[]
stats.nf = tmp[]
stats.nf2 = tmp2[]
integrator.alg.stiffness !== Explicit() && ARKStepGetNumLinSolvSetups(mem, tmp)
destats.nw = tmp[]
stats.nw = tmp[]
ARKStepGetNumErrTestFails(mem, tmp)
destats.nreject = tmp[]
stats.nreject = tmp[]
ARKStepGetNumSteps(mem, tmp)
destats.naccept = tmp[] - destats.nreject
stats.naccept = tmp[] - stats.nreject
integrator.alg.stiffness !== Explicit() && ARKStepGetNumNonlinSolvIters(mem, tmp)
destats.nnonliniter = tmp[]
stats.nnonliniter = tmp[]
integrator.alg.stiffness !== Explicit() && ARKStepGetNumNonlinSolvConvFails(mem, tmp)
destats.nnonlinconvfail = tmp[]
stats.nnonlinconvfail = tmp[]
if integrator.alg.stiffness !== Explicit() && method_choice(integrator.alg) == :Newton
ARKStepGetNumJacEvals(mem, tmp)
destats.njacs = tmp[]
stats.njacs = tmp[]
end
end

function fill_destats!(integrator::IDAIntegrator)
destats = integrator.sol.destats
function fill_stats!(integrator::IDAIntegrator)
stats = integrator.sol.stats
mem = integrator.mem
tmp = Ref(Clong(-1))
IDAGetNumResEvals(mem, tmp)
destats.nf = tmp[]
stats.nf = tmp[]
IDAGetNumLinSolvSetups(mem, tmp)
destats.nw = tmp[]
stats.nw = tmp[]
IDAGetNumErrTestFails(mem, tmp)
destats.nreject = tmp[]
stats.nreject = tmp[]
IDAGetNumSteps(mem, tmp)
destats.naccept = tmp[] - destats.nreject
stats.naccept = tmp[] - stats.nreject
IDAGetNumNonlinSolvIters(mem, tmp)
destats.nnonliniter = tmp[]
stats.nnonliniter = tmp[]
IDAGetNumNonlinSolvConvFails(mem, tmp)
destats.nnonlinconvfail = tmp[]
stats.nnonlinconvfail = tmp[]
if method_choice(integrator.alg) == :Newton
IDAGetNumJacEvals(mem, tmp)
destats.njacs = tmp[]
stats.njacs = tmp[]
end
end

Expand Down
2 changes: 1 addition & 1 deletion test/common_interface/callbacks.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ du₀ = [0.0, 0.0, 0.0]
p = [0.04, 3.0e7, 1.0e4, 1.0]
tspan = (0.0, 100.0)
differential_vars = BitVector([true, true, false])
bvcond(u, t, integrator) = t-round(t)
bvcond(u, t, integrator) = t - round(t)
bvaffect!(integrator) = integrator.p[4] = 2.0
cb = ContinuousCallback(bvcond, bvaffect!)
prob = DAEProblem(fbv, du₀, u₀, tspan, p, differential_vars = differential_vars)
Expand Down
4 changes: 2 additions & 2 deletions test/common_interface/precs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,5 +127,5 @@ sol2 = solve(prob_ode_brusselator_2d,
sol3 = solve(prob_ode_brusselator_2d,
CVODE_BDF(; linear_solver = :GMRES, prec = precamg, psetup = psetupamg,
prec_side = 1); save_everystep = false);
@test sol1.destats.nf > sol2.destats.nf
@test sol1.destats.nf > sol3.destats.nf
@test sol1.stats.nf > sol2.stats.nf
@test sol1.stats.nf > sol3.stats.nf