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.

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

Pass Tag and Chunksize from the types #266

Merged
merged 1 commit into from
Oct 28, 2023
Merged

Pass Tag and Chunksize from the types #266

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
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "SparseDiffTools"
uuid = "47a9eef4-7e08-11e9-0b38-333d64bd3804"
authors = ["Pankaj Mishra <[email protected]>", "Chris Rackauckas <[email protected]>"]
version = "2.8.0"
version = "2.9.0"

[deps]
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
Expand Down
5 changes: 5 additions & 0 deletions src/highlevel/common.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,12 @@
const __init_𝒥 = init_jacobian

# Misc Functions
function __chunksize(::AutoSparseForwardDiff{C}, x) where {C}
return C === nothing ? ForwardDiff.Chunk(x) : C
end
__chunksize(::AutoSparseForwardDiff{C}) where {C} = C
__chunksize(::AutoForwardDiff{C}, x) where {C} = C === nothing ? ForwardDiff.Chunk(x) : C
__chunksize(::AutoForwardDiff{C}) where {C} = C

Check warning on line 248 in src/highlevel/common.jl

View check run for this annotation

Codecov / codecov/patch

src/highlevel/common.jl#L248 

Added line #L248 was not covered by tests

__f̂(f, x, idxs) = dot(vec(f(x)), idxs)

Expand Down
13 changes: 8 additions & 5 deletions src/highlevel/forward_mode.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,19 @@ struct ForwardDiffJacobianCache{CO, CA, J, FX, X} <: AbstractMaybeSparseJacobian
x::X
end

struct SparseDiffToolsTag end

function sparse_jacobian_cache(ad::Union{AutoSparseForwardDiff, AutoForwardDiff},
sd::AbstractMaybeSparsityDetection, f, x; fx = nothing)
coloring_result = sd(ad, f, x)
fx = fx === nothing ? similar(f(x)) : fx
if coloring_result isa NoMatrixColoring
cache = ForwardDiff.JacobianConfig(f, x)
cache = ForwardDiff.JacobianConfig(f, x, __chunksize(ad, x),
ifelse(ad.tag === nothing, SparseDiffToolsTag(), ad.tag))
jac_prototype = nothing
else
cache = ForwardColorJacCache(f, x, __chunksize(ad); coloring_result.colorvec,
dx = fx,
sparsity = coloring_result.jacobian_sparsity)
dx = fx, sparsity = coloring_result.jacobian_sparsity, ad.tag)
jac_prototype = coloring_result.jacobian_sparsity
end
return ForwardDiffJacobianCache(coloring_result, cache, jac_prototype, fx, x)
Expand All @@ -26,11 +28,12 @@ function sparse_jacobian_cache(ad::Union{AutoSparseForwardDiff, AutoForwardDiff}
sd::AbstractMaybeSparsityDetection, f!, fx, x)
coloring_result = sd(ad, f!, fx, x)
if coloring_result isa NoMatrixColoring
cache = ForwardDiff.JacobianConfig(f!, fx, x)
cache = ForwardDiff.JacobianConfig(f!, fx, x, __chunksize(ad, x),
ifelse(ad.tag === nothing, SparseDiffToolsTag(), ad.tag))
jac_prototype = nothing
else
cache = ForwardColorJacCache(f!, x, __chunksize(ad); coloring_result.colorvec,
dx = fx, sparsity = coloring_result.jacobian_sparsity)
dx = fx, sparsity = coloring_result.jacobian_sparsity, ad.tag)
jac_prototype = coloring_result.jacobian_sparsity
end
return ForwardDiffJacobianCache(coloring_result, cache, jac_prototype, fx, x)
Expand Down