Maintain Transpose/Adjoint types and unroll subarrays when materialis… (#136)

* Maintain Transpose/Adjoint types and unroll subarrays when materialising DualLayout

* add tests

* Update ci.yml

* Increase coverage

Author: dlfivefifty

.github/workflows/ci.yml

@@ -14,7 +14,6 @@ jobs:
         version:
           - '1.6'
           - '1'
-          - '^1.9.0-0'          
         os:
           - ubuntu-latest
           - macOS-latest

Project.toml

@@ -1,7 +1,7 @@
 name = "ArrayLayouts"
 uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
 authors = ["Sheehan Olver <[email protected]>"]
-version = "1.0.4"
+version = "1.0.5"
 
 [deps]
 FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"

src/memorylayout.jl

@@ -298,7 +298,14 @@ adjointlayout(::Type{T}, ::DualLayout{ML}) where {T,ML} = adjointlayout(T, ML())
 adjointlayout(::Type{T}, M::MemoryLayout) where T = transposelayout(conjlayout(T, M))
 sublayout(::DualLayout{ML}, ::Type{<:Tuple{KR,JR}}) where {ML,KR<:Slice,JR} = DualLayout{typeof(sublayout(ML(),Tuple{KR,JR}))}()
 sublayout(::DualLayout{ML}, INDS::Type) where ML = sublayout(ML(), INDS)
-sub_materialize(::DualLayout{ML}, A) where ML = sub_materialize(adjointlayout(eltype(A), ML()), A')'
+
+# try to maintain "type" of parent ie adjoint/transpose when materialising, even though layouts are equivalent
+# to preserve special overloads
+_dual_adjoint(a::SubArray{<:Any, 2, <:Any, <:Tuple{Slice,Any}}) = view(parent(a)', parentindices(a)[2])
+_dual_transpose(a::SubArray{<:Any, 2, <:Any, <:Tuple{Slice,Any}}) = view(transpose(parent(a)), parentindices(a)[2])
+sub_materialize(::DualLayout{ML}, A::AbstractMatrix{<:Real}) where ML = sub_materialize(adjointlayout(eltype(A), ML()), _dual_adjoint(A))'
+sub_materialize(::DualLayout{ML}, A::AbstractMatrix) where ML<:ConjLayout = sub_materialize(adjointlayout(eltype(A), ML()), _dual_adjoint(A))'
+sub_materialize(::DualLayout{ML}, A::AbstractMatrix) where ML = transpose(sub_materialize(transposelayout(ML()), _dual_transpose(A)))
 
 _copyto!(dlay, ::DualLayout{ML}, dest::AbstractArray{T,N}, src::AbstractArray{V,N}) where {T,V,N,ML} = 
     _copyto!(dlay, ML(), dest, src)

test/test_layouts.jl

@@ -89,8 +89,14 @@ struct FooNumber <: Number end
             @test (a')[:,1:3] == layout_getindex(a',:,1:3)
             @test (a')[1:1,1:3] == layout_getindex(a',1:1,1:3)
             @test layout_getindex(a',:,1:3) isa Adjoint
+            @test layout_getindex(transpose(a),:,1:3) isa Adjoint
+            @test layout_getindex((a .+ im)',:,1:3) isa Adjoint
+            @test layout_getindex(transpose(a .+ im),:,1:3) isa Transpose
             @test layout_getindex(a',1:1,1:3) isa Array
 
+            @test layout_getindex((a .+ im)',:,1:3) == (a .+ im)[1:3]'
+            @test layout_getindex(transpose(a .+ im),:,1:3) == transpose((a .+ im)[1:3])
+
             @test ArrayLayouts._copyto!(similar(a'), a') == a'
         end
     end
@@ -181,7 +187,9 @@ struct FooNumber <: Number end
         @test colsupport(Symmetric(A),2) ≡ colsupport(Symmetric(A),1:2) ≡ 
                 rowsupport(Symmetric(A),2) ≡ rowsupport(Symmetric(A),1:2) ≡ 1:2
                 @test colsupport(Hermitian(A),2) ≡ colsupport(Hermitian(A),1:2) ≡ 
-                rowsupport(Hermitian(A),2) ≡ rowsupport(Hermitian(A),1:2) ≡ 1:2
+                rowsupport(Hermitian(A),2) ≡ rowsupport(Hermitian(A),1:2) ≡
+                colsupport(Symmetric(A,:L),2) ≡ colsupport(Hermitian(A,:L),2) ≡
+                rowsupport(Symmetric(A,:L),2) ≡ rowsupport(Hermitian(A,:L),2) ≡ 1:2
 
         B = [1.0+im 2; 3 4]
         @test MemoryLayout(Symmetric(B)) == SymmetricLayout{DenseColumnMajor}()
@@ -299,6 +307,9 @@ struct FooNumber <: Number end
         @test layout_getindex(Ones{Int}(1,10), 1, 1:3) ≡ Ones{Int}(3)
         @test layout_getindex(Zeros{Int}(5,10,12), 1, 1:3,4:6) ≡ Zeros{Int}(3,3)
 
+        @test isempty(colsupport(Zeros(5,10), 2))
+        @test isempty(rowsupport(Zeros(5,10), 2))
+
         # views of Fill no longer create Sub Arrays, but are supported
         # as there was no strong need to delete their support
         v = SubArray(Fill(1,10),(1:3,))