Skip to content

Allow non-sorted indices in sparse matrix formats #656

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Allow non-sorted indices in sparse matrix formats #656

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
17 changes: 12 additions & 5 deletions lib/JLArrays/src/JLArrays.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,12 @@ function Base.getindex(A::JLSparseMatrixCSC{Tv, Ti}, i::Integer, j::Integer) whe
r1 = Int(@inbounds A.colPtr[j])
r2 = Int(@inbounds A.colPtr[j+1]-1)
(r1 > r2) && return zero(Tv)
r1 = searchsortedfirst(view(A.rowVal, r1:r2), i) + r1 - 1
((r1 > r2) || (A.rowVal[r1] != i)) ? zero(Tv) : A.nzVal[r1]
r0 = findfirst(i, view(A.rowVal, r1:r2))
if isnothing(r0)
return zero(Tv)
else
return A.nzVal[something(r0) + r1 - 1]
end
end

mutable struct JLSparseMatrixCSR{Tv, Ti} <: GPUArrays.AbstractGPUSparseMatrixCSR{Tv, Ti}
Expand Down Expand Up @@ -212,9 +216,12 @@ function Base.getindex(A::JLSparseMatrixCSR{Tv, Ti}, i0::Integer, i1::Integer) w
c1 = Int(A.rowPtr[i0])
c2 = Int(A.rowPtr[i0+1]-1)
(c1 > c2) && return zero(Tv)
c1 = searchsortedfirst(A.colVal, i1, c1, c2, Base.Order.Forward)
(c1 > c2 || A.colVal[c1] != i1) && return zero(Tv)
nonzeros(A)[c1]
c0 = findfirst(i1, view(A.colVal, c1:c2))
if isnothing(c0)
return zero(Tv)
else
return nonzeros(A)[something(c0) + c1 - 1]
end
end

GPUArrays.storage(a::JLArray) = a.data
Expand Down
9 changes: 6 additions & 3 deletions src/host/sparse.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,12 @@ function Base.getindex(A::AbstractGPUSparseMatrixCSC{T}, i0::Integer, i1::Intege
r1 = Int(SparseArrays.getcolptr(A)[i1])
r2 = Int(SparseArrays.getcolptr(A)[i1+1]-1)
(r1 > r2) && return zero(T)
r1 = searchsortedfirst(SparseArrays.rowvals(A), i0, r1, r2, Base.Order.Forward)
(r1 > r2 || SparseArrays.rowvals(A)[r1] != i0) && return zero(T)
SparseArrays.nonzeros(A)[r1]
r0 = findfirst(i0, view(SparseArrays.rowvals(A), r1, r2))
if isnothing(r0)
return zero(T)
else
return SparseArrays.nonzeros(A)[something(r0) + r1 - 1]
end
end

## copying between sparse GPU arrays
Expand Down
Loading