Skip to content

Avoid constructing MulAddMuls #623

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
amontoison merged 2 commits into from
Oct 16, 2024
Merged

Avoid constructing MulAddMuls #623

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89bcbe9
Avoid constructing `MulAddMul`s
dkarrasch Apr 23, 2024
829e1cc
Merge branch 'JuliaGPU:master' into dkarrasch-patch-1
dkarrasch Oct 16, 2024
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
20 changes: 13 additions & 7 deletions src/blas/highlevel.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,14 @@ LinearAlgebra.generic_trimatdiv!(
isunitc, A, C === B ? C : copyto!(C, B))

# GEMV

# legacy method
LinearAlgebra.generic_matvecmul!(
Y::ROCVector, tA::AbstractChar, A::StridedROCMatrix, B::StridedROCVector,
_add::MulAddMul
) = LinearAlgebra.generic_matvecmul!(Y, tA, A, B, _add.alpha, _add.beta)
function LinearAlgebra.generic_matvecmul!(
Y::ROCVector, tA::AbstractChar, A::StridedROCMatrix, B::StridedROCVector,
_add::MulAddMul,
alpha::Number, beta::Number,
)
mA, nA = tA == 'N' ? size(A) : reverse(size(A))

Expand All @@ -122,7 +126,6 @@ function LinearAlgebra.generic_matvecmul!(
nA == 0 && return rmul!(Y, 0)

T = eltype(Y)
alpha, beta = _add.alpha, _add.beta
if alpha isa Union{Bool,T} && beta isa Union{Bool,T}
α, β = T(alpha), T(beta)
if T <: ROCBLASFloat && eltype(A) == eltype(B) == T
Expand All @@ -135,19 +138,22 @@ function LinearAlgebra.generic_matvecmul!(
end
end
end
LinearAlgebra.generic_matmatmul!(Y, tA, 'N', A, B, MulAddMul(alpha, beta))
LinearAlgebra.generic_matmatmul!(Y, tA, 'N', A, B, alpha, beta)
end

#
# BLAS 3
#

function LinearAlgebra.generic_matmatmul!(
# legacy method
LinearAlgebra.generic_matmatmul!(
C::StridedROCVecOrMat, tA, tB, A::StridedROCVecOrMat,
B::StridedROCVecOrMat, _add::MulAddMul,
) = LinearAlgebra.generic_matmatmul!(C, tA, tB, A, B, _add.alpha, _add.beta)
function LinearAlgebra.generic_matmatmul!(
C::StridedROCVecOrMat, tA, tB, A::StridedROCVecOrMat,
B::StridedROCVecOrMat, alpha::Number, beta::Number,
)
T = eltype(C)
alpha, beta = _add.alpha, _add.beta
mA, nA = size(A, tA == 'N' ? 1 : 2), size(A, tA == 'N' ? 2 : 1)
mB, nB = size(B, tB == 'N' ? 1 : 2), size(B, tB == 'N' ? 2 : 1)

Expand Down