Skip to content

Commit a3b5770

Browse files
authored
Avoid constructing MulAddMuls on Julia v1.12+ (#392)
1 parent a8974a4 commit a3b5770

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

lib/mkl/linalg.jl

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,10 @@ end
9191

9292
#
9393
# BLAS 2
94-
#
9594

96-
function LinearAlgebra.generic_matvecmul!(Y::oneVector, tA::AbstractChar, A::oneStridedMatrix, B::oneStridedVector, _add::MulAddMul)
95+
LinearAlgebra.generic_matvecmul!(Y::oneVector, tA::AbstractChar, A::oneStridedMatrix, B::oneStridedVector, _add::MulAddMul) =
96+
LinearAlgebra.generic_matvecmul!(Y, tA, A, B, _add.alpha, _add.beta)
97+
function LinearAlgebra.generic_matvecmul!(Y::oneVector, tA::AbstractChar, A::oneStridedMatrix, B::oneStridedVector, a::Number, b::Number)
9798
mA, nA = tA == 'N' ? size(A) : reverse(size(A))
9899

99100
if nA != length(B)
@@ -113,7 +114,7 @@ function LinearAlgebra.generic_matvecmul!(Y::oneVector, tA::AbstractChar, A::one
113114
end
114115

115116
T = eltype(Y)
116-
alpha, beta = promote(_add.alpha, _add.beta, zero(T))
117+
alpha, beta = promote(a, b, zero(T))
117118
if alpha isa Union{Bool,T} && beta isa Union{Bool,T}
118119
if T <: onemklFloat && eltype(A) == eltype(B) == T
119120
if tA in ('N', 'T', 'C')
@@ -198,9 +199,11 @@ end # VERSION
198199
# BLAS 3
199200
#
200201

201-
function LinearAlgebra.generic_matmatmul!(C::oneStridedMatrix, tA, tB, A::oneStridedVecOrMat, B::oneStridedVecOrMat, _add::MulAddMul=MulAddMul())
202+
LinearAlgebra.generic_matmatmul!(C::oneStridedMatrix, tA, tB, A::oneStridedVecOrMat, B::oneStridedVecOrMat, _add::MulAddMul=MulAddMul()) =
203+
LinearAlgebra.generic_matmatmul!(C, tA, tB, A, B, _add.alpha, _add.beta)
204+
function LinearAlgebra.generic_matmatmul!(C::oneStridedMatrix, tA, tB, A::oneStridedVecOrMat, B::oneStridedVecOrMat, a::Number, b::Number)
202205
T = eltype(C)
203-
alpha, beta = promote(_add.alpha, _add.beta, zero(T))
206+
alpha, beta = promote(a, b, zero(T))
204207
mA, nA = size(A, tA == 'N' ? 1 : 2), size(A, tA == 'N' ? 2 : 1)
205208
mB, nB = size(B, tB == 'N' ? 1 : 2), size(B, tB == 'N' ? 2 : 1)
206209

0 commit comments

Comments
 (0)