Skip to content

Commit 85f3e25

Browse files
committed
wip dbg cmember on ccolamd
1 parent d1a105a commit 85f3e25

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

ext/IncrInfrApproxMinDegreeExt.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ function _ccolamd!(
4040
for i in eachindex(p)
4141
p[i] -= 1
4242
end
43-
err = AMD.ccolamd_l( # ccolamd_l
43+
# BSD-3 clause, (c) Davis, Rajamanickam, Larimore
44+
# https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/f98e0f5a69acb6a3fb19703ff266100d43491935/LICENSE.txt#L153
45+
err = AMD.ccolamd_l(
4446
n_row,
4547
n_col,
4648
Alen,

test/testCcolamdOrdering.jl

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,24 @@ using Test
88

99
fg = generateGraph_Kaess(graphinit=false)
1010

11+
vo = getEliminationOrder(fg, constraints=[:x3], ordering=:ccolamd)
1112

12-
try
13-
vo = getEliminationOrder(fg, constraints=[:x3], ordering=:ccolamd)
13+
@test vo[end] == :x3
14+
@test length(vo) == length(ls(fg))
1415

15-
@test vo[end] == :x3
16-
@test length(vo) == length(ls(fg))
16+
vo = getEliminationOrder(fg, constraints=[:l2], ordering=:ccolamd)
1717

18-
vo = getEliminationOrder(fg, constraints=[:l2], ordering=:ccolamd)
18+
@test vo[end] == :l2
1919

20-
@test vo[end] == :l2
2120

21+
vo = getEliminationOrder(fg, constraints=[:x3;:l2], ordering=:ccolamd)
2222

23-
vo = getEliminationOrder(fg, constraints=[:x3;:l2], ordering=:ccolamd)
23+
@test intersect(vo[end-1:end], [:x3;:l2]) |> length == 2
2424

25-
@test intersect(vo[end-1:end], [:x3;:l2]) |> length == 2
26-
catch
27-
@error "IncrInfrApproxMinDegreeExt test issue, work needed for Julia 1.10 compat via AMD.jl"
28-
@test_broken false
29-
end
25+
# catch
26+
# @error "IncrInfrApproxMinDegreeExt test issue, work needed for Julia 1.10 compat via AMD.jl"
27+
# @test_broken false
28+
# end
3029

3130
##
3231
end

0 commit comments

Comments
 (0)