Skip to content

Commit 54e20ee

Browse files
dkarraschKristofferC
authored andcommitted
Check sizes in 3-arg diagonal (dot-)product (#47114)
(cherry picked from commit 25e3809)
1 parent 4a64b23 commit 54e20ee

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

stdlib/LinearAlgebra/src/diagonal.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,9 @@ end
699699
dot(A::AbstractMatrix, B::Diagonal) = conj(dot(B, A))
700700

701701
function _mapreduce_prod(f, x, D::Diagonal, y)
702+
if !(length(x) == length(D.diag) == length(y))
703+
throw(DimensionMismatch("x has length $(length(x)), D has size $(size(D)), and y has $(length(y))"))
704+
end
702705
if isempty(x) && isempty(D) && isempty(y)
703706
return zero(Base.promote_op(f, eltype(x), eltype(D), eltype(y)))
704707
else

stdlib/LinearAlgebra/test/diagonal.jl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -738,10 +738,14 @@ end
738738
@test s1 == prod(sign, d)
739739
end
740740

741-
@testset "Empty (#35424)" begin
741+
@testset "Empty (#35424) & size checks (#47060)" begin
742742
@test zeros(0)'*Diagonal(zeros(0))*zeros(0) === 0.0
743743
@test transpose(zeros(0))*Diagonal(zeros(Complex{Int}, 0))*zeros(0) === 0.0 + 0.0im
744744
@test dot(zeros(Int32, 0), Diagonal(zeros(Int, 0)), zeros(Int16, 0)) === 0
745+
@test_throws DimensionMismatch zeros(2)' * Diagonal(zeros(2)) * zeros(3)
746+
@test_throws DimensionMismatch zeros(3)' * Diagonal(zeros(2)) * zeros(2)
747+
@test_throws DimensionMismatch dot(zeros(2), Diagonal(zeros(2)), zeros(3))
748+
@test_throws DimensionMismatch dot(zeros(3), Diagonal(zeros(2)), zeros(2))
745749
end
746750

747751
@testset "Inner product" begin

0 commit comments

Comments
 (0)