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 dispatch of SparseMatrixCSC*Diagonal multiplication #29045

Merged
merged 4 commits into from
Sep 5, 2018
Merged

Fix dispatch of SparseMatrixCSC*Diagonal multiplication #29045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
52fa288
Fix type signature of mul! methods for multiplying SparseMatrixCSCs w…
Pbellive Sep 4, 2018
61af5c1
Add SparseMatrixCSC*Diagonal dispatch test
Pbellive Sep 4, 2018
13105cd
Fix trailing whitespace
Pbellive Sep 4, 2018
1fe0e11
Don't copy with deepcopy
andreasnoack Sep 5, 2018
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
4 changes: 2 additions & 2 deletions stdlib/SparseArrays/src/linalg.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,7 +968,7 @@ function copyinds!(C::SparseMatrixCSC, A::SparseMatrixCSC)
end

# multiply by diagonal matrix as vector
function mul!(C::SparseMatrixCSC, A::SparseMatrixCSC, D::Diagonal{<:Vector})
function mul!(C::SparseMatrixCSC, A::SparseMatrixCSC, D::Diagonal{T, <:Vector}) where T
m, n = size(A)
b = D.diag
(n==length(b) && size(A)==size(C)) || throw(DimensionMismatch())
Expand All @@ -982,7 +982,7 @@ function mul!(C::SparseMatrixCSC, A::SparseMatrixCSC, D::Diagonal{<:Vector})
C
end

function mul!(C::SparseMatrixCSC, D::Diagonal{<:Vector}, A::SparseMatrixCSC)
function mul!(C::SparseMatrixCSC, D::Diagonal{T, <:Vector}, A::SparseMatrixCSC) where T
m, n = size(A)
b = D.diag
(m==length(b) && size(A)==size(C)) || throw(DimensionMismatch())
Expand Down
12 changes: 12 additions & 0 deletions stdlib/SparseArrays/test/sparse.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ using LinearAlgebra
using Base.Printf: @printf
using Random
using Test: guardseed
using InteractiveUtils: @which

@testset "issparse" begin
@test issparse(sparse(fill(1,5,5)))
Expand Down Expand Up @@ -2295,4 +2296,15 @@ end
@test typeof(a) === typeof(na)
end

#PR #29045
@testset "Issue #28934" begin
A = sprand(5,5,0.5)
D = Diagonal(rand(5))
C = copy(A)
m1 = @which mul!(C,A,D)
m2 = @which mul!(C,D,A)
@test m1.module == SparseArrays
@test m2.module == SparseArrays
end

end # module