Skip to content

Add an option decompression_uplo for symmetric results #294

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

Open
amontoison wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add an option decompression_uplo for symmetric results #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44e75b9
Add an option decompression_uplo for symmetric results
amontoison Jan 4, 2026
a55cce6
Fix tests
amontoison Jan 4, 2026
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
12 changes: 8 additions & 4 deletions ext/SparseMatrixColoringsCUDAExt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,14 @@ function SMC.StarSetColoringResult(
ag::SMC.AdjacencyGraph{T},
color::Vector{<:Integer},
star_set::SMC.StarSet{<:Integer},
decompression_uplo::Symbol,
) where {T<:Integer}
@assert decompression_uplo == :F
group = SMC.group_by_color(T, color)
compressed_indices = SMC.star_csc_indices(ag, color, star_set)
compressed_indices = SMC.star_csc_indices(ag, color, star_set, decompression_uplo)
additional_info = (; compressed_indices_gpu_csc=CuVector(compressed_indices))
return SMC.StarSetColoringResult(
A, ag, color, group, compressed_indices, additional_info
A, ag, color, group, compressed_indices, decompression_uplo, additional_info
)
end

Expand Down Expand Up @@ -86,12 +88,14 @@ function SMC.StarSetColoringResult(
ag::SMC.AdjacencyGraph{T},
color::Vector{<:Integer},
star_set::SMC.StarSet{<:Integer},
decompression_uplo::Symbol,
) where {T<:Integer}
@assert decompression_uplo == :F
group = SMC.group_by_color(T, color)
compressed_indices = SMC.star_csc_indices(ag, color, star_set)
compressed_indices = SMC.star_csc_indices(ag, color, star_set, decompression_uplo)
additional_info = (; compressed_indices_gpu_csr=CuVector(compressed_indices))
return SMC.StarSetColoringResult(
A, ag, color, group, compressed_indices, additional_info
A, ag, color, group, compressed_indices, decompression_uplo, additional_info
)
end

Expand Down
6 changes: 5 additions & 1 deletion src/decompression.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,7 @@ end
function decompress!(
A::AbstractMatrix, B::AbstractMatrix, result::StarSetColoringResult, uplo::Symbol=:F
)
@assert result.decompression_uplo == :F
(; ag, compressed_indices) = result
(; S) = ag
check_compatible_pattern(A, ag, uplo)
Expand All @@ -472,6 +473,7 @@ function decompress_single_color!(
result::StarSetColoringResult,
uplo::Symbol=:F,
)
@assert result.decompression_uplo == :F
(; ag, compressed_indices, group) = result
(; S) = ag
check_compatible_pattern(A, ag, uplo)
Expand Down Expand Up @@ -509,11 +511,12 @@ function decompress!(
(; S) = ag
nzA = nonzeros(A)
check_compatible_pattern(A, ag, uplo)
if uplo == :F
if result.decompression_uplo == uplo
for k in eachindex(nzA, compressed_indices)
nzA[k] = B[compressed_indices[k]]
end
else
@assert result.decompression_uplo == :F
rvS = rowvals(S)
l = 0 # assume A has the same pattern as the triangle
for j in axes(S, 2)
Expand All @@ -534,6 +537,7 @@ end
function decompress!(
A::AbstractMatrix, B::AbstractMatrix, result::TreeSetColoringResult, uplo::Symbol=:F
)
@assert result.decompression_uplo == :F
(; ag, color, reverse_bfs_orders, tree_edge_indices, nt, diagonal_indices, buffer) =
result
(; S) = ag
Expand Down
8 changes: 4 additions & 4 deletions src/interface.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ function _coloring(
end
color, star_set = argmin(maximum ∘ first, color_and_star_set_by_order)
if speed_setting isa WithResult
return StarSetColoringResult(A, ag, color, star_set)
return StarSetColoringResult(A, ag, color, star_set, :F)
else
return color
end
Expand All @@ -307,7 +307,7 @@ function _coloring(
end
color, tree_set = argmin(maximum ∘ first, color_and_tree_set_by_order)
if speed_setting isa WithResult
return TreeSetColoringResult(A, ag, color, tree_set, R)
return TreeSetColoringResult(A, ag, color, tree_set, R, :F)
else
return color
end
Expand Down Expand Up @@ -345,7 +345,7 @@ function _coloring(
t -> maximum(t[3]) + maximum(t[4]), outputs_by_order
) # can't use ncolors without computing the full result
if speed_setting isa WithResult
symmetric_result = StarSetColoringResult(A_and_Aᵀ, ag, color, star_set)
symmetric_result = StarSetColoringResult(A_and_Aᵀ, ag, color, star_set, :L)
return BicoloringResult(
A,
ag,
Expand Down Expand Up @@ -390,7 +390,7 @@ function _coloring(
t -> maximum(t[3]) + maximum(t[4]), outputs_by_order
) # can't use ncolors without computing the full result
if speed_setting isa WithResult
symmetric_result = TreeSetColoringResult(A_and_Aᵀ, ag, color, tree_set, R)
symmetric_result = TreeSetColoringResult(A_and_Aᵀ, ag, color, tree_set, R, :L)
return BicoloringResult(
A,
ag,
Expand Down
83 changes: 56 additions & 27 deletions src/result.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ struct StarSetColoringResult{
color::CT
group::GT
compressed_indices::VT
decompression_uplo::Symbol
additional_info::A
end

Expand All @@ -317,43 +318,58 @@ function StarSetColoringResult(
ag::AdjacencyGraph{T},
color::Vector{<:Integer},
star_set::StarSet{<:Integer},
decompression_uplo::Symbol,
) where {T<:Integer}
group = group_by_color(T, color)
compressed_indices = star_csc_indices(ag, color, star_set)
return StarSetColoringResult(A, ag, color, group, compressed_indices, nothing)
compressed_indices = star_csc_indices(ag, color, star_set, decompression_uplo)
return StarSetColoringResult(
A, ag, color, group, compressed_indices, decompression_uplo, nothing
)
end

function star_csc_indices(
ag::AdjacencyGraph{T}, color::Vector{<:Integer}, star_set
ag::AdjacencyGraph{T},
color::Vector{<:Integer},
star_set::StarSet{<:Integer},
decompression_uplo::Symbol,
) where {T}
(; star, hub) = star_set
S = pattern(ag)
edge_to_index = edge_indices(ag)
n = S.n
rvS = rowvals(S)
compressed_indices = zeros(T, nnz(S)) # needs to be independent from the storage in the graph, in case the graph gets reused
nb_indices = nnz(S)
if decompression_uplo != :F
nb_indices = nb_edges(ag) + ag.nb_self_loops
end
compressed_indices = zeros(T, nb_indices) # needs to be independent from the storage in the graph, in case the graph gets reused
l = 0
for j in axes(S, 2)
for k in nzrange(S, j)
i = rvS[k]
if i == j
# diagonal coefficients
l += 1
c = color[i]
compressed_indices[k] = (c - 1) * n + i
compressed_indices[l] = (c - 1) * n + i
else
# off-diagonal coefficients
index_ij = edge_to_index[k]
s = star[index_ij]
h = abs(hub[s])

# Assign the non-hub vertex (spoke) to the correct position in spokes
if i == h
# i is the hub and j is the spoke
c = color[i]
compressed_indices[k] = (c - 1) * n + j
else # j == h
# j is the hub and i is the spoke
c = color[j]
compressed_indices[k] = (c - 1) * n + i
if in_triangle(i, j, decompression_uplo)
# off-diagonal coefficients
l += 1
index_ij = edge_to_index[k]
s = star[index_ij]
h = abs(hub[s])

# Assign the non-hub vertex (spoke) to the correct position in spokes
if i == h
# i is the hub and j is the spoke
c = color[i]
compressed_indices[l] = (c - 1) * n + j
else # j == h
# j is the hub and i is the spoke
c = color[j]
compressed_indices[l] = (c - 1) * n + i
end
end
end
end
Expand Down Expand Up @@ -391,6 +407,7 @@ struct TreeSetColoringResult{
lower_triangle_offsets::Vector{T}
upper_triangle_offsets::Vector{T}
buffer::Vector{R}
decompression_uplo::Symbol
end

function TreeSetColoringResult(
Expand All @@ -399,6 +416,7 @@ function TreeSetColoringResult(
color::Vector{<:Integer},
tree_set::TreeSet{<:Integer},
decompression_eltype::Type{R},
decompression_uplo::Symbol,
) where {T<:Integer,R}
(; reverse_bfs_orders, tree_edge_indices, nt) = tree_set
(; S, nb_self_loops) = ag
Expand All @@ -408,7 +426,7 @@ function TreeSetColoringResult(

# Vector for the decompression of the diagonal coefficients
diagonal_indices = Vector{T}(undef, nb_self_loops)
diagonal_nzind = Vector{T}(undef, nb_self_loops)
diagonal_nzind = (decompression_uplo == :F) ? Vector{T}(undef, nb_self_loops) : T[]

if !augmented_graph(ag)
l = 0
Expand All @@ -418,16 +436,18 @@ function TreeSetColoringResult(
if i == j
l += 1
diagonal_indices[l] = i
diagonal_nzind[l] = k
if decompression_uplo == :F
diagonal_nzind[l] = k
end
end
end
end
end

# Vectors for the decompression of the off-diagonal coefficients
nedges = nb_edges(ag)
lower_triangle_offsets = Vector{T}(undef, nedges)
upper_triangle_offsets = Vector{T}(undef, nedges)
lower_triangle_offsets = decompression_uplo == :U ? T[] : Vector{T}(undef, nedges)
upper_triangle_offsets = decompression_uplo == :L ? T[] : Vector{T}(undef, nedges)

# Index in lower_triangle_offsets and upper_triangle_offsets
index_offsets = 0
Expand All @@ -451,21 +471,29 @@ function TreeSetColoringResult(
if in_triangle(i, j, :L)
# uplo = :L or uplo = :F
# S[i,j] is stored at index_ij = (S.colptr[j+1] - offset_L) in S.nzval
lower_triangle_offsets[index_offsets] = length(col_j) - searchsortedfirst(col_j, i) + 1
if decompression_uplo != :U
lower_triangle_offsets[index_offsets] = length(col_j) - searchsortedfirst(col_j, i) + 1
end

# uplo = :U or uplo = :F
# S[j,i] is stored at index_ji = (S.colptr[i] + offset_U) in S.nzval
upper_triangle_offsets[index_offsets] = searchsortedfirst(col_i, j)::Int - 1
if decompression_uplo != :L
upper_triangle_offsets[index_offsets] = searchsortedfirst(col_i, j)::Int - 1
end

# S[i,j] is in the upper triangular part of S
else
# uplo = :U or uplo = :F
# S[i,j] is stored at index_ij = (S.colptr[j] + offset_U) in S.nzval
upper_triangle_offsets[index_offsets] = searchsortedfirst(col_j, i)::Int - 1
if decompression_uplo != :L
upper_triangle_offsets[index_offsets] = searchsortedfirst(col_j, i)::Int - 1
end

# uplo = :L or uplo = :F
# S[j,i] is stored at index_ji = (S.colptr[i+1] - offset_L) in S.nzval
lower_triangle_offsets[index_offsets] = length(col_i) - searchsortedfirst(col_i, j) + 1
if decompression_uplo != :U
lower_triangle_offsets[index_offsets] = length(col_i) - searchsortedfirst(col_i, j) + 1
end
end
#! format: on
end
Expand All @@ -488,6 +516,7 @@ function TreeSetColoringResult(
lower_triangle_offsets,
upper_triangle_offsets,
buffer,
decompression_uplo,
)
end

Expand Down
Loading