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

Jump to bottom

Make sure reductions benefit from sparsity #244

Merged
merged 13 commits into from
Sep 16, 2022
Merged

Make sure reductions benefit from sparsity #244

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
934a681
Add `count` w/o predicate
dkarrasch Sep 1, 2022
8d240da
lower hook, handle adjortrans
dkarrasch Sep 1, 2022
422fddd
use more fallbacks
dkarrasch Sep 1, 2022
c1a0a23
add `iszero` for sparse vectors
dkarrasch Sep 1, 2022
6484bbd
handle mapreduce for AdjOrTrans
dkarrasch Sep 1, 2022
9d17f12
fix performance of all and any
dkarrasch Sep 1, 2022
33dec50
rm AdjOrTrans handling
dkarrasch Sep 2, 2022
6a3bc99
same with _any and _all
dkarrasch Sep 2, 2022
3406762
more tests
dkarrasch Sep 5, 2022
3cd18db
improve coverage
dkarrasch Sep 6, 2022
ae1f7ef
fix copy-paste errors
dkarrasch Sep 6, 2022
1db38ba
fix test?
dkarrasch Sep 6, 2022
170a811
fix all-zero case
dkarrasch Sep 6, 2022
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
1 change: 1 addition & 0 deletions src/sparsematrix.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ nnz1(S) = sum(length.(nzrange.(Ref(S), axes(S, 2))))
function count(pred, S::AbstractSparseMatrixCSC)
count(pred, nzvalview(S)) + pred(zero(eltype(S)))*(prod(size(S)) - nnz(S))
end
count(S::AbstractSparseMatrixCSC{Bool}) = count(identity, S)
dkarrasch marked this conversation as resolved.
Show resolved Hide resolved

"""
nonzeros(A)
Expand Down
1 change: 1 addition & 0 deletions src/sparsevector.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ const SVorFSV{Tv,Ti} = Union{SparseVector{Tv,Ti},FixedSparseVector{Tv,Ti}}
length(x::SVorFSV) = getfield(x, :n)
size(x::SVorFSV) = (getfield(x, :n),)
count(f, x::AbstractCompressedVector) = count(f, nonzeros(x)) + f(zero(eltype(x)))*(length(x) - nnz(x))
count(x::AbstractCompressedVector{Bool}) = count(identity, x)

# implement the nnz - nzrange - nonzeros - rowvals interface for sparse vectors

Expand Down
6 changes: 3 additions & 3 deletions test/sparsematrix_constructors_indexing.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,12 +445,12 @@ end

@testset "setindex" begin
a = spzeros(Int, 10, 10)
@test count(!iszero, a) == 0
@test count(!iszero, a) == count((!iszero).(a)) == 0
a[1,:] .= 1
@test count(!iszero, a) == 10
@test count(!iszero, a) == count((!iszero).(a)) == 10
@test a[1,:] == sparse(fill(1,10))
a[:,2] .= 2
@test count(!iszero, a) == 19
@test count(!iszero, a) == count((!iszero).(a)) == 19
@test a[:,2] == sparse(fill(2,10))
b = copy(a)

Expand Down