Skip to content

Adding spzeroscsr methods. #45

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
cmhamel wants to merge 1 commit into
base: master
Choose a base branch
from
+57 −1
Open

Adding spzeroscsr methods. #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/SparseMatricesCSR.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export SparseMatrixCSR
export SymSparseMatrixCSR
export sparsecsr, symsparsecsr
export colvals, getBi, getoffset
export spzeroscsr

import Polyester: @batch
import Atomix: @atomic
Expand All @@ -33,7 +34,7 @@ end # module
# DONE getrowptr
# DONE getnzval
# DONE getcolval
# TODO spzeros
# DONE spzeros
# TODO spdiagm
# TODO blockdiag
# TODO sprand
Expand Down
18 changes: 18 additions & 0 deletions src/SparseMatrixCSR.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,24 @@ sparsecsr(::Val{Bi},I,J,V,m,n) where Bi = SparseMatrixCSR{Bi}(transpose(sparse(J
sparsecsr(::Val{Bi},I,J,V,m,n,combine) where Bi = SparseMatrixCSR{Bi}(transpose(sparse(J,I,V,n,m,combine)))
dimlub(I) = isempty(I) ? 0 : Int(maximum(I))

"""
spzeroscsr(args...)

Crate a `SparseMatricesCSR` of all zeros
"""
spzeroscsr(m::Integer,n::Integer) = SparseMatrixCSR(transpose(spzeros(n,m)))
spzeroscsr(::Type{Tv},m::Integer,n::Integer) where Tv = SparseMatrixCSR(transpose(spzeros(Tv,n,m)))
spzeroscsr(::Type{Tv},::Type{Ti},m::Integer,n::Integer) where {Tv,Ti} = SparseMatrixCSR(transpose(spzeros(Tv,Ti,n,m)))
# de-splatting variants
spzeroscsr(sz::Tuple{Integer,Integer}) = SparseMatrixCSR(transpose(spzeros((sz[2],sz[1]))))
spzeroscsr(::Type{Tv},sz::Tuple{Integer,Integer}) where Tv = SparseMatrixCSR(transpose(spzeros((sz[2],sz[1]))))
spzeroscsr(::Type{Tv},::Type{Ti},sz::Tuple{Integer,Integer}) where {Ti,Tv} = SparseMatrixCSR(transpose(spzeros(Tv,Ti,(sz[2],sz[1]))))
# below methods require julia 1.10 or later
spzeroscsr(I::AbstractVector,J::AbstractVector) = SparseMatrixCSR(transpose(spzeros(J,I)))
spzeroscsr(I::AbstractVector,J::AbstractVector,m,n) = SparseMatrixCSR(transpose(spzeros(J,I,n,m)))
spzeroscsr(::Type{Tv},I::AbstractVector,J::AbstractVector,m,n) where Tv = SparseMatrixCSR(transpose(spzeros(Tv,J,I,n,m)))


Base.convert(::Type{T},a::T) where T<:SparseMatrixCSR = a
function Base.convert(
::Type{SparseMatrixCSR{Bi,Tv,Ti}},a::SparseMatrixCSR{Bi}) where {Bi,Tv,Ti}
Expand Down
37 changes: 37 additions & 0 deletions test/SparseMatrixCSR.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,43 @@ function test_csr(Bi,Tv,Ti)
@test nnz(A) == length(SparseArrays.nzvalview(A)) == 3
@test SparseArrays.nzvalview(A) == [4., 5, 6]
end

# spzeroscsr tests
csc = spzeros(10, 9)
csr = spzeroscsr(10, 9)
@test csc == csr

csc = spzeros(Tv, 10, 9)
csr = spzeroscsr(Tv, 10, 9)
@test csc == csr

csc = spzeros(Tv, Ti, 10, 9)
csr = spzeroscsr(Tv, Ti, 10, 9)
@test csc == csr

csc = spzeros((10, 9))
csr = spzeroscsr((10, 9))
@test csc == csr

csc = spzeros(Tv, (10, 9))
csr = spzeroscsr(Tv, (10, 9))
@test csc == csr

csc = spzeros(Tv, Ti, (10, 9))
csr = spzeroscsr(Tv, Ti, (10, 9))
@test csc == csr

csc = spzeros(I, J)
csr = spzeroscsr(I, J)
@test csc == csr

csc = spzeros(I, J, maxrows, maxcols)
csr = spzeroscsr(I, J, maxrows, maxcols)
@test csc == csr

csc = spzeros(Tv, I, J, maxrows, maxcols)
csr = spzeroscsr(Tv, I, J, maxrows, maxcols)
@test csc == csr
end

function test_lu(Bi,I,J,V)
Expand Down