Skip to content

Add more tests for the coloring #369

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
amontoison merged 1 commit into from
Jan 1, 2026
Merged

Add more tests for the coloring #369

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/enzyme.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ function SparseEnzymeADJacobian(
ncon,
c!;
x0::AbstractVector = rand(nvar),
coloring_algorithm::AbstractColoringAlgorithm = GreedyColoringAlgorithm{:direct}(),
coloring_algorithm::AbstractColoringAlgorithm = GreedyColoringAlgorithm{:direct}(postprocessing=true),
detector::AbstractSparsityDetector = TracerSparsityDetector(),
show_time::Bool = false,
kwargs...,
Expand All @@ -130,7 +130,7 @@ function SparseEnzymeADJacobian(
c!,
J::SparseMatrixCSC{Bool, Int};
x0::AbstractVector{T} = rand(nvar),
coloring_algorithm::AbstractColoringAlgorithm = GreedyColoringAlgorithm{:direct}(),
coloring_algorithm::AbstractColoringAlgorithm = GreedyColoringAlgorithm{:direct}(postprocessing=true),
show_time::Bool = false,
kwargs...,
) where {T}
Expand Down Expand Up @@ -187,7 +187,7 @@ function SparseEnzymeADHessian(
ncon,
c!;
x0::AbstractVector = rand(nvar),
coloring_algorithm::AbstractColoringAlgorithm = GreedyColoringAlgorithm{:substitution}(),
coloring_algorithm::AbstractColoringAlgorithm = GreedyColoringAlgorithm{:substitution}(postprocessing=true),
detector::AbstractSparsityDetector = TracerSparsityDetector(),
show_time::Bool = false,
kwargs...,
Expand All @@ -206,7 +206,7 @@ function SparseEnzymeADHessian(
c!,
H::SparseMatrixCSC{Bool, Int};
x0::AbstractVector{T} = rand(nvar),
coloring_algorithm::AbstractColoringAlgorithm = GreedyColoringAlgorithm{:substitution}(),
coloring_algorithm::AbstractColoringAlgorithm = GreedyColoringAlgorithm{:substitution}(postprocessing=true),
show_time::Bool = false,
kwargs...,
) where {T}
Expand Down
8 changes: 4 additions & 4 deletions src/sparse_hessian.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function SparseADHessian(
ncon,
c!;
x0::AbstractVector = rand(nvar),
coloring_algorithm::AbstractColoringAlgorithm = GreedyColoringAlgorithm{:direct}(),
coloring_algorithm::AbstractColoringAlgorithm = GreedyColoringAlgorithm{:direct}(postprocessing=true),
detector::AbstractSparsityDetector = TracerSparsityDetector(),
show_time::Bool = false,
kwargs...,
Expand All @@ -41,7 +41,7 @@ function SparseADHessian(
c!,
H::SparseMatrixCSC{Bool, Int64};
x0::S = rand(nvar),
coloring_algorithm::AbstractColoringAlgorithm = GreedyColoringAlgorithm{:direct}(),
coloring_algorithm::AbstractColoringAlgorithm = GreedyColoringAlgorithm{:direct}(postprocessing=true),
show_time::Bool = false,
kwargs...,
) where {S}
Expand Down Expand Up @@ -143,7 +143,7 @@ function SparseReverseADHessian(
ncon,
c!;
x0::AbstractVector = rand(nvar),
coloring_algorithm::AbstractColoringAlgorithm = GreedyColoringAlgorithm{:substitution}(),
coloring_algorithm::AbstractColoringAlgorithm = GreedyColoringAlgorithm{:substitution}(postprocessing=true),
detector::AbstractSparsityDetector = TracerSparsityDetector(),
show_time::Bool = false,
kwargs...,
Expand All @@ -162,7 +162,7 @@ function SparseReverseADHessian(
c!,
H::SparseMatrixCSC{Bool, Int};
x0::AbstractVector{T} = rand(nvar),
coloring_algorithm::AbstractColoringAlgorithm = GreedyColoringAlgorithm{:substitution}(),
coloring_algorithm::AbstractColoringAlgorithm = GreedyColoringAlgorithm{:substitution}(postprocessing=true),
show_time::Bool = false,
kwargs...,
) where {T}
Expand Down
44 changes: 36 additions & 8 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,26 +39,54 @@ list_sparse_jac_backend =
end

list_sparse_hess_backend = (
(ADNLPModels.SparseADHessian, Dict(:coloring_algorithm => GreedyColoringAlgorithm{:direct}())),
(ADNLPModels.SparseADHessian,
"star coloring with postprocessing",
Dict(:coloring_algorithm => GreedyColoringAlgorithm{:direct}(postprocessing=true)),
),
(ADNLPModels.SparseADHessian,
"star coloring without postprocessing",
Dict(:coloring_algorithm => GreedyColoringAlgorithm{:direct}(postprocessing=false)),
),
(
ADNLPModels.SparseADHessian,
"acyclic coloring with postprocessing",
Dict(:coloring_algorithm => GreedyColoringAlgorithm{:substitution}(postprocessing=true)),
),
(
ADNLPModels.SparseADHessian,
Dict(:coloring_algorithm => GreedyColoringAlgorithm{:substitution}()),
"acyclic coloring without postprocessing",
Dict(:coloring_algorithm => GreedyColoringAlgorithm{:substitution}(postprocessing=false)),
),
(
ADNLPModels.SparseReverseADHessian,
"star coloring with postprocessing",
Dict(:coloring_algorithm => GreedyColoringAlgorithm{:direct}(postprocessing=true)),
),
(
ADNLPModels.SparseReverseADHessian,
"star coloring without postprocessing",
Dict(:coloring_algorithm => GreedyColoringAlgorithm{:direct}(postprocessing=false)),
),
(
ADNLPModels.SparseReverseADHessian,
Dict(:coloring_algorithm => GreedyColoringAlgorithm{:direct}()),
"acyclic coloring with postprocessing",
Dict(:coloring_algorithm => GreedyColoringAlgorithm{:substitution}(postprocessing=true)),
),
(
ADNLPModels.SparseReverseADHessian,
Dict(:coloring_algorithm => GreedyColoringAlgorithm{:substitution}()),
"acyclic coloring without postprocessing",
Dict(:coloring_algorithm => GreedyColoringAlgorithm{:substitution}(postprocessing=false)),
),
(ADNLPModels.ForwardDiffADHessian,
"default",
Dict(),
),
(ADNLPModels.ForwardDiffADHessian, Dict()),
)

@testset "Sparse Hessian" begin
for (backend, kw) in list_sparse_hess_backend
sparse_hessian(backend, kw)
sparse_hessian_nls(backend, kw)
for (backend, info, kw) in list_sparse_hess_backend
sparse_hessian(backend, info, kw)
sparse_hessian_nls(backend, info, kw)
end
end

Expand Down
4 changes: 2 additions & 2 deletions test/sparse_hessian.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
function sparse_hessian(backend, kw)
@testset "Basic Hessian derivative with backend=$(backend) and T=$(T)" for T in (Float32, Float64)
function sparse_hessian(backend, info, kw)
@testset "Basic Hessian derivative with backend=$(backend) -- $info -- T=$(T)" for T in (Float32, Float64)
c!(cx, x) = begin
cx[1] = x[1] - 1
cx[2] = 10 * (x[2] - x[1]^2)
Expand Down
4 changes: 2 additions & 2 deletions test/sparse_hessian_nls.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
function sparse_hessian_nls(backend, kw)
@testset "Basic Hessian of residual derivative with backend=$(backend) and T=$(T)" for T in (
function sparse_hessian_nls(backend, info, kw)
@testset "Basic Hessian of residual derivative with backend=$(backend) -- $info -- T=$(T)" for T in (
Float32,
Float64,
)
Expand Down
Loading