Skip to content
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

Fix sparse constructor when Tridiagonal/SymTridiagonal are empty #42574

Merged
merged 7 commits into from
Oct 15, 2021
Merged

Fix sparse constructor when Tridiagonal/SymTridiagonal are empty #42574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8d3b328
add path for empty structured matrices in sparse constructors
mcognetta Oct 10, 2021
67a6638
Update stdlib/SparseArrays/test/sparse.jl
mcognetta Oct 10, 2021
9729d89
1x1 tests
mcognetta Oct 13, 2021
850436b
reduce allocations
mcognetta Oct 13, 2021
11cdb16
Update sparsematrix.jl
mcognetta Oct 14, 2021
df9d74e
Apply suggestions from code review
mcognetta Oct 14, 2021
06adc30
add test for SparseMatrixCSC{Tv, Ti}(::Diagonal)
mcognetta Oct 14, 2021
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
8 changes: 6 additions & 2 deletions stdlib/SparseArrays/src/sparsematrix.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,8 @@ SparseMatrixCSC(M::Matrix) = sparse(M)
SparseMatrixCSC(T::Tridiagonal{Tv}) where Tv = SparseMatrixCSC{Tv,Int}(T)
function SparseMatrixCSC{Tv,Ti}(T::Tridiagonal) where {Tv,Ti}
m = length(T.d)
m == 0 && return SparseMatrixCSC{Tv,Ti}(0, 0, ones(Ti, 1), Ti[], Tv[])
m == 1 && return SparseMatrixCSC{Tv,Ti}(1, 1, Ti[1, 2], Ti[1], Tv[T.d[1]])

colptr = Vector{Ti}(undef, m+1)
colptr[1] = 1
Expand Down Expand Up @@ -593,6 +595,8 @@ end
SparseMatrixCSC(T::SymTridiagonal{Tv}) where Tv = SparseMatrixCSC{Tv,Int}(T)
function SparseMatrixCSC{Tv,Ti}(T::SymTridiagonal) where {Tv,Ti}
m = length(T.dv)
m == 0 && return SparseMatrixCSC{Tv,Ti}(0, 0, ones(Ti, 1), Ti[], Tv[])
m == 1 && return SparseMatrixCSC{Tv,Ti}(1, 1, Ti[1, 2], Ti[1], Tv[T.dv[1]])

colptr = Vector{Ti}(undef, m+1)
colptr[1] = 1
Expand Down Expand Up @@ -623,7 +627,7 @@ end
SparseMatrixCSC(B::Bidiagonal{Tv}) where Tv = SparseMatrixCSC{Tv,Int}(B)
function SparseMatrixCSC{Tv,Ti}(B::Bidiagonal) where {Tv,Ti}
m = length(B.dv)
m == 0 && return SparseMatrixCSC{Tv,Ti}(zeros(Tv, 0, 0))
m == 0 && return SparseMatrixCSC{Tv,Ti}(0, 0, ones(Ti, 1), Ti[], Tv[])

colptr = Vector{Ti}(undef, m+1)
colptr[1] = 1
Expand Down Expand Up @@ -652,7 +656,7 @@ end
SparseMatrixCSC(D::Diagonal{Tv}) where Tv = SparseMatrixCSC{Tv,Int}(D)
function SparseMatrixCSC{Tv,Ti}(D::Diagonal) where {Tv,Ti}
m = length(D.diag)
return SparseMatrixCSC(m, m, Vector(1:(m+1)), Vector(1:m), Vector{Tv}(D.diag))
return SparseMatrixCSC(m, m, Vector(Ti(1):Ti(m+1)), Vector(Ti(1):Ti(m)), Vector{Tv}(D.diag))
end
SparseMatrixCSC(M::AbstractMatrix{Tv}) where {Tv} = SparseMatrixCSC{Tv,Int}(M)
SparseMatrixCSC{Tv}(M::AbstractMatrix{Tv}) where {Tv} = SparseMatrixCSC{Tv,Int}(M)
Expand Down
27 changes: 27 additions & 0 deletions stdlib/SparseArrays/test/sparse.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1697,6 +1697,33 @@ end
S2 = SparseMatrixCSC(D)
@test Array(D) == Array(S) == Array(S2)
@test S == S2

# An issue discovered in #42574 where
# SparseMatrixCSC{Tv, Ti}(::Diagonal) ignored Ti
D = Diagonal(rand(3))
S = SparseMatrixCSC{Float64, Int8}(D)
@test S isa SparseMatrixCSC{Float64, Int8}
end

@testset "Sparse construction with empty/1x1 structured matrices" begin
empty = spzeros(0, 0)

@test sparse(Diagonal(zeros(0, 0))) == empty
@test sparse(Bidiagonal(zeros(0, 0), :U)) == empty
@test sparse(Bidiagonal(zeros(0, 0), :L)) == empty
@test sparse(SymTridiagonal(zeros(0, 0))) == empty
@test sparse(Tridiagonal(zeros(0, 0))) == empty

one_by_one = rand(1,1)
sp_one_by_one = sparse(one_by_one)

@test sparse(Diagonal(one_by_one)) == sp_one_by_one
@test sparse(Bidiagonal(one_by_one, :U)) == sp_one_by_one
@test sparse(Bidiagonal(one_by_one, :L)) == sp_one_by_one
@test sparse(Tridiagonal(one_by_one)) == sp_one_by_one

s = SymTridiagonal(rand(1), rand(0))
@test sparse(s) == s
end

@testset "error conditions for reshape, and dropdims" begin
Expand Down