Skip to content

RFC: Make sparse multiplication work for AbstractArrays #4404

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

Merged
merged 1 commit into from
Oct 6, 2013
Merged

RFC: Make sparse multiplication work for AbstractArrays #4404

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
18 changes: 11 additions & 7 deletions base/linalg/sparse.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,21 @@ function (*){TvA,TiA,TvB,TiB}(A::SparseMatrixCSC{TvA,TiA}, B::SparseMatrixCSC{Tv
return A * B
end

(*){TvA,TiA}(A::SparseMatrixCSC{TvA,TiA}, X::BitArray{1}) = invoke(*, (SparseMatrixCSC, AbstractVector), A, X)
# In matrix-vector multiplication, the correct orientation of the vector is assumed.
function (*){T1,T2}(A::SparseMatrixCSC{T1}, X::Vector{T2})
function (*){TvA,TiA,TX}(A::SparseMatrixCSC{TvA,TiA}, X::AbstractVector{TX})
if A.n != length(X); error("mismatched dimensions"); end
Y = zeros(promote_type(T1,T2), A.m)
Y = zeros(promote_type(TvA,TX), A.m)
for col = 1 : A.n, k = A.colptr[col] : (A.colptr[col+1]-1)
Y[A.rowval[k]] += A.nzval[k] * X[col]
end
return Y
end

(*)(X::BitArray{1}, A::SparseMatrixCSC) = invoke(*, (AbstractVector, SparseMatrixCSC), X, A)
# In vector-matrix multiplication, the correct orientation of the vector is assumed.
# XXX: this is wrong (i.e. not what Arrays would do)!!
function (*){T1,T2}(X::Vector{T1}, A::SparseMatrixCSC{T2})
function (*){T1,T2}(X::AbstractVector{T1}, A::SparseMatrixCSC{T2})
if A.m != length(X); error("mismatched dimensions"); end
Y = zeros(promote_type(T1,T2), A.n)
for col = 1 : A.n, k = A.colptr[col] : (A.colptr[col+1]-1)
Expand All @@ -29,10 +31,11 @@ function (*){T1,T2}(X::Vector{T1}, A::SparseMatrixCSC{T2})
return Y
end

function (*){T1,T2}(A::SparseMatrixCSC{T1}, X::Matrix{T2})
(*){TvA,TiA}(A::SparseMatrixCSC{TvA,TiA}, X::BitArray{2}) = invoke(*, (SparseMatrixCSC, AbstractMatrix), A, X)
function (*){TvA,TiA,TX}(A::SparseMatrixCSC{TvA,TiA}, X::AbstractMatrix{TX})
mX, nX = size(X)
if A.n != mX; error("mismatched dimensions"); end
Y = zeros(promote_type(T1,T2), A.m, nX)
Y = zeros(promote_type(TvA,TX), A.m, nX)
for multivec_col = 1:nX
for col = 1 : A.n
for k = A.colptr[col] : (A.colptr[col+1]-1)
Expand All @@ -43,10 +46,11 @@ function (*){T1,T2}(A::SparseMatrixCSC{T1}, X::Matrix{T2})
return Y
end

function (*){T1,T2}(X::Matrix{T1}, A::SparseMatrixCSC{T2})
(*){TvA,TiA}(X::BitArray{2}, A::SparseMatrixCSC{TvA,TiA}) = invoke(*, (AbstractMatrix, SparseMatrixCSC), X, A)
function (*){TX,TvA,TiA}(X::AbstractMatrix{TX}, A::SparseMatrixCSC{TvA,TiA})
mX, nX = size(X)
if nX != A.m; error("mismatched dimensions"); end
Y = zeros(promote_type(T1,T2), mX, A.n)
Y = zeros(promote_type(TX,TvA), mX, A.n)
for multivec_row = 1:mX
for col = 1 : A.n
for k = A.colptr[col] : (A.colptr[col+1]-1)
Expand Down