Skip to content

up compat Polyester #10

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
ChrisRackauckas merged 1 commit into from
Nov 5, 2023
Merged

up compat Polyester #10

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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*.jl.mem
/Manifest.toml
/docs/build/
.vscode
*~
*#*
*#*#
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Polyester = "f517fe37-dbe3-4b94-8317-1923a5111588"

[compat]
ForwardDiff = "0.10"
Polyester = "0.5, 0.6"
Polyester = "0.5, 0.6, 0.7"
julia = "1.6"

[extras]
Expand Down
6 changes: 3 additions & 3 deletions src/PolyesterForwardDiff.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function threaded_gradient!(f::F, Δx::AbstractVector, x::AbstractVector, ::Forw
N = length(x)
d = cld_fast(N, C)
r = Ref{eltype(Δx)}()
batch((d,min(d,num_threads())), r, Δx, x) do rΔxx,start,stop
batch((d,min(d,Threads.nthreads())), r, Δx, x) do rΔxx,start,stop
evaluate_chunks!(f, rΔxx, start, stop, ForwardDiff.Chunk{C}())
end
r[]
Expand Down Expand Up @@ -105,7 +105,7 @@ end
function threaded_jacobian!(f::F, Δx::AbstractArray, x::AbstractArray, ::ForwardDiff.Chunk{C}) where {F,C}
N = length(x)
d = cld_fast(N, C)
batch((d,min(d,num_threads())), Δx, x) do Δxx,start,stop
batch((d,min(d,Threads.nthreads())), Δx, x) do Δxx,start,stop
evaluate_jacobian_chunks!(f, Δxx, start, stop, ForwardDiff.Chunk{C}())
end
return Δx
Expand Down Expand Up @@ -162,7 +162,7 @@ end
function threaded_jacobian!(f!::F, y::AbstractArray, Δx::AbstractArray, x::AbstractArray, ::ForwardDiff.Chunk{C}) where {F,C}
N = length(x)
d = cld_fast(N, C)
batch((d,min(d,num_threads())), y, Δx, x) do yΔxx,start,stop
batch((d,min(d,Threads.nthreads())), y, Δx, x) do yΔxx,start,stop
evaluate_f_and_jacobian_chunks!(f!, yΔxx, start, stop, ForwardDiff.Chunk{C}())
end
Δx
Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ForwardDiff.gradient!(dxref, f, x, ForwardDiff.GradientConfig(f, x, ForwardDiff.
@test dx == dxref

dx .= NaN;
batch((length(x), max(1,num_threads()>>1), 2), dx, x) do (dx,x), start, stop
batch((length(x), max(1,Threads.nthreads()>>1), 2), dx, x) do (dx,x), start, stop
PolyesterForwardDiff.threaded_gradient!(f, view(dx, start%Int:stop%Int), view(x, start%Int:stop%Int), ForwardDiff.Chunk(8))
end;
@test dx ≈ dxref
Expand Down