Skip to content

Faster sparse for AbstractFill #406

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Faster sparse for AbstractFill #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
785e625
Faster sparse for AbstractFill
jishnub Mar 8, 2025
5ebc608
Add Vector conversion
jishnub Mar 9, 2025
5ad9b74
Reduce type conversions
jishnub Mar 9, 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
15 changes: 15 additions & 0 deletions ext/FillArraysSparseArraysExt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ using SparseArrays: SparseVectorUnion
import Base: convert, kron
using FillArrays
using FillArrays: RectDiagonalFill, RectOrDiagonalFill, ZerosVector, ZerosMatrix, getindex_value, AbstractFillVector, _fill_dot
using FillArrays: AbstractFillMatrix
# Specifying the full namespace is necessary because of https://github.com/JuliaLang/julia/issues/48533
# See https://github.com/JuliaStats/LogExpFunctions.jl/pull/63
using FillArrays.LinearAlgebra
Expand All @@ -13,12 +14,26 @@ import LinearAlgebra: dot, kron, I
##################
## Sparse arrays
##################
function SparseVector{Tv,Ti}(F::AbstractFillVector) where {Tv,Ti}
SparseVector{Tv,Ti}(length(F),
convert(Vector{Ti}, axes(F,1)),
fill(convert(Tv, getindex_value(F)), length(F))
)
end

SparseVector{T}(Z::ZerosVector) where T = spzeros(T, length(Z))
SparseVector{Tv,Ti}(Z::ZerosVector) where {Tv,Ti} = spzeros(Tv, Ti, length(Z))

convert(::Type{AbstractSparseVector}, Z::ZerosVector{T}) where T = spzeros(T, length(Z))
convert(::Type{AbstractSparseVector{T}}, Z::ZerosVector) where T= spzeros(T, length(Z))

function SparseMatrixCSC{T,Ti}(F::AbstractFillMatrix) where {T, Ti<:Integer}
SparseMatrixCSC{T,Ti}(size(F)...,
convert(Vector{Ti}, StepRangeLen(oneunit(Ti), Ti(size(F,1)), size(F,2)+1)),
convert(Vector{Ti}, reduce(vcat, fill(map(Ti, axes(F,1)), size(F,2)))),
fill(convert(T, getindex_value(F)), length(F)))
end

SparseMatrixCSC{T}(Z::ZerosMatrix) where T = spzeros(T, size(Z)...)
SparseMatrixCSC{Tv,Ti}(Z::Zeros{T,2,Axes}) where {Tv,Ti<:Integer,T,Axes} = spzeros(Tv, Ti, size(Z)...)

Expand Down
8 changes: 8 additions & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,14 @@ end
testsparsediag(E)
end
end

F = Fill(3, 4, 4)
@test sparse(F) == sparse(fill(3, size(F)...))
@test SparseMatrixCSC{Int8,Int16}(F) isa SparseMatrixCSC{Int8,Int16}

F = Fill(3, 4)
@test sparse(F) == sparse(fill(3, size(F)...))
@test SparseVector{Int8,Int16}(F) isa SparseVector{Int8,Int16}
end

@testset "==" begin
Expand Down
Loading