Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add simple 3- and 4-arg * methods #919

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add simple 3- and 4-arg * methods #919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c1cd18
add simple 3-arg and 4-arg * methods
Oct 8, 2020
fbea544
widen to StaticMatMulLike
mcabbott Jun 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/matrix_multiply.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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]
Expand Down
6 changes: 6 additions & 0 deletions test/matrix_multiply.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down