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 A_mul_B! for y inputs with NaNs by setting elements to zero when β is zero. #6096

Merged
merged 1 commit into from
Mar 11, 2014
Merged

Fix A_mul_B! for y inputs with NaNs by setting elements to zero when β is zero. #6096

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
28 changes: 22 additions & 6 deletions base/linalg/sparse.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ end
function A_mul_B!(α::Number, A::SparseMatrixCSC, x::AbstractVector, β::Number, y::AbstractVector)
A.n == length(x) || throw(DimensionMismatch(""))
A.m == length(y) || throw(DimensionMismatch(""))
for i = 1:A.m; y[i] *= β; end
if β != 1
β != 0 ? scale!(y,β) : fill!(y,zero(eltype(y)))
end
nzv = A.nzval
rv = A.rowval
for col = 1 : A.n
Expand All @@ -28,17 +30,24 @@ A_mul_B!(y::AbstractVector, A::SparseMatrixCSC, x::AbstractVector) = A_mul_B!(on

function *{TA,S,Tx}(A::SparseMatrixCSC{TA,S}, x::AbstractVector{Tx})
T = promote_type(TA,Tx)
A_mul_B!(one(T), A, x, zero(T), zeros(T, A.m))
A_mul_B!(one(T), A, x, zero(T), Array(T, A.m))
end

function Ac_mul_B!(α::Number, A::SparseMatrixCSC, x::AbstractVector, β::Number, y::AbstractVector)
A.n == length(y) || throw(DimensionMismatch(""))
A.m == length(x) || throw(DimensionMismatch(""))
nzv = A.nzval
rv = A.rowval
zro = zero(eltype(y))
@inbounds begin
for i = 1 : A.n
y[i] *= β
if β != 1
if β != 0
y[i] *= β
else
y[i] = zro
end
end
tmp = zero(eltype(y))
for j = A.colptr[i] : (A.colptr[i+1]-1)
tmp += conj(nzv[j])*x[rv[j]]
Expand All @@ -54,9 +63,16 @@ function At_mul_B!(α::Number, A::SparseMatrixCSC, x::AbstractVector, β::Number
A.m == length(x) || throw(DimensionMismatch(""))
nzv = A.nzval
rv = A.rowval
zro = zero(eltype(y))
@inbounds begin
for i = 1 : A.n
y[i] *= β
if β != 1
if β != 0
y[i] *= β
else
y[i] = zro
end
end
tmp = zero(eltype(y))
for j = A.colptr[i] : (A.colptr[i+1]-1)
tmp += nzv[j]*x[rv[j]]
Expand All @@ -69,11 +85,11 @@ end
At_mul_B!(y::AbstractVector, A::SparseMatrixCSC, x::AbstractVector) = At_mul_B!(one(eltype(x)), A, x, zero(eltype(y)), y)
function Ac_mul_B{TA,S,Tx}(A::SparseMatrixCSC{TA,S}, x::AbstractVector{Tx})
T = promote_type(TA, Tx)
Ac_mul_B!(one(T), A, x, zero(T), zeros(T, A.n))
Ac_mul_B!(one(T), A, x, zero(T), Array(T, A.n))
end
function At_mul_B{TA,S,Tx}(A::SparseMatrixCSC{TA,S}, x::AbstractVector{Tx})
T = promote_type(TA, Tx)
At_mul_B!(one(T), A, x, zero(T), zeros(T, A.n))
At_mul_B!(one(T), A, x, zero(T), Array(T, A.n))
end

*(X::BitArray{1}, A::SparseMatrixCSC) = invoke(*, (AbstractVector, SparseMatrixCSC), X, A)
Expand Down