Support future API of SMC.jl

Author: amontoison

src/sparse_hessian.jl

@@ -22,7 +22,7 @@ function SparseADHessian(
   ncon,
   c!;
   x0::AbstractVector = rand(nvar),
-  coloring_algorithm::AbstractColoringAlgorithm = GreedyColoringAlgorithm{:direct}(),
+  coloring_algorithm::AbstractColoringAlgorithm = GreedyColoringAlgorithm{:direct}(decompression_uplo=:L),
   detector::AbstractSparsityDetector = TracerSparsityDetector(),
   show_time::Bool = false,
   kwargs...,
@@ -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}(decompression_uplo=:L),
   show_time::Bool = false,
   kwargs...,
 ) where {S}
@@ -143,7 +143,7 @@ function SparseReverseADHessian(
   ncon,
   c!;
   x0::AbstractVector = rand(nvar),
-  coloring_algorithm::AbstractColoringAlgorithm = GreedyColoringAlgorithm{:substitution}(),
+  coloring_algorithm::AbstractColoringAlgorithm = GreedyColoringAlgorithm{:substitution}(decompression_uplo=:L),
   detector::AbstractSparsityDetector = TracerSparsityDetector(),
   show_time::Bool = false,
   kwargs...,
@@ -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}(decompression_uplo=:L),
   show_time::Bool = false,
   kwargs...,
 ) where {T}
@@ -307,11 +307,11 @@ function sparse_hess_coord!(
     compressed_hessian_icol .= view(b.Hvp, (ncon + 1):(ncon + b.nvar))
     if b.coloring_mode == :direct
       # Update the coefficients of the lower triangular part of the Hessian that are related to the color `icol`
-      decompress_single_color!(A, compressed_hessian_icol, icol, b.result_coloring, :L)
+      decompress_single_color!(A, compressed_hessian_icol, icol, b.result_coloring)
     end
   end
   if b.coloring_mode == :substitution
-    decompress!(A, b.compressed_hessian, b.result_coloring, :L)
+    decompress!(A, b.compressed_hessian, b.result_coloring)
   end
   vals .= b.nzval
   return vals
@@ -354,11 +354,11 @@ function sparse_hess_coord!(
 
     if b.coloring_mode == :direct
       # Update the coefficients of the lower triangular part of the Hessian that are related to the color `icol`
-      decompress_single_color!(A, compressed_hessian_icol, icol, b.result_coloring, :L)
+      decompress_single_color!(A, compressed_hessian_icol, icol, b.result_coloring)
     end
   end
   if b.coloring_mode == :substitution
-    decompress!(A, b.compressed_hessian, b.result_coloring, :L)
+    decompress!(A, b.compressed_hessian, b.result_coloring)
   end
   vals .= b.nzval
   return vals

test/runtests.jl

@@ -39,18 +39,20 @@ list_sparse_jac_backend =
 end
 
 list_sparse_hess_backend = (
-  (ADNLPModels.SparseADHessian, Dict(:coloring_algorithm => GreedyColoringAlgorithm{:direct}())),
+  (ADNLPModels.SparseADHessian,
+    Dict(:coloring_algorithm => GreedyColoringAlgorithm{:direct}(decompression_uplo=:L)),
+  ),
   (
     ADNLPModels.SparseADHessian,
-    Dict(:coloring_algorithm => GreedyColoringAlgorithm{:substitution}()),
+    Dict(:coloring_algorithm => GreedyColoringAlgorithm{:substitution}(decompression_uplo=:L)),
   ),
   (
     ADNLPModels.SparseReverseADHessian,
-    Dict(:coloring_algorithm => GreedyColoringAlgorithm{:direct}()),
+    Dict(:coloring_algorithm => GreedyColoringAlgorithm{:direct}(decompression_uplo=:L)),
   ),
   (
     ADNLPModels.SparseReverseADHessian,
-    Dict(:coloring_algorithm => GreedyColoringAlgorithm{:substitution}()),
+    Dict(:coloring_algorithm => GreedyColoringAlgorithm{:substitution}(decompression_uplo=:L)),
   ),
   (ADNLPModels.ForwardDiffADHessian, Dict()),
 )