diff --git a/src/matrix_multiply.jl b/src/matrix_multiply.jl index 080a5a04..f60b1719 100644 --- a/src/matrix_multiply.jl +++ b/src/matrix_multiply.jl @@ -15,11 +15,15 @@ import LinearAlgebra: BlasFloat, matprod, mul! @inline *(A::StaticArray{Tuple{N,1},<:Any,2}, B::Adjoint{<:Any,<:StaticVector}) where {N} = vec(A) * B @inline *(A::StaticArray{Tuple{N,1},<:Any,2}, B::Transpose{<:Any,<:StaticVector}) where {N} = vec(A) * B +# Avoid LinearAlgebra._quad_matmul's order calculation on equal sizes +@inline *(A::StaticMatMulLike{N,N}, B::StaticMatMulLike{N,N}, C::StaticMatMulLike{N,N}) where {N} = (A*B)*C +@inline *(A::StaticMatMulLike{N,N}, B::StaticMatMulLike{N,N}, C::StaticMatMulLike{N,N}, D::StaticMatMulLike{N,N}) where {N} = ((A*B)*C)*D + """ mul_result_structure(a::Type, b::Type) Get a structure wrapper that should be applied to the result of multiplication of matrices -of given types (a*b). +of given types (a*b). """ function mul_result_structure(a, b) return identity @@ -114,7 +118,6 @@ end b::Union{Transpose{Tb, <:StaticVector}, Adjoint{Tb, <:StaticVector}}) where {sa, sb, Ta, Tb} newsize = (sa[1], sb[2]) exprs = [:(a[$i]*b[$j]) for i = 1:sa[1], j = 1:sb[2]] - return quote @_inline_meta T = promote_op(*, Ta, Tb) @@ -209,7 +212,7 @@ end while m < M mu = min(M, m + M_r) mrange = m+1:mu - + atemps_init = [:($(atemps[k1]) = a[$k1]) for k1 = mrange] exprs_init = [:($(tmps[k1,k2]) = $(atemps[k1]) * b[$(1 + (k2-1) * sb[1])]) for k1 = mrange, k2 = nrange] atemps_loop_init = [:($(atemps[k1]) = a[$(k1-sa[1]) + $(sa[1])*j]) for k1 = mrange] diff --git a/test/matrix_multiply.jl b/test/matrix_multiply.jl index 0f94bd7e..c80586f4 100644 --- a/test/matrix_multiply.jl +++ b/test/matrix_multiply.jl @@ -173,6 +173,12 @@ mul_wrappers = [ @test m*transpose(n) === @SMatrix [8 14; 18 32] @test transpose(m)*transpose(n) === @SMatrix [11 19; 16 28] + # 3- and 4-arg * + @test @inferred(m*n*m) === @SMatrix [49 72; 109 160] + @test @inferred(m*n*m*n) === @SMatrix [386 507; 858 1127] + @test @inferred(m*n'*UpperTriangular(m)) === @SMatrix [8 72; 18 164] + @test @inferred(Diagonal(m)*n*m'*transpose(n)) === @SMatrix [70 122; 496 864] + # check different sizes because there are multiple implementations for matrices of different sizes for (mm, nn) in [ (m, n),