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.

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

pass shadow closure incase f is a closure #962

Merged
merged 18 commits into from
Dec 29, 2023
Merged
Show file tree
Hide file tree
Changes from 11 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
4 changes: 2 additions & 2 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ steps:
GROUP: "{{matrix}}"
plugins:
- JuliaCI/julia#v1:
version: "1"
version: "1.9"
- JuliaCI/julia-test#v1:
coverage: true
agents:
Expand Down Expand Up @@ -75,4 +75,4 @@ steps:

env:
JULIA_PKG_SERVER: "" # it often struggles with our large artifacts
SECRET_DOCUMENTER_KEY: "CZlK2ERrvOp4pGrTF2mB8S7q1s6uD4fM4AAHVxDSUQLSei+IzDFp6qriiBmIUUposM8On9wYzDTwkErdRRe/U9XsTIs/uKpoMSKAOZBNC7CjdXdJz9oa6xtKTQbJw+S+HEbsGnnz53Hg9bC9+U5npMiKvR0YDhnZDR025Htwqm5x8uzJNCdRviH4hss1+GMD6CgHqxzYPgpxiYX6ppPCN6BdIOrHPsxl5n923a1nwCW6oPfyGhxaC46VsB8qggk/tBIT+t0bw6btQblHSXBi3XAgKgPuPlvaaMlmv3Oxg/vkUNUIEN+8WE6w8iHav+5Yhboaloq+ovWCy+HP7M+HAg==;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"
SECRET_DOCUMENTER_KEY: "CZlK2ERrvOp4pGrTF2mB8S7q1s6uD4fM4AAHVxDSUQLSei+IzDFp6qriiBmIUUposM8On9wYzDTwkErdRRe/U9XsTIs/uKpoMSKAOZBNC7CjdXdJz9oa6xtKTQbJw+S+HEbsGnnz53Hg9bC9+U5npMiKvR0YDhnZDR025Htwqm5x8uzJNCdRviH4hss1+GMD6CgHqxzYPgpxiYX6ppPCN6BdIOrHPsxl5n923a1nwCW6oPfyGhxaC46VsB8qggk/tBIT+t0bw6btQblHSXBi3XAgKgPuPlvaaMlmv3Oxg/vkUNUIEN+8WE6w8iHav+5Yhboaloq+ovWCy+HP7M+HAg==;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"
1 change: 1 addition & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
- Core3
- Core4
- Core5
- Core6
- SDE1
- SDE2
- SDE3
Expand Down
1 change: 1 addition & 0 deletions src/adjoint_common.jl
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ function adjointdiffcache(g::G, sensealg, discrete, sol, dgdu::DG1, dgdp::DG2, f
elseif autojacvec isa EnzymeVJP
paramjac_config = get_paramjac_config(autojacvec, p, f, y, _p, _t; numindvar, alg)
pf = get_pf(autojacvec; _f = unwrappedf, isinplace = isinplace, isRODE = isRODE)
paramjac_config = (paramjac_config...,Enzyme.make_zero(pf))
elseif DiffEqBase.has_paramjac(f) || quad || !(autojacvec isa Bool) ||
autojacvec isa EnzymeVJP
paramjac_config = nothing
Expand Down
6 changes: 6 additions & 0 deletions src/callback_tracking.jl
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,9 @@ function get_cb_diffcaches(cb::Union{DiscreteCallback, ContinuousCallback,
isinplace = true, isRODE = false,
_W = nothing)
pf = get_pf(autojacvec; _f = w, isinplace = true, isRODE = false)
if autojacvec isa EnzymeVJP
paramjac_config = (paramjac_config...,Enzyme.make_zero(pf))
end

diffcache_w = AdjointDiffCache(nothing, pf, nothing, nothing, nothing,
nothing, nothing, nothing, paramjac_config,
Expand All @@ -468,6 +471,9 @@ function get_cb_diffcaches(cb::Union{DiscreteCallback, ContinuousCallback,
isinplace = true, isRODE = false,
_W = nothing)
pf = get_pf(autojacvec; _f = wp, isinplace = true, isRODE = false)
if autojacvec isa EnzymeVJP
paramjac_config = (paramjac_config...,Enzyme.make_zero(pf))
end

diffcache_wp = AdjointDiffCache(nothing, pf, nothing, nothing, nothing,
nothing, nothing, nothing, paramjac_config,
Expand Down
10 changes: 5 additions & 5 deletions src/derivative_wrappers.jl
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ function _vecjacobian!(dλ, y, λ, p, t, S::TS, isautojacvec::EnzymeVJP, dgrad,

prob = getprob(S)

_tmp1, tmp2, _tmp3, _tmp4, _tmp5 = S.diffcache.paramjac_config
_tmp1, tmp2, _tmp3, _tmp4, _tmp5, _tmp6 = S.diffcache.paramjac_config

if _tmp1 isa FixedSizeDiffCache
tmp1 = get_tmp(_tmp1, dλ)
Expand Down Expand Up @@ -682,12 +682,12 @@ function _vecjacobian!(dλ, y, λ, p, t, S::TS, isautojacvec::EnzymeVJP, dgrad,

if inplace_sensitivity(S)
if W === nothing
Enzyme.autodiff(Enzyme.Reverse, S.diffcache.pf, Enzyme.Const, Enzyme.Duplicated(tmp3, tmp4),
Enzyme.autodiff(Enzyme.Reverse, Enzyme.Duplicated(S.diffcache.pf, _tmp6), Enzyme.Const, Enzyme.Duplicated(tmp3, tmp4),
Enzyme.Duplicated(ytmp, tmp1),
dup,
Enzyme.Const(t))
else
Enzyme.autodiff(Enzyme.Reverse, S.diffcache.pf, Enzyme.Const, Enzyme.Duplicated(tmp3, tmp4),
Enzyme.autodiff(Enzyme.Reverse, Enzyme.Duplicated(S.diffcache.pf, _tmp6), Enzyme.Const, Enzyme.Duplicated(tmp3, tmp4),
Enzyme.Duplicated(ytmp, tmp1),
dup,
Enzyme.Const(t), Enzyme.Const(W))
Expand All @@ -698,11 +698,11 @@ function _vecjacobian!(dλ, y, λ, p, t, S::TS, isautojacvec::EnzymeVJP, dgrad,
dy !== nothing && recursive_copyto!(dy,tmp3)
else
if W === nothing
Enzyme.autodiff(Enzyme.Reverse, S.diffcache.pf, Enzyme.Const, Enzyme.Duplicated(tmp3, tmp4),
Enzyme.autodiff(Enzyme.Reverse, Enzyme.Duplicated(S.diffcache.pf, _tmp6), Enzyme.Const, Enzyme.Duplicated(tmp3, tmp4),
Enzyme.Duplicated(ytmp, tmp1),
dup, Enzyme.Const(t))
else
Enzyme.autodiff(Enzyme.Reverse, S.diffcache.pf, Enzyme.Const, Enzyme.Duplicated(tmp3, tmp4),
Enzyme.autodiff(Enzyme.Reverse, Enzyme.Duplicated(S.diffcache.pf, _tmp6), Enzyme.Const, Enzyme.Duplicated(tmp3, tmp4),
Enzyme.Duplicated(ytmp, tmp1),
dup, Enzyme.Const(t), Enzyme.Const(W))
end
Expand Down
6 changes: 3 additions & 3 deletions src/gauss_adjoint.jl
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,6 @@ function GaussIntegrand(sol, sensealg, checkpoints, dgdp = nothing)
pf = nothing
pJ = nothing
elseif sensealg.autojacvec isa EnzymeVJP
paramjac_config = zero(y), zero(y)
pf = let f = unwrappedf
if DiffEqBase.isinplace(prob)
function (out, u, _p, t)
Expand All @@ -415,6 +414,7 @@ function GaussIntegrand(sol, sensealg, checkpoints, dgdp = nothing)
end
end
end
paramjac_config = zero(y), zero(y), Enzyme.make_zero(pf)
pJ = nothing
elseif isautojacvec # Zygote
paramjac_config = nothing
Expand Down Expand Up @@ -468,10 +468,10 @@ function vec_pjac!(out, λ, y, t, S::GaussIntegrand)
tmp = back(λ)
recursive_copyto!(out, tmp[1])
elseif sensealg.autojacvec isa EnzymeVJP
tmp3, tmp4 = paramjac_config
tmp3, tmp4, tmp6 = paramjac_config
tmp4 .= λ
out .= 0
Enzyme.autodiff(Enzyme.Reverse, pf, Enzyme.Duplicated(tmp3, tmp4),
Enzyme.autodiff(Enzyme.Reverse, Enzyme.Duplicated(pf, tmp6), Enzyme.Duplicated(tmp3, tmp4),
y, Enzyme.Duplicated(p, out), t)
else
error("autojacvec choice $(sensealg.autojacvec) is not supported by GaussAdjoint")
Expand Down
8 changes: 4 additions & 4 deletions src/quadrature_adjoint.jl
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ function AdjointSensitivityIntegrand(sol, adj_sol, sensealg, dgdp = nothing)
pf = nothing
pJ = nothing
elseif sensealg.autojacvec isa EnzymeVJP
paramjac_config = zero(y), zero(y)
pf = let f = unwrappedf
if DiffEqBase.isinplace(prob) && prob isa RODEProblem
function (out, u, _p, t, W)
Expand All @@ -232,6 +231,7 @@ function AdjointSensitivityIntegrand(sol, adj_sol, sensealg, dgdp = nothing)
end
end
end
paramjac_config = zero(y), zero(y), Enzyme.make_zero(pf)
pJ = nothing
elseif isautojacvec # Zygote
paramjac_config = nothing
Expand Down Expand Up @@ -282,10 +282,10 @@ function vec_pjac!(out, λ, y, t, S::AdjointSensitivityIntegrand)
tmp = back(λ)
out[:] .= vec(tmp[1])
elseif sensealg.autojacvec isa EnzymeVJP
tmp3, tmp4 = paramjac_config
tmp3, tmp4, tmp6 = paramjac_config
tmp4 .= λ
out .= 0
Enzyme.autodiff(Enzyme.Reverse, pf, Enzyme.Duplicated(tmp3, tmp4),
Enzyme.autodiff(Enzyme.Reverse, Enzyme.Duplicated(pf, tmp6), Enzyme.Duplicated(tmp3, tmp4),
y, Enzyme.Duplicated(p, out), t)
end

Expand Down Expand Up @@ -331,7 +331,7 @@ function _adjoint_sensitivities(sol, sensealg::QuadratureAdjoint, alg; t = nothi
callback)
adj_sol = solve(adj_prob, alg; abstol = abstol, reltol = reltol,
save_everystep = true, save_start = true, kwargs...)

p = sol.prob.p
if p === nothing || p === DiffEqBase.NullParameters()
return adj_sol[end], nothing
Expand Down
3 changes: 2 additions & 1 deletion test/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ DiffEqCallbacks = "459566f4-90b8-5000-8ac3-15dfb0a30def"
DiffEqNoiseProcess = "77a26b50-5914-5dd7-bc55-306e6241c503"
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9"
FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41"
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
Functors = "d9f16b24-f501-4c13-a1f2-28368ffc5196"
Expand Down Expand Up @@ -64,7 +65,7 @@ Pkg = "<0.0.1, 1"
PreallocationTools = "0.4"
QuadGK = "2.9.1"
Random = "<0.0.1, 1"
RecursiveArrayTools = "2.4.2"
RecursiveArrayTools = "3"
ChrisRackauckas marked this conversation as resolved.
Show resolved Hide resolved
ReverseDiff = "1.15.1"
SafeTestsets = "0.1.0"
SparseArrays = "<0.0.1, 1"
Expand Down
Loading
Loading