Skip to content

WIP vector_mode_dual_eval -> vector_mode_dual_eval! #528

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 5 commits into from
Jul 28, 2021
Merged

WIP vector_mode_dual_eval -> vector_mode_dual_eval! #528

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c4c8ab8
vector_mode_dual_eval -> vector_mode_dual_eval!
dlfivefifty Jul 1, 2021
d1e9447
Merge branch 'master' into patch-4
dlfivefifty Jul 28, 2021
e1ec820
more vector_mode_dual_eval!
dlfivefifty Jul 28, 2021
5e61fcd
Change arg order
dlfivefifty Jul 28, 2021
010756b
change again
dlfivefifty Jul 28, 2021
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 src/apiutils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ end

@inline static_dual_eval(::Type{T}, f, x::StaticArray) where T = f(dualize(T, x))

function vector_mode_dual_eval(f::F, x, cfg::Union{JacobianConfig,GradientConfig}) where {F}
function vector_mode_dual_eval!(f::F, x, cfg::Union{JacobianConfig,GradientConfig}) where {F}
xdual = cfg.duals
seed!(xdual, x, cfg.seeds)
return f(xdual)
end

function vector_mode_dual_eval(f!::F, y, x, cfg::JacobianConfig) where {F}
function vector_mode_dual_eval!(f!::F, y, x, cfg::JacobianConfig) where {F}
ydual, xdual = cfg.duals
seed!(xdual, x, cfg.seeds)
seed!(ydual, y)
Expand Down
4 changes: 2 additions & 2 deletions src/gradient.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,14 @@ const GRAD_ERROR = DimensionMismatch("gradient(f, x) expects that f(x) is a real
###############

function vector_mode_gradient(f::F, x, cfg::GradientConfig{T}) where {T, F}
ydual = vector_mode_dual_eval(f, x, cfg)
ydual = vector_mode_dual_eval!(f, x, cfg)
ydual isa Real || throw(GRAD_ERROR)
result = similar(x, valtype(ydual))
return extract_gradient!(T, result, ydual)
end

function vector_mode_gradient!(result, f::F, x, cfg::GradientConfig{T}) where {T, F}
ydual = vector_mode_dual_eval(f, x, cfg)
ydual = vector_mode_dual_eval!(f, x, cfg)
result = extract_gradient!(T, result, ydual)
return result
end
Expand Down
8 changes: 4 additions & 4 deletions src/jacobian.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ reshape_jacobian(result::DiffResult, ydual, xdual) = reshape_jacobian(DiffResult
###############

function vector_mode_jacobian(f::F, x, cfg::JacobianConfig{T,V,N}) where {F,T,V,N}
ydual = vector_mode_dual_eval(f, x, cfg)
ydual = vector_mode_dual_eval!(cfg, f, x)
Copy link
Collaborator

@KristofferC KristofferC Jul 28, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

even in ! functions I think you put the function first to allow for do syntax. So it would be f, cfg, x.

Copy link
Contributor Author

@dlfivefifty dlfivefifty Jul 28, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are really trying to make me regret this...

ok I've changed it again

ydual isa AbstractArray || throw(JACOBIAN_ERROR)
result = similar(ydual, valtype(eltype(ydual)), length(ydual), N)
extract_jacobian!(T, result, ydual, N)
Expand All @@ -153,7 +153,7 @@ function vector_mode_jacobian(f::F, x, cfg::JacobianConfig{T,V,N}) where {F,T,V,
end

function vector_mode_jacobian(f!::F, y, x, cfg::JacobianConfig{T,V,N}) where {F,T,V,N}
ydual = vector_mode_dual_eval(f!, y, x, cfg)
ydual = vector_mode_dual_eval!(cfg, f!, y, x)
map!(d -> value(T,d), y, ydual)
result = similar(y, length(y), N)
extract_jacobian!(T, result, ydual, N)
Expand All @@ -162,14 +162,14 @@ function vector_mode_jacobian(f!::F, y, x, cfg::JacobianConfig{T,V,N}) where {F,
end

function vector_mode_jacobian!(result, f::F, x, cfg::JacobianConfig{T,V,N}) where {F,T,V,N}
ydual = vector_mode_dual_eval(f, x, cfg)
ydual = vector_mode_dual_eval!(cfg, f, x)
extract_jacobian!(T, result, ydual, N)
extract_value!(T, result, ydual)
return result
end

function vector_mode_jacobian!(result, f!::F, y, x, cfg::JacobianConfig{T,V,N}) where {F,T,V,N}
ydual = vector_mode_dual_eval(f!, y, x, cfg)
ydual = vector_mode_dual_eval!(cfg, f!, y, x)
map!(d -> value(T,d), y, ydual)
extract_jacobian!(T, result, ydual, N)
extract_value!(T, result, y, ydual)
Expand Down