Skip to content

Only @noinline error path in matmul_size_check #1310

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

Merged
merged 4 commits into from
Apr 26, 2025
Merged

Only @noinline error path in matmul_size_check #1310

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4a0185
Only `@noinline` error path in `matmul_size_check`
jishnub Apr 24, 2025
2051f2b
Fix missing variable
jishnub Apr 24, 2025
651edc8
Remove `return nothing` after error throw
jishnub Apr 24, 2025
02cbcb4
Convert unnecesary `LazyString` to `String`
jishnub Apr 26, 2025
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
76 changes: 42 additions & 34 deletions src/matmul.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,52 +412,60 @@ lmul!(A, B)

_vec_or_mat_str(s::Tuple{Any}) = "vector"
_vec_or_mat_str(s::Tuple{Any,Any}) = "matrix"
@noinline function matmul_size_check(sizeA::Tuple{Integer,Vararg{Integer}}, sizeB::Tuple{Integer,Vararg{Integer}})
function matmul_size_check(sizeA::Tuple{Integer,Vararg{Integer}}, sizeB::Tuple{Integer,Vararg{Integer}})
szA2 = get(sizeA, 2, 1)
if szA2 != sizeB[1]
strA = _vec_or_mat_str(sizeA)
strB = _vec_or_mat_str(sizeB)
B_size_len = length(sizeB) == 1 ? sizeB[1] : sizeB
size_or_len_str_B = B_size_len isa Integer ? "length" : "size"
dim_or_len_str_B = B_size_len isa Integer ? "length" : "first dimension"
pos_str_A = LazyString(length(sizeA) == length(sizeB) ? "first " : "", strA)
pos_str_B = LazyString(length(sizeA) == length(sizeB) ? "second " : "", strB)
throw(DimensionMismatch(
LazyString(
lazy"incompatible dimensions for matrix multiplication: ",
lazy"tried to multiply a $strA of size $sizeA with a $strB of $size_or_len_str_B $B_size_len. ",
lazy"The second dimension of the $pos_str_A: $szA2, does not match the $dim_or_len_str_B of the $pos_str_B: $(sizeB[1])."
)
)
)
matmul_size_check_error(sizeA, sizeB)
end
return nothing
end
@noinline function matmul_size_check(sizeC::Tuple{Integer,Vararg{Integer}}, sizeA::Tuple{Integer,Vararg{Integer}}, sizeB::Tuple{Integer,Vararg{Integer}})
@noinline function matmul_size_check_error(sizeA::Tuple{Integer,Vararg{Integer}}, sizeB::Tuple{Integer,Vararg{Integer}})
strA = _vec_or_mat_str(sizeA)
strB = _vec_or_mat_str(sizeB)
szA2 = get(sizeA, 2, 1)
B_size_len = length(sizeB) == 1 ? sizeB[1] : sizeB
size_or_len_str_B = B_size_len isa Integer ? "length" : "size"
dim_or_len_str_B = B_size_len isa Integer ? "length" : "first dimension"
pos_str_A = LazyString(length(sizeA) == length(sizeB) ? "first " : "", strA)
pos_str_B = LazyString(length(sizeA) == length(sizeB) ? "second " : "", strB)
throw(DimensionMismatch(
LazyString(
"incompatible dimensions for matrix multiplication: ",
lazy"tried to multiply a $strA of size $sizeA with a $strB of $size_or_len_str_B $B_size_len. ",
lazy"The second dimension of the $pos_str_A: $szA2, does not match the $dim_or_len_str_B of the $pos_str_B: $(sizeB[1])."
)
)
)
end
function matmul_size_check(sizeC::Tuple{Integer,Vararg{Integer}}, sizeA::Tuple{Integer,Vararg{Integer}}, sizeB::Tuple{Integer,Vararg{Integer}})
matmul_size_check(sizeA, sizeB)
szB2 = get(sizeB, 2, 1)
szC2 = get(sizeC, 2, 1)
if sizeC[1] != sizeA[1] || szC2 != szB2
strA = _vec_or_mat_str(sizeA)
strB = _vec_or_mat_str(sizeB)
strC = _vec_or_mat_str(sizeC)
C_size_len = length(sizeC) == 1 ? sizeC[1] : sizeC
size_or_len_str_C = C_size_len isa Integer ? "length" : "size"
B_size_len = length(sizeB) == 1 ? sizeB[1] : sizeB
size_or_len_str_B = B_size_len isa Integer ? "length" : "size"
destsize = length(sizeB) == length(sizeC) == 1 ? sizeA[1] : (sizeA[1], szB2)
size_or_len_str_dest = destsize isa Integer ? "length" : "size"
throw(DimensionMismatch(
LazyString(
"incompatible destination size: ",
lazy"the destination $strC of $size_or_len_str_C $C_size_len is incomatible with the product of a $strA of size $sizeA and a $strB of $size_or_len_str_B $B_size_len. ",
lazy"The destination must be of $size_or_len_str_dest $destsize."
)
)
)
matmul_size_check_error(sizeC, sizeA, sizeB)
end
return nothing
end
@noinline function matmul_size_check_error(sizeC::Tuple{Integer,Vararg{Integer}}, sizeA::Tuple{Integer,Vararg{Integer}}, sizeB::Tuple{Integer,Vararg{Integer}})
strA = _vec_or_mat_str(sizeA)
strB = _vec_or_mat_str(sizeB)
strC = _vec_or_mat_str(sizeC)
szB2 = get(sizeB, 2, 1)
C_size_len = length(sizeC) == 1 ? sizeC[1] : sizeC
size_or_len_str_C = C_size_len isa Integer ? "length" : "size"
B_size_len = length(sizeB) == 1 ? sizeB[1] : sizeB
size_or_len_str_B = B_size_len isa Integer ? "length" : "size"
destsize = length(sizeB) == length(sizeC) == 1 ? sizeA[1] : (sizeA[1], szB2)
size_or_len_str_dest = destsize isa Integer ? "length" : "size"
throw(DimensionMismatch(
LazyString(
"incompatible destination size: ",
lazy"the destination $strC of $size_or_len_str_C $C_size_len is incomatible with the product of a $strA of size $sizeA and a $strB of $size_or_len_str_B $B_size_len. ",
lazy"The destination must be of $size_or_len_str_dest $destsize."
)
)
)
end

# We may inline the matmul2x2! and matmul3x3! calls for `α == true`
# to simplify the @stable_muladdmul branches
Expand Down