Skip to content

Commit 9f05adf

Browse files
committed
make sure SparseMatrixColorings import is correct
1 parent c98c023 commit 9f05adf

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

lib/OrdinaryDiffEqDifferentiation/src/OrdinaryDiffEqDifferentiation.jl

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ module OrdinaryDiffEqDifferentiation
33
import ADTypes
44
import ADTypes: AutoFiniteDiff, AutoForwardDiff, AbstractADType, AutoSparse
55

6-
import SparseMatrixColorings: GreedyColoringAlgorithm
7-
86
import ForwardDiff, FiniteDiff
97
import ForwardDiff.Dual
108
import LinearSolve
@@ -28,6 +26,7 @@ using DiffEqBase: TimeGradientWrapper,
2826
UDerivativeWrapper
2927
using SciMLBase: AbstractSciMLOperator, constructorof, @set
3028
using SciMLOperators
29+
import SparseMatrixColorings
3130
import OrdinaryDiffEqCore
3231
using OrdinaryDiffEqCore: OrdinaryDiffEqAlgorithm, OrdinaryDiffEqAdaptiveImplicitAlgorithm,
3332
DAEAlgorithm,
@@ -54,8 +53,6 @@ using FastBroadcast: @..
5453

5554
using ConcreteStructs: @concrete
5655

57-
import SparseMatrixColorings: GreedyColoringAlgorithm, column_colors, ColoringProblem, coloring
58-
5956
@static if isdefined(DiffEqBase, :OrdinaryDiffEqTag)
6057
import DiffEqBase: OrdinaryDiffEqTag
6158
else

lib/OrdinaryDiffEqDifferentiation/src/derivative_wrappers.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -377,9 +377,9 @@ function sparsity_colorvec(f, x)
377377
end
378378
end
379379

380-
col_alg = GreedyColoringAlgorithm()
381-
col_prob = ColoringProblem()
380+
col_alg = SparseMatrixColorings.GreedyColoringAlgorithm()
381+
col_prob = SparseMatrixColorings.ColoringProblem()
382382
colorvec = DiffEqBase.has_colorvec(f) ? f.colorvec :
383-
(isnothing(sparsity) ? (1:length(x)) : column_colors(coloring(sparsity, col_prob, col_alg)))
383+
(isnothing(sparsity) ? (1:length(x)) : SparseMatrixColorings.column_colors(SparseMatrixColorings.coloring(sparsity, col_prob, col_alg)))
384384
sparsity, colorvec
385385
end

0 commit comments

Comments
 (0)