Skip to content

Safety make_zero! on repeated Enzyme calls with caches #1067

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 14 commits into from
May 19, 2025
Merged

Safety make_zero! on repeated Enzyme calls with caches #1067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e47e11c
Safety make_zero! on repeated Enzyme calls with caches
ChrisRackauckas Jun 9, 2024
79fc389
a few more
ChrisRackauckas Jun 10, 2024
332cb6c
revert failing make_zeros
ChrisRackauckas Jul 5, 2024
2497e9b
Only duplicate and make_zero! if enzyme func is non-constant
ChrisRackauckas Jul 14, 2024
ae84aab
Revert "Only duplicate and make_zero! if enzyme func is non-constant"
ChrisRackauckas Jul 21, 2024
555adcd
Update hybrid_de.jl
ChrisRackauckas May 18, 2025
bcb3e84
Make tprev mutable to make enzyme happy
ChrisRackauckas May 18, 2025
91ff0af
fix depwarns
ChrisRackauckas May 18, 2025
0bcdb53
some more mutability
ChrisRackauckas May 18, 2025
33b4904
try another
ChrisRackauckas May 18, 2025
239cbc0
handle differently
ChrisRackauckas May 18, 2025
7ae1d8c
finish the PR by allocating
ChrisRackauckas May 19, 2025
99de0e1
Revert "some more mutability"
ChrisRackauckas May 19, 2025
9f14a4f
Revert "Make tprev mutable to make enzyme happy"
ChrisRackauckas May 19, 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
6 changes: 3 additions & 3 deletions src/concrete_solve.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ function DiffEqBase._concrete_solve_adjoint(
(Δu[i] isa NoTangent || eltype(Δu) <: NoTangent) && return
if Δ isa AbstractArray{<:AbstractArray} || Δ isa AbstractVectorOfArray ||
Δ isa Tangent
x = (Δ isa AbstractVectorOfArray || Δ isa Tangent) ? Δu[i] : Δ[i]
x = Δ isa AbstractVectorOfArray ? Δu.u[i] : (Δ isa Tangent ? Δu[i] : Δ[i])
if _save_idxs isa Number
_out[_save_idxs] = x[_save_idxs]
elseif _save_idxs isa Colon
Expand Down Expand Up @@ -1681,8 +1681,8 @@ function DiffEqBase._concrete_solve_adjoint(prob::SciMLBase.AbstractODEProblem,

function adjoint_sensitivity_backpass(Δ)
function df(_out, u, p, t, i)
if Δ isa AbstractArray{<:AbstractArray} || Δ isa AbstractVectorOfArray
x = Δ isa AbstractVectorOfArray ? Δ.u[i] : Δ[i]
if Δ isa AbstractArray{<:AbstractArray} Δ isa AbstractVectorOfArray || Δ isa Tangent
x = (Δ isa AbstractVectorOfArray || Δ isa Tangent) ? unthunk(Δ.u[i]) : Δ[i]
if _save_idxs isa Number
_out[_save_idxs] = x[_save_idxs]
elseif _save_idxs isa Colon
Expand Down
9 changes: 7 additions & 2 deletions src/derivative_wrappers.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ function _vecjacobian!(dλ, y, λ, p, t, S::TS, isautojacvec::EnzymeVJP, dgrad,
ytmp = _tmp5
end

tmp1 .= 0 # should be removed for dλ
Enzyme.make_zero!(tmp1) # should be removed for dλ
vec(ytmp) .= vec(y)

#if dgrad !== nothing
Expand All @@ -707,13 +707,18 @@ function _vecjacobian!(dλ, y, λ, p, t, S::TS, isautojacvec::EnzymeVJP, dgrad,
#if dy !== nothing
# tmp3 = dy
#else
tmp3 .= 0
Enzyme.make_zero!(tmp3)
#end

vec(tmp4) .= vec(λ)

isautojacvec = get_jacvec(sensealg)

# Correctness over speed
# TODO: Get a fix for `make_zero!` to allow reusing zero'd memory
# https://github.com/EnzymeAD/Enzyme.jl/issues/2400
_tmp6 = Enzyme.make_zero(_tmp6)

if inplace_sensitivity(S)
if W === nothing
Enzyme.autodiff(Enzyme.Reverse, Enzyme.Duplicated(S.diffcache.pf, _tmp6),
Expand Down
8 changes: 7 additions & 1 deletion src/gauss_adjoint.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,13 @@ function vec_pjac!(out, λ, y, t, S::GaussIntegrand)
tmp3, tmp4, tmp6 = paramjac_config
vtmp4 = vec(tmp4)
vtmp4 .= λ
out .= 0
Enzyme.make_zero!(out)

# Correctness over speed
# TODO: Get a fix for `make_zero!` to allow reusing zero'd memory
# https://github.com/EnzymeAD/Enzyme.jl/issues/2400
tmp6 = Enzyme.make_zero(tmp6)

Enzyme.autodiff(
Enzyme.Reverse, Enzyme.Duplicated(pf, tmp6), Enzyme.Const,
Enzyme.Duplicated(tmp3, tmp4),
Expand Down
7 changes: 6 additions & 1 deletion src/quadrature_adjoint.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,12 @@ function vec_pjac!(out, λ, y, t, S::AdjointSensitivityIntegrand)
tmp3, tmp4, tmp6 = paramjac_config
vtmp4 = vec(tmp4)
vtmp4 .= λ
out .= 0
Enzyme.make_zero!(out)

# Correctness over speed
# TODO: Get a fix for `make_zero!` to allow reusing zero'd memory
# https://github.com/EnzymeAD/Enzyme.jl/issues/2400
tmp6 = Enzyme.make_zero(tmp6)
Enzyme.autodiff(
Enzyme.Reverse, Enzyme.Duplicated(pf, tmp6), Enzyme.Const,
Enzyme.Duplicated(tmp3, tmp4),
Expand Down
2 changes: 1 addition & 1 deletion test/hybrid_de.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ end
res = solve(OptimizationProblem(OptimizationFunction(loss_n_ode, AutoZygote()),
ps),
Adam(0.05); callback = cba, maxiters = 200)
@test loss_n_ode(res.u, nothing) < 0.4
@test loss_n_ode(res.u, nothing) < 0.5
Loading