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

Improve error message in inplace transpose #54669

Merged
merged 1 commit into from
Jun 4, 2024
Merged

Improve error message in inplace transpose #54669

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
15 changes: 10 additions & 5 deletions stdlib/LinearAlgebra/src/transpose.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,27 +74,32 @@ julia> A
```
"""
adjoint!(B::AbstractMatrix, A::AbstractMatrix) = transpose_f!(adjoint, B, A)

@noinline function check_transpose_axes(axesA, axesB)
axesB == reverse(axesA) || throw(DimensionMismatch("axes of the destination are incompatible with that of the source"))
end

function transpose!(B::AbstractVector, A::AbstractMatrix)
axes(B,1) == axes(A,2) && axes(A,1) == 1:1 || throw(DimensionMismatch("transpose"))
check_transpose_axes((axes(B,1), axes(B,2)), axes(A))
copyto!(B, A)
end
function transpose!(B::AbstractMatrix, A::AbstractVector)
axes(B,2) == axes(A,1) && axes(B,1) == 1:1 || throw(DimensionMismatch("transpose"))
check_transpose_axes(axes(B), (axes(A,1), axes(A,2)))
copyto!(B, A)
end
function adjoint!(B::AbstractVector, A::AbstractMatrix)
axes(B,1) == axes(A,2) && axes(A,1) == 1:1 || throw(DimensionMismatch("transpose"))
check_transpose_axes((axes(B,1), axes(B,2)), axes(A))
ccopy!(B, A)
end
function adjoint!(B::AbstractMatrix, A::AbstractVector)
axes(B,2) == axes(A,1) && axes(B,1) == 1:1 || throw(DimensionMismatch("transpose"))
check_transpose_axes(axes(B), (axes(A,1), axes(A,2)))
ccopy!(B, A)
end

const transposebaselength=64
function transpose_f!(f, B::AbstractMatrix, A::AbstractMatrix)
inds = axes(A)
axes(B,1) == inds[2] && axes(B,2) == inds[1] || throw(DimensionMismatch(string(f)))
check_transpose_axes(axes(B), inds)

m, n = length(inds[1]), length(inds[2])
if m*n<=4*transposebaselength
Expand Down
10 changes: 10 additions & 0 deletions stdlib/LinearAlgebra/test/adjtrans.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,4 +703,14 @@ end
@test B == At
end

@testset "error message in transpose" begin
v = zeros(2)
A = zeros(1,1)
B = zeros(2,3)
for (t1, t2) in Any[(A, v), (v, A), (A, B)]
@test_throws "axes of the destination are incompatible with that of the source" transpose!(t1, t2)
@test_throws "axes of the destination are incompatible with that of the source" adjoint!(t1, t2)
end
end

end # module TestAdjointTranspose