Require ColumnMajor to call trtrs! (#104)

* Require ColumnMajor to call trtrs!

* Update factorizations.jl

* add tests

Author: dlfivefifty

Project.toml

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

src/factorizations.jl

@@ -126,6 +126,8 @@ copy(M::Lmul{<:AbstractQLayout}) = copyto!(similar(M), M)
 mulreduce(M::Mul{<:AbstractQLayout,<:AbstractQLayout}) = MulAdd(M)
 mulreduce(M::Mul{<:AbstractQLayout}) = Lmul(M)
 mulreduce(M::Mul{<:Any,<:AbstractQLayout}) = Rmul(M)
+mulreduce(M::Mul{<:TriangularLayout,<:AbstractQLayout}) = Rmul(M)
+mulreduce(M::Mul{<:AbstractQLayout,<:TriangularLayout}) = Lmul(M)
 
 function copyto!(dest::AbstractArray{T}, M::Lmul{<:AbstractQLayout}) where T
     A,B = M.A,M.B

src/triangular.jl

@@ -225,29 +225,29 @@ for UNIT in ('U', 'N')
                                                         <:AbstractStridedLayout}) =
             BLAS.trsv!('L', 'T', $UNIT, transpose(triangulardata(M.A)), M.B)
         @inline materialize!(M::BlasMatLdivMat{<:TriangularLayout{'U',$UNIT,<:AbstractRowMajor},
-                                                        <:AbstractStridedLayout}) =
+                                                        <:AbstractColumnMajor}) =
             LAPACK.trtrs!('L', 'T', $UNIT, transpose(triangulardata(M.A)), M.B)
 
         @inline materialize!(M::BlasMatLdivVec{<:TriangularLayout{'L',$UNIT,<:AbstractRowMajor},
                                                         <:AbstractStridedLayout}) =
             BLAS.trsv!('U', 'T', $UNIT, transpose(triangulardata(M.A)), M.B)
         @inline materialize!(M::BlasMatLdivMat{<:TriangularLayout{'L',$UNIT,<:AbstractRowMajor},
-                                                        <:AbstractStridedLayout}) =
+                                                        <:AbstractColumnMajor}) =
             LAPACK.trtrs!('U', 'T', $UNIT, transpose(triangulardata(M.A)), M.B)
 
 
         @inline materialize!(M::BlasMatLdivVec{<:TriangularLayout{'U',$UNIT,<:ConjLayout{<:AbstractRowMajor}},
                                                         <:AbstractStridedLayout}) =
             BLAS.trsv!('L', 'C', $UNIT, triangulardata(M.A)', M.B)
         @inline materialize!(M::BlasMatLdivMat{<:TriangularLayout{'U',$UNIT,<:ConjLayout{<:AbstractRowMajor}},
-                                                        <:AbstractStridedLayout}) =
+                                                        <:AbstractColumnMajor}) =
             LAPACK.trtrs!('L', 'C', $UNIT, triangulardata(M.A)', M.B)            
 
         @inline materialize!(M::BlasMatLdivVec{<:TriangularLayout{'L',$UNIT,<:ConjLayout{<:AbstractRowMajor}},
                                                         <:AbstractStridedLayout}) =
             BLAS.trsv!('U', 'C', $UNIT, triangulardata(M.A)', M.B)
         @inline materialize!(M::BlasMatLdivMat{<:TriangularLayout{'L',$UNIT,<:ConjLayout{<:AbstractRowMajor}},
-                                                        <:AbstractStridedLayout}) =
+                                                        <:AbstractColumnMajor}) =
             LAPACK.trtrs!('U', 'C', $UNIT, triangulardata(M.A)', M.B)            
     end
 end

test/test_muladd.jl

@@ -625,6 +625,8 @@ Random.seed!(0)
         @test Q*Q' ≈ mul(Q,Q')
         @test Q'*Q' ≈ mul(Q',Q')
         @test Q'*Q ≈ mul(Q',Q)
+        @test Q*UpperTriangular(B) ≈ mul(Q, UpperTriangular(B))
+        @test UpperTriangular(B)*Q ≈ mul(UpperTriangular(B), Q)
     end
 
     @testset "Mul" begin