Skip to content

fix zero shaped matmul #75

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 2 commits into from
Mar 20, 2021
Merged

fix zero shaped matmul #75

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
e389956
fix zero shaped matmul
GiggleLiu Mar 20, 2021
c5b05f8
fix matmul too
GiggleLiu Mar 20, 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
24 changes: 24 additions & 0 deletions src/matmul.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,12 @@ Otherwise, based on the array's size, whether they are transposed, and whether t
C::AbstractMatrix{T}, A::AbstractMatrix, B::AbstractMatrix, α, β, MKN
) where {T}
M, K, N = MKN === nothing ? matmul_sizes(C, A, B) : MKN
if M * N == 0
return
elseif K == 0
matmul_only_β!(C, β)
return
end
pA = zstridedpointer(A); pB = zstridedpointer(B); pC = zstridedpointer(C);
Cb = preserve_buffer(C); Ab = preserve_buffer(A); Bb = preserve_buffer(B);
Mc, Kc, Nc = block_sizes(T); mᵣ, nᵣ = matmul_params();
Expand All @@ -168,6 +174,18 @@ Otherwise, based on the array's size, whether they are transposed, and whether t
end
end # function

function matmul_only_β!(C::AbstractMatrix{T}, β::StaticInt{0}) where T
@avx for i=1:length(C)
C[i] = zero(T)
end
end

function matmul_only_β!(C::AbstractMatrix{T}, β) where T
@avx for i=1:length(C)
C[i] = β * C[i]
end
end

function matmul_st_pack_dispatcher!(pC::AbstractStridedPointer{T}, pA, pB, α, β, M, K, N) where {T}
Mc, Kc, Nc = block_sizes(T)
if (contiguousstride1(pB) ? (Kc * Nc ≥ K * N) : (firstbytestride(pB) ≤ 1600))
Expand Down Expand Up @@ -228,6 +246,12 @@ end
# passing MKN directly would let osmeone skip the size check.
@inline function _matmul!(C::AbstractMatrix{T}, A, B, α, β, nthread, MKN) where {T}#::Union{Nothing,Tuple{Vararg{Integer,3}}}) where {T}
M, K, N = MKN === nothing ? matmul_sizes(C, A, B) : MKN
if M * N == 0
return
elseif K == 0
matmul_only_β!(C, β)
return
end
W = pick_vector_width(T)
pA = zstridedpointer(A); pB = zstridedpointer(B); pC = zstridedpointer(C);
Cb = preserve_buffer(C); Ab = preserve_buffer(A); Bb = preserve_buffer(B);
Expand Down
10 changes: 10 additions & 0 deletions test/_matmul.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,13 @@ end
@test matmul_pack_ab!(similar(AB), A′, B′) ≈ AB
end

@time @testset "zero-sized-matrices" begin
@test Octavian.matmul_serial(randn(0,0), randn(0,0)) == zeros(0, 0)
@test Octavian.matmul_serial(randn(2,3), randn(3,0)) == zeros(2, 0)
@test Octavian.matmul_serial(randn(2,0), randn(0,2)) == zeros(2, 2)
@test Octavian.matmul_serial!(ones(2,2),randn(2,0), randn(0,2), 1.0, 2.0) == ones(2, 2) .* 2
@test Octavian.matmul(randn(0,0), randn(0,0)) == zeros(0, 0)
@test Octavian.matmul(randn(2,3), randn(3,0)) == zeros(2, 0)
@test Octavian.matmul(randn(2,0), randn(0,2)) == zeros(2, 2)
@test Octavian.matmul!(ones(2,2),randn(2,0), randn(0,2), 1.0, 2.0) == ones(2, 2) .* 2
end