Skip to content

fix seed-reset order for no-op cases where input === the output #204

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 16, 2017
Merged

fix seed-reset order for no-op cases where input === the output #204

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
8 changes: 4 additions & 4 deletions src/gradient.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,17 +94,17 @@ function chunk_mode_gradient_expr(out_definition::Expr)
# do first chunk manually to calculate output type
seed!(xdual, x, 1, seeds)
ydual = f(xdual)
seed!(xdual, x, 1)
$(out_definition)
extract_gradient_chunk!(out, ydual, 1, N)
seed!(xdual, x, 1)

# do middle chunks
for c in middlechunks
i = ((c - 1) * N + 1)
seed!(xdual, x, i, seeds)
ydual = f(xdual)
seed!(xdual, x, i)
extract_gradient_chunk!(out, ydual, i, N)
seed!(xdual, x, i)
end

# do final chunk
Expand Down Expand Up @@ -156,9 +156,9 @@ if IS_MULTITHREADED_JULIA
# do first chunk manually to calculate output type
seed!(current_xdual, x, 1, current_seeds)
current_ydual = f(current_xdual)
seed!(current_xdual, x, 1)
$(out_definition)
extract_gradient_chunk!(out, current_ydual, 1, N)
seed!(current_xdual, x, 1)

# do middle chunks
Base.Threads.@threads for c in middlechunks
Expand All @@ -169,8 +169,8 @@ if IS_MULTITHREADED_JULIA
local chunk_index = ((c - 1) * N + 1)
seed!(chunk_xdual, x, chunk_index, chunk_seeds)
local chunk_dual = f(chunk_xdual)
seed!(chunk_xdual, x, chunk_index)
extract_gradient_chunk!(out, chunk_dual, chunk_index, N)
seed!(chunk_xdual, x, chunk_index)
end

# do final chunk
Expand Down
4 changes: 2 additions & 2 deletions src/jacobian.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,18 +125,18 @@ function jacobian_chunk_mode_expr(work_array_definition::Expr, compute_ydual::Ex
# do first chunk manually to calculate output type
seed!(xdual, x, 1, seeds)
$(compute_ydual)
seed!(xdual, x, 1)
$(out_definition)
out_reshaped = reshape_jacobian(out, ydual, xdual)
extract_jacobian_chunk!(out_reshaped, ydual, 1, N)
seed!(xdual, x, 1)

# do middle chunks
for c in middlechunks
i = ((c - 1) * N + 1)
seed!(xdual, x, i, seeds)
$(compute_ydual)
seed!(xdual, x, i)
extract_jacobian_chunk!(out_reshaped, ydual, i, N)
seed!(xdual, x, i)
end

# do final chunk
Expand Down