Upgrade to ColPack v0.4 (#235)

* Update to ColPack v0.4
JuliaSmoothOptimizers · May 24, 2024 · 15d897d · 15d897d
1 parent a858c6b
commit 15d897d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 *.jl.mem
 docs/build
 docs/site
+Manifest.toml
diff --git a/Project.toml b/Project.toml
@@ -12,7 +12,7 @@ ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [compat]
-ColPack = "0.3"
+ColPack = "0.4"
 ForwardDiff = "0.9.0, 0.10.0"
 NLPModels = "0.18, 0.19, 0.20, 0.21"
 Requires = "1"

diff --git a/docs/Project.toml b/docs/Project.toml
@@ -10,6 +10,7 @@ OptimizationProblems = "5049e819-d29b-5fba-b941-0eee7e64c1c6"
 Percival = "01435c0c-c90d-11e9-3788-63660f8fbccc"
 Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 SolverBenchmark = "581a75fa-a23a-52d0-a590-d6201de2218a"
+SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
 Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
@@ -23,5 +24,6 @@ OptimizationProblems = "0.7"
 Percival = "0.7"
 Plots = "1"
 SolverBenchmark = "0.5"
+SymbolicUtils = "=1.5.1"
 Symbolics = "5.3"
 Zygote = "0.6.62"
diff --git a/src/ad.jl b/src/ad.jl
@@ -510,8 +510,8 @@ end
 
 function ColPackColoration(;
   partition_choice = (m, n) -> false, # TODO: (m, n; μ = 0.6) -> n < μ * m ? true : false,
-  coloring::ColPack.AbstractColoring = d1_coloring("DISTANCE_ONE"),
-  ordering::ColPack.AbstractOrdering = incidence_degree_ordering("INCIDENCE_DEGREE"),
+  coloring::ColPack.ColoringMethod = d1_coloring(),
+  ordering::ColPack.ColoringOrder = incidence_degree_ordering(),
 )
   return ColPackColoration{typeof(partition_choice), typeof(coloring), typeof(ordering)}(
     partition_choice,

diff --git a/test/Project.toml b/test/Project.toml
@@ -10,6 +10,7 @@ NLPModelsTest = "7998695d-6960-4d3a-85c4-e1bceb8cd856"
 ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 SparseDiffTools = "47a9eef4-7e08-11e9-0b38-333d64bd3804"
+SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
 Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
@@ -25,4 +26,5 @@ NLPModelsTest = "0.10"
 ReverseDiff = "1"
 SparseDiffTools = "2.3"
 Symbolics = "5.3"
+SymbolicUtils = "=1.5.1"
 Zygote = "0.6"