Improve sublayout for DualLayout (#39)

* Improve support for subarrays with DualLayout

* v0.4.6

* Update ArrayLayouts.jl

* Increase coverage

* Update runtests.jl

Author: dlfivefifty

Project.toml

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

src/ArrayLayouts.jl

@@ -163,29 +163,25 @@ _copyto!(_, _, dest::AbstractArray{T,N}, src::AbstractArray{V,N}) where {T,V,N}
     Base.invoke(copyto!, Tuple{AbstractArray{T,N},AbstractArray{V,N}}, dest, src)
 
 
-copyto!(dest::LayoutArray{<:Any,N}, src::LayoutArray{<:Any,N}) where N =
-    _copyto!(MemoryLayout(dest), MemoryLayout(src), dest, src)
-copyto!(dest::AbstractArray{<:Any,N}, src::LayoutArray{<:Any,N}) where N =
-    _copyto!(MemoryLayout(dest), MemoryLayout(src), dest, src)
-copyto!(dest::LayoutArray{<:Any,N}, src::AbstractArray{<:Any,N}) where N =
-    _copyto!(MemoryLayout(dest), MemoryLayout(src), dest, src)
-
-copyto!(dest::SubArray{<:Any,N,<:LayoutArray}, src::SubArray{<:Any,N,<:LayoutArray}) where N =
-    _copyto!(MemoryLayout(dest), MemoryLayout(src), dest, src)
-copyto!(dest::SubArray{<:Any,N,<:LayoutArray}, src::LayoutArray{<:Any,N}) where N =
-    _copyto!(MemoryLayout(dest), MemoryLayout(src), dest, src)
-copyto!(dest::LayoutArray{<:Any,N}, src::SubArray{<:Any,N,<:LayoutArray}) where N =
-    _copyto!(MemoryLayout(dest), MemoryLayout(src), dest, src)
-copyto!(dest::SubArray{<:Any,N,<:LayoutArray}, src::AbstractArray{<:Any,N}) where N =
-    _copyto!(MemoryLayout(dest), MemoryLayout(src), dest, src)
-copyto!(dest::AbstractArray{<:Any,N}, src::SubArray{<:Any,N,<:LayoutArray}) where N =
-    _copyto!(MemoryLayout(dest), MemoryLayout(src), dest, src)
+_copyto!(dest, src) = _copyto!(MemoryLayout(dest), MemoryLayout(src), dest, src)
+copyto!(dest::LayoutArray{<:Any,N}, src::LayoutArray{<:Any,N}) where N = _copyto!(dest, src)
+copyto!(dest::AbstractArray{<:Any,N}, src::LayoutArray{<:Any,N}) where N = _copyto!(dest, src)
+copyto!(dest::LayoutArray{<:Any,N}, src::AbstractArray{<:Any,N}) where N = _copyto!(dest, src)
+
+copyto!(dest::SubArray{<:Any,N,<:LayoutArray}, src::SubArray{<:Any,N,<:LayoutArray}) where N = _copyto!(dest, src)
+copyto!(dest::SubArray{<:Any,N,<:LayoutArray}, src::LayoutArray{<:Any,N}) where N = _copyto!(dest, src)
+copyto!(dest::LayoutArray{<:Any,N}, src::SubArray{<:Any,N,<:LayoutArray}) where N = _copyto!(dest, src)
+copyto!(dest::SubArray{<:Any,N,<:LayoutArray}, src::AbstractArray{<:Any,N}) where N = _copyto!(dest, src)
+copyto!(dest::AbstractArray{<:Any,N}, src::SubArray{<:Any,N,<:LayoutArray}) where N = _copyto!(dest, src)
+
+copyto!(dest::LayoutMatrix, src::AdjOrTrans{<:Any,<:LayoutArray}) = _copyto!(dest, src)
+copyto!(dest::LayoutMatrix, src::SubArray{<:Any,2,<:AdjOrTrans{<:Any,<:LayoutArray}}) = _copyto!(dest, src)
+copyto!(dest::AbstractMatrix, src::AdjOrTrans{<:Any,<:LayoutArray}) = _copyto!(dest, src)
+copyto!(dest::AbstractMatrix, src::SubArray{<:Any,2,<:AdjOrTrans{<:Any,<:LayoutArray}}) = _copyto!(dest, src)
 # ambiguity from sparsematrix.jl
 if VERSION ≥ v"1.5"
-    copyto!(dest::LayoutMatrix, src::SparseArrays.AbstractSparseMatrixCSC) =
-        _copyto!(MemoryLayout(dest), MemoryLayout(src), dest, src)
-    copyto!(dest::SubArray{<:Any,2,<:LayoutMatrix}, src::SparseArrays.AbstractSparseMatrixCSC) =
-        _copyto!(MemoryLayout(dest), MemoryLayout(src), dest, src)
+    copyto!(dest::LayoutMatrix, src::SparseArrays.AbstractSparseMatrixCSC) = _copyto!(dest, src)
+    copyto!(dest::SubArray{<:Any,2,<:LayoutMatrix}, src::SparseArrays.AbstractSparseMatrixCSC) = _copyto!(dest, src)
 end
 
 zero!(A::AbstractArray{T}) where T = fill!(A,zero(T))

src/memorylayout.jl

@@ -291,8 +291,14 @@ transposelayout(::RowMajor) = ColumnMajor()
 transposelayout(::DenseColumnMajor) = DenseRowMajor()
 transposelayout(::DenseRowMajor) = DenseColumnMajor()
 transposelayout(::ConjLayout{ML}) where ML = ConjLayout{typeof(transposelayout(ML()))}()
+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')'
 
+_copyto!(dlay, ::DualLayout{ML}, dest::AbstractArray{T,N}, src::AbstractArray{V,N}) where {T,V,N,ML} = 
+    _copyto!(dlay, ML(), dest, src)
 
 # Layouts of PermutedDimsArrays
 """

test/runtests.jl

@@ -69,6 +69,10 @@ MemoryLayout(::Type{MyVector}) = DenseColumnMajor()
         @test copyto!(MyMatrix(Array{Float64}(undef,3,3)), view(A,1:3,1:3)) == A[1:3,1:3]
         @test copyto!(view(MyMatrix(Array{Float64}(undef,5,5)),:,:), A.A) == A
         @test copyto!(Array{Float64}(undef,3,3), view(A,1:3,1:3)) == A[1:3,1:3]
+        @test copyto!(MyMatrix(Array{Float64}(undef,5,5)), A') == A'
+        @test copyto!(MyMatrix(Array{Float64}(undef,5,5)), view(A',:,:)) == A'
+        @test copyto!(Array{Float64}(undef,5,5), A') == A'
+        @test copyto!(Array{Float64}(undef,5,5), view(A',:,:)) == A'
 
         @test qr(A).factors ≈ qr(A.A).factors
         @test qr(A,Val(true)).factors ≈ qr(A.A,Val(true)).factors

test/test_layouts.jl

@@ -83,6 +83,15 @@ struct FooNumber <: Number end
             a = randn(5)
             @test MemoryLayout(a') isa DualLayout{DenseRowMajor}
             @test MemoryLayout(transpose(a)) isa DualLayout{DenseRowMajor}
+            @test MemoryLayout(view(a',:,1:3)) isa DualLayout{RowMajor}
+            @test MemoryLayout(view(a',1,1:3)) isa DenseColumnMajor
+            @test MemoryLayout(view(a',1:1,1:3)) isa RowMajor
+            @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(a',1:1,1:3) isa Array
+
+            @test ArrayLayouts._copyto!(similar(a'), a') == a'
         end
     end