Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions src/common.jl
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,9 @@ function solve(
verbose = alg.verbose
)
else
# Out-of-place path (unchanged, backward compatible)
f = (t, u) -> prob.f(u, p, t)
# Out-of-place path: residual must be 3-arg (t, u, du) for the DAE solver,
# mirroring the in-place F!(out, t, u, du) wiring above (was 2-arg ODE form).
f = (t, u, du) -> prob.f(du, u, p, t)

ts, timeseries, dus = dasslSolve(
f, u0, tspan,
Expand Down
30 changes: 15 additions & 15 deletions test/alloc_tests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,22 @@ using DASSL
using AllocCheck
using Test

# `@allocated expr` measured directly in a testset body runs at (non-const) global
# scope, which inflates the count above the function's true cost: a bits return value
# (e.g. a `Float64`) gets boxed, and escape analysis can't elide the `SubArray` wrapper
# of a returned view. Measuring inside a specialized function barrier (typed-local args,
# direct call) reflects real call-site behavior. These stay strict zero-allocation
# guards: a genuine data copy still allocates inside the barrier (e.g. `x[1:n]` returns a
# fresh array), so a view->copy regression is still caught.
norm_allocs(v, wt) = (DASSL.dassl_norm(v, wt); @allocated DASSL.dassl_norm(v, wt))
hist_t_allocs(cache, ord) = (DASSL.get_history_t!(cache, ord); @allocated DASSL.get_history_t!(cache, ord))
hist_y_allocs(cache, ord) = (DASSL.get_history_y!(cache, ord); @allocated DASSL.get_history_y!(cache, ord))

@testset "Allocation Tests" begin
@testset "dassl_norm - zero allocations" begin
v = [1.0, 2.0, 3.0]
wt = [0.5, 0.5, 0.5]
# Warmup
DASSL.dassl_norm(v, wt)
# Test allocations
allocs = @allocated DASSL.dassl_norm(v, wt)
@test allocs == 0
@test norm_allocs(v, wt) == 0
end

@testset "_all_steps_equal - zero allocations" begin
Expand Down Expand Up @@ -163,16 +170,9 @@ using Test
DASSL.push_history!(cache, 0.1, y0 .+ 0.1, zeros(2))
DASSL.push_history!(cache, 0.2, y0 .+ 0.2, zeros(2))

# Warmup
DASSL.get_history_t!(cache, 2)
DASSL.get_history_y!(cache, 2)

# Test allocations - views into pre-allocated buffers should be zero-alloc
allocs = @allocated DASSL.get_history_t!(cache, 2)
@test allocs == 0

allocs = @allocated DASSL.get_history_y!(cache, 2)
@test allocs == 0
# Views into pre-allocated buffers should be zero-alloc (no data copy).
@test hist_t_allocs(cache, 2) == 0
@test hist_y_allocs(cache, 2) == 0
end

@testset "In-place stepper! allocation check" begin
Expand Down
16 changes: 16 additions & 0 deletions test/common.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,19 @@ prob = prob_dae_resrob
sol = solve(prob, dassl())

sol = solve(prob, dassl(), abstol = 1.0e-1, reltol = 1.0e-2)

# Out-of-place DAEProblem path: prob.f is the 4-arg residual (du, u, p, t). Regression
# test for the OOP wrapper, which previously called it as a 2-arg ODE RHS (t, u) and
# errored for every out-of-place DAE. Index-1 DAE: u1' = -u1, 0 = u1 - u2, so the exact
# solution is u1(t) = u2(t) = exp(-t).
@testset "Out-of-place DAEProblem" begin
dae_oop(du, u, p, t) = [du[1] + u[1], u[1] - u[2]]
u0 = [1.0, 1.0]
du0 = [-1.0, -1.0]
oop_prob = DAEProblem(dae_oop, du0, u0, (0.0, 1.0))
@test !DiffEqBase.isinplace(oop_prob) # confirm the OOP branch is exercised
oop_sol = solve(oop_prob, dassl(), abstol = 1.0e-8, reltol = 1.0e-8)
@test oop_sol.retcode == ReturnCode.Success
@test isapprox(oop_sol.u[end][1], exp(-1); atol = 1.0e-5)
@test isapprox(oop_sol.u[end][2], exp(-1); atol = 1.0e-5) # algebraic constraint held
end
2 changes: 1 addition & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using DASSL, Test
using LinearAlgebra: diagm, I

const GROUP = get(ENV, "GROUP", "all")
const GROUP = let g = get(ENV, "GROUP", "all"); isempty(g) ? "all" : g end

if GROUP == "all" || GROUP == "core"
@testset "Testing maxorder" begin
Expand Down
Loading