Skip to content

Improve the decompression of star coloring for AbstractMatrix #209

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

Merged
merged 2 commits into from
Mar 25, 2025
Merged

Improve the decompression of star coloring for AbstractMatrix #209

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de23fc7
Improve the decompression of star coloring for AbstractMatrix
amontoison Mar 25, 2025
bb4b579
Fix decompression.jl
amontoison Mar 25, 2025
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
27 changes: 6 additions & 21 deletions src/decompression.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,31 +431,17 @@ end
function decompress!(
A::AbstractMatrix, B::AbstractMatrix, result::StarSetColoringResult, uplo::Symbol=:F
)
(; ag, color, star_set) = result
(; star, hub, spokes) = star_set
(; ag, compressed_indices) = result
(; S) = ag
uplo == :F && check_same_pattern(A, S)
fill!(A, zero(eltype(A)))

# Recover the diagonal coefficients of A
if has_diagonal(ag)
for i in axes(A, 1)
if !iszero(S[i, i])
A[i, i] = B[i, color[i]]
end
end
end

# Recover the off-diagonal coefficients of A
for s in eachindex(hub, spokes)
j = abs(hub[s])
cj = color[j]
for i in spokes[s]
rvS = rowvals(S)
for j in axes(S, 2)
for k in nzrange(S, j)
i = rvS[k]
if in_triangle(i, j, uplo)
A[i, j] = B[i, cj]
end
if in_triangle(j, i, uplo)
A[j, i] = B[i, cj]
A[i, j] = B[compressed_indices[k]]
end
end
end
Expand Down Expand Up @@ -523,7 +509,6 @@ function decompress!(
end
end
end
@assert l == length(nonzeros(A))
end
return A
end
Expand Down