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

Special case empty covec-diagonal-vec product #35557

Merged
merged 10 commits into from
Apr 25, 2020
Merged

Special case empty covec-diagonal-vec product #35557

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4660ee7
special case empty covec-diagonal-vec product
MasonProtter Apr 22, 2020
7910d08
Update stdlib/LinearAlgebra/src/diagonal.jl
MasonProtter Apr 22, 2020
df36bf9
Update stdlib/LinearAlgebra/src/diagonal.jl
MasonProtter Apr 22, 2020
310abcd
fix
MasonProtter Apr 23, 2020
ea09f49
revert and don't use broadcast
MasonProtter Apr 23, 2020
a6c3a60
fix all method and reuse function body across 3 methods
MasonProtter Apr 23, 2020
bb51ff6
fix typo
MasonProtter Apr 23, 2020
c907422
fix change of behaviour in dot
MasonProtter Apr 23, 2020
b53e804
Update stdlib/LinearAlgebra/src/diagonal.jl
MasonProtter Apr 23, 2020
876231b
Merge https://github.com/JuliaLang/julia into empty-diagonal
MasonProtter Apr 24, 2020
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: 14 additions & 4 deletions stdlib/LinearAlgebra/src/diagonal.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,10 +659,20 @@ end
# disambiguation methods: * of Diagonal and Adj/Trans AbsVec
*(x::Adjoint{<:Any,<:AbstractVector}, D::Diagonal) = Adjoint(map((t,s) -> t'*s, D.diag, parent(x)))
*(x::Transpose{<:Any,<:AbstractVector}, D::Diagonal) = Transpose(map((t,s) -> transpose(t)*s, D.diag, parent(x)))
*(x::Adjoint{<:Any,<:AbstractVector}, D::Diagonal, y::AbstractVector) =
mapreduce(t -> t[1]*t[2]*t[3], +, zip(x, D.diag, y))
*(x::Transpose{<:Any,<:AbstractVector}, D::Diagonal, y::AbstractVector) =
mapreduce(t -> t[1]*t[2]*t[3], +, zip(x, D.diag, y))
function *(x::Adjoint{<:Any,<:AbstractVector}, D::Diagonal, y::AbstractVector)
if all(isempty.((x, D, y)))
return zero(promote_type(eltype.((x, D, y))...))
else
return mapreduce(t -> t[1]*t[2]*t[3], +, zip(x, D.diag, y))
end
MasonProtter marked this conversation as resolved.
Show resolved Hide resolved
end
function *(x::Transpose{<:Any,<:AbstractVector}, D::Diagonal, y::AbstractVector)
if all(isempty.((x, D, y)))
return zero(promote_type(eltype.((x, D, y))...))
else
return mapreduce(t -> t[1]*t[2]*t[3], +, zip(x, D.diag, y))
end
MasonProtter marked this conversation as resolved.
Show resolved Hide resolved
end
function dot(x::AbstractVector, D::Diagonal, y::AbstractVector)
mapreduce(t -> dot(t[1], t[2], t[3]), +, zip(x, D.diag, y))
MasonProtter marked this conversation as resolved.
Show resolved Hide resolved
end
Expand Down
5 changes: 5 additions & 0 deletions stdlib/LinearAlgebra/test/diagonal.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,4 +711,9 @@ end
@test s1 == prod(sign, d)
end

@testset "Empty (#35424)" begin
@test zeros(0)'*Diagonal(zeros(0))*zeros(0) === 0.0
@test zeros(0)'*Diagonal(zeros(Complex{Int}, 0))*zeros(0) === 0.0 + 0.0im
end

end # module TestDiagonal