Skip to content

Backports to 1.13 #1528

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

Backports to 1.13 #1528

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions src/diagonal.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,8 @@ end

function rmul!(A::AbstractMatrix, D::Diagonal)
matmul_size_check(size(A), size(D))
axes(A, 2) == axes(D.diag, 1) ||
throw(ArgumentError(lazy"second axis of A, $(axes(A,2)), does not match first axis of D, $(axes(D, 1))"))
for I in CartesianIndices(A)
row, col = Tuple(I)
@inbounds A[row, col] *= D.diag[col]
Expand Down Expand Up @@ -406,6 +408,8 @@ end

function lmul!(D::Diagonal, B::AbstractVecOrMat)
matmul_size_check(size(D), size(B))
axes(D.diag, 1) == axes(B, 1) ||
throw(ArgumentError(lazy"second axis of D, $(axes(D, 2)), does not match first axis of B, $(axes(B, 1))"))
for I in CartesianIndices(B)
row = I[1]
@inbounds B[I] = D.diag[row] * B[I]
Expand Down
2 changes: 2 additions & 0 deletions test/diagonal.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,9 @@ end
D = Diagonal(1:4)
A = OffsetArray(rand(4,4), 2, 2)
@test_throws ArgumentError D * A
@test_throws ArgumentError lmul!(D, A)
@test_throws ArgumentError A * D
@test_throws ArgumentError rmul!(A, D)
@test_throws ArgumentError mul!(similar(A, size(A)), A, D)
@test_throws ArgumentError mul!(similar(A, size(A)), D, A)
end
Expand Down