Fixes for adjtrans muladd, and map(copy, ::Diagonal) (#52)

* Fix MulAdd([1,2], [[1,2]',[2,3]')

* Update muladd.jl

* map(copy, ::Diagonal), using in BlockArrays

* 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.5.1"
+version = "0.5.2"
 
 [deps]
 Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"

src/ArrayLayouts.jl

@@ -189,6 +189,9 @@ if VERSION ≥ v"1.5"
     copyto!(dest::SubArray{<:Any,2,<:LayoutMatrix}, src::SparseArrays.AbstractSparseMatrixCSC) = _copyto!(dest, src)
 end
 
+# avoid bad copy in Base
+Base.map(::typeof(copy), D::Diagonal{<:LayoutArray}) = Diagonal(map(copy, D.diag))
+
 zero!(A::AbstractArray{T}) where T = fill!(A,zero(T))
 function zero!(A::AbstractArray{<:AbstractArray})
     for a in A

src/muladd.jl

@@ -399,7 +399,17 @@ copy(M::MulAdd{<:AbstractFillLayout,<:AbstractFillLayout,<:AbstractFillLayout})
 # DualLayout
 ###
 
+transtype(::Adjoint) = adjoint
+transtype(::Transpose) = transpose
+
 function similar(M::MulAdd{<:DualLayout,<:Any,ZerosLayout}, ::Type{T}, (x,y)) where T
-    @assert x ≡ Base.OneTo(1)
-    similar(M.A', T, y)'
+    @assert length(x) == 1
+    trans = transtype(M.A)
+    trans(similar(trans(M.A), T, y))
+end
+
+function similar(M::MulAdd{<:Any,<:DualLayout,ZerosLayout}, ::Type{T}, (x,y)) where T
+    @assert length(x) == 1
+    trans = transtype(M.B)
+    trans(similar(trans(M.B), T, y))
 end

test/runtests.jl

@@ -152,6 +152,12 @@ MemoryLayout(::Type{MyVector}) = DenseColumnMajor()
             @test x' * Symmetric(MyMatrix(A)) ≈ x'Symmetric(A)
             @test transpose(x) * Symmetric(MyMatrix(A)) ≈ transpose(x)Symmetric(A)
         end
+
+        @testset "map(copy, ::Diagonal)" begin
+            # this is needed in BlockArrays
+            D = Diagonal([MyMatrix(randn(2,2)), MyMatrix(randn(2,2))])
+            @test map(copy, D) == D
+        end
     end
 
     @testset "l/rmul!" begin

test/test_muladd.jl

@@ -660,4 +660,13 @@ Random.seed!(0)
         @test ArrayLayouts.dot(a,b) == mul(a',b) == dot(a,b)
         @test eltype(Dot(a,1:5)) == Float64
     end
+
+    @testset "adjtrans muladd" begin
+        A,B = [1 2], [[1,2]',[3,4]']
+        B̃ = [transpose([1,2]), transpose([3,4])]
+        @test copy(MulAdd(A,B)) == A*B
+        @test eltype(MulAdd(A,B)) == eltype(B)
+        @test copy(MulAdd(A,B̃)) == A*B̃
+        @test eltype(MulAdd(A,B̃)) == eltype(B̃)
+    end
 end