Skip to content

Only multiply in mul! for a non-zero alpha #426

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

Only multiply in mul! for a non-zero alpha #426

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
56 changes: 40 additions & 16 deletions src/fillalgebra.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,41 +157,65 @@ end
function mul!(y::AbstractVector, A::AbstractFillMatrix, b::AbstractFillVector, alpha::Number, beta::Number)
check_matmul_sizes(y, A, b)

Abα = Ref(getindex_value(A) * getindex_value(b) * alpha * length(b))

if iszero(beta)
y .= Abα
if iszero(alpha)
if iszero(beta)
y .= Ref(zero(eltype(y)))
else
y .*= beta
end
else
y .= Abα .+ y .* beta
Abα = Ref(getindex_value(A) * getindex_value(b) * alpha * length(b))
if iszero(beta)
y .= Abα
else
y .= Abα .+ y .* beta
end
end
y
end

function mul!(y::StridedVector, A::StridedMatrix, b::AbstractFillVector, alpha::Number, beta::Number)
check_matmul_sizes(y, A, b)

bα = Ref(getindex_value(b) * alpha)

if iszero(beta)
y .= Ref(zero(eltype(y)))
if iszero(alpha) || iszero(length(b))
y .= Ref(zero(eltype(y)))
else
bα = Ref(getindex_value(b) * alpha)
y .= zero.(view(A, :, 1) .* bα)
end
else
rmul!(y, beta)
y .*= beta
end
for Acol in eachcol(A)
@. y += Acol * bα
if iszero(alpha)
return y
end
bα = Ref(getindex_value(b) * alpha)
if !iszero(bα[])
for Acol in eachcol(A)
@. y += Acol * bα
end
end
y
end

function mul!(y::StridedVector, A::AbstractFillMatrix, b::StridedVector, alpha::Number, beta::Number)
check_matmul_sizes(y, A, b)

Abα = Ref(getindex_value(A) * sum(b) * alpha)

if iszero(beta)
y .= Abα
if iszero(alpha)
if iszero(beta)
y .= Ref(zero(eltype(y)))
else
y .*= beta
end
else
y .= Abα .+ y .* beta
Abα = Ref(getindex_value(A) * sum(b) * alpha)

if iszero(beta)
y .= Abα
else
y .= Abα .+ y .* beta
end
end
y
end
Expand Down
Loading