Skip to content

Adjoint for vectors may use trailing axes of the parent #52379

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

Merged
merged 3 commits into from
Dec 5, 2023
Merged

Adjoint for vectors may use trailing axes of the parent #52379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5cab259
Adjoint for vectors may use trailing axes of the parent
jishnub Dec 3, 2023
9eb5e69
Add inference tests
jishnub Dec 3, 2023
592891c
Update explicit OffsetArrays test
jishnub Dec 4, 2023
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
2 changes: 1 addition & 1 deletion stdlib/LinearAlgebra/src/adjtrans.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ axes(A::AdjOrTrans) = reverse(axes(A.parent))
length(A::AdjOrTrans) = length(A.parent)
size(v::AdjOrTransAbsVec) = (1, length(v.parent))
size(A::AdjOrTransAbsMat) = reverse(size(A.parent))
axes(v::AdjOrTransAbsVec) = (Base.OneTo(1), axes(v.parent)...)
axes(v::AdjOrTransAbsVec) = (axes(v.parent,2), axes(v.parent)...)
axes(A::AdjOrTransAbsMat) = reverse(axes(A.parent))
IndexStyle(::Type{<:AdjOrTransAbsVec}) = IndexLinear()
IndexStyle(::Type{<:AdjOrTransAbsMat}) = IndexCartesian()
Expand Down
9 changes: 8 additions & 1 deletion stdlib/LinearAlgebra/test/adjtrans.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ using Test, LinearAlgebra

const BASE_TEST_PATH = joinpath(Sys.BINDIR, "..", "share", "julia", "test")

isdefined(Main, :OffsetArrays) || @eval Main include(joinpath($(BASE_TEST_PATH), "testhelpers", "OffsetArrays.jl"))
using .Main.OffsetArrays

@testset "Adjoint and Transpose inner constructor basics" begin
intvec, intmat = [1, 2], [1 2; 3 4]
# Adjoint/Transpose eltype must match the type of the Adjoint/Transpose of the input eltype
Expand Down Expand Up @@ -87,11 +90,15 @@ end
@test size(Transpose(intvec)) == (1, length(intvec))
@test size(Transpose(intmat)) == reverse(size(intmat))
end
@testset "indices methods" begin
@testset "axes methods" begin
@test axes(Adjoint(intvec)) == (Base.OneTo(1), Base.OneTo(length(intvec)))
@test axes(Adjoint(intmat)) == reverse(axes(intmat))
@test axes(Transpose(intvec)) == (Base.OneTo(1), Base.OneTo(length(intvec)))
@test axes(Transpose(intmat)) == reverse(axes(intmat))

A = OffsetArray([1,2], 2)
@test (@inferred axes(A')[2]) === axes(A,1)
@test (@inferred axes(A')[1]) === axes(A,2)
end
@testset "IndexStyle methods" begin
@test IndexStyle(Adjoint(intvec)) == IndexLinear()
Expand Down
3 changes: 2 additions & 1 deletion test/offsetarray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,8 @@ v2 = copy(v)
v = OffsetArray(v0, (-3,))
@test lastindex(v) == 1
@test v ≈ v
@test axes(v') === (Base.OneTo(1), OffsetArrays.IdOffsetRange(Base.OneTo(4), -3))
@test (@inferred axes(v')[1]) === OffsetArrays.IdOffsetRange(Base.OneTo(1))
@test (@inferred axes(v')[2]) === OffsetArrays.IdOffsetRange(Base.OneTo(4), -3)
@test parent(v) == collect(v)
rv = reverse(v)
@test axes(rv) == axes(v)
Expand Down