Skip to content

Make use of mul indirection #1215

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 8 commits into from
Mar 14, 2025
+29 −30
Merged

Make use of mul indirection #1215

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cf9163f
Make use of `mul` indirection
dkarrasch Feb 20, 2025
6e332de
fix
dkarrasch Feb 20, 2025
c31ad3c
Merge branch 'master' into dk/mul
dkarrasch Feb 21, 2025
ea04628
switch to `mul` in diagonal.jl
dkarrasch Feb 21, 2025
723ae63
Merge branch 'master' into dk/mul
dkarrasch Feb 27, 2025
915b8eb
Apply suggestions from code review
dkarrasch Feb 27, 2025
e8bcbad
remove methods, but test abstracttriangular-diag-mul
dkarrasch Feb 28, 2025
f7f4deb
Update test/triangular.jl
dkarrasch Feb 28, 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
8 changes: 4 additions & 4 deletions src/bidiag.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1184,25 +1184,25 @@ function _dibimul!(C::Bidiagonal, A::Diagonal, B::Bidiagonal, _add)
C
end

function *(A::UpperOrUnitUpperTriangular, B::Bidiagonal)
function mul(A::UpperOrUnitUpperTriangular, B::Bidiagonal)
TS = promote_op(matprod, eltype(A), eltype(B))
C = mul!(similar(A, TS, size(A)), A, B)
return B.uplo == 'U' ? UpperTriangular(C) : C
end

function *(A::LowerOrUnitLowerTriangular, B::Bidiagonal)
function mul(A::LowerOrUnitLowerTriangular, B::Bidiagonal)
TS = promote_op(matprod, eltype(A), eltype(B))
C = mul!(similar(A, TS, size(A)), A, B)
return B.uplo == 'L' ? LowerTriangular(C) : C
end

function *(A::Bidiagonal, B::UpperOrUnitUpperTriangular)
function mul(A::Bidiagonal, B::UpperOrUnitUpperTriangular)
TS = promote_op(matprod, eltype(A), eltype(B))
C = mul!(similar(B, TS, size(B)), A, B)
return A.uplo == 'U' ? UpperTriangular(C) : C
end

function *(A::Bidiagonal, B::LowerOrUnitLowerTriangular)
function mul(A::Bidiagonal, B::LowerOrUnitLowerTriangular)
TS = promote_op(matprod, eltype(A), eltype(B))
C = mul!(similar(B, TS, size(B)), A, B)
return A.uplo == 'L' ? LowerTriangular(C) : C
Expand Down
21 changes: 7 additions & 14 deletions src/diagonal.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ Base.literal_pow(::typeof(^), D::Diagonal, valp::Val) =
Diagonal(Base.literal_pow.(^, D.diag, valp)) # for speed
Base.literal_pow(::typeof(^), D::Diagonal, ::Val{-1}) = inv(D) # for disambiguation

function (*)(Da::Diagonal, Db::Diagonal)
function mul(Da::Diagonal, Db::Diagonal)
matmul_size_check(size(Da), size(Db))
return Diagonal(Da.diag .* Db.diag)
end
Expand All @@ -330,28 +330,21 @@ function (*)(D::Diagonal, V::AbstractVector)
return D.diag .* V
end

function _diag_adj_mul(A::AdjOrTransAbsMat, D::Diagonal)
function mul(A::AdjOrTransAbsMat, D::Diagonal)
adj = wrapperop(A)
copy(adj(adj(D) * adj(A)))
end
function _diag_adj_mul(A::AdjOrTransAbsMat{<:Number, <:StridedMatrix}, D::Diagonal{<:Number})
function mul(A::AdjOrTransAbsMat{<:Number, <:StridedMatrix}, D::Diagonal{<:Number})
@invoke *(A::AbstractMatrix, D::AbstractMatrix)
end
function _diag_adj_mul(D::Diagonal, A::AdjOrTransAbsMat)
function mul(D::Diagonal, A::AdjOrTransAbsMat)
adj = wrapperop(A)
copy(adj(adj(A) * adj(D)))
end
function _diag_adj_mul(D::Diagonal{<:Number}, A::AdjOrTransAbsMat{<:Number, <:StridedMatrix})
function mul(D::Diagonal{<:Number}, A::AdjOrTransAbsMat{<:Number, <:StridedMatrix})
@invoke *(D::AbstractMatrix, A::AbstractMatrix)
end

function (*)(A::AdjOrTransAbsMat, D::Diagonal)
_diag_adj_mul(A, D)
end
function (*)(D::Diagonal, A::AdjOrTransAbsMat)
_diag_adj_mul(D, A)
end

function rmul!(A::AbstractMatrix, D::Diagonal)
matmul_size_check(size(A), size(D))
for I in CartesianIndices(A)
Expand Down Expand Up @@ -1054,8 +1047,8 @@ end
/(u::AdjointAbsVec, D::Diagonal) = (D' \ u')'
/(u::TransposeAbsVec, D::Diagonal) = transpose(transpose(D) \ transpose(u))
# disambiguation methods: Call unoptimized version for user defined AbstractTriangular.
*(A::AbstractTriangular, D::Diagonal) = @invoke *(A::AbstractMatrix, D::Diagonal)
*(D::Diagonal, A::AbstractTriangular) = @invoke *(D::Diagonal, A::AbstractMatrix)
mul(A::AbstractTriangular, D::Diagonal) = @invoke mul(A::AbstractMatrix, D::Diagonal)
mul(D::Diagonal, A::AbstractTriangular) = @invoke mul(D::Diagonal, A::AbstractMatrix)

_opnorm1(A::Diagonal) = maximum(norm(x) for x in A.diag)
_opnormInf(A::Diagonal) = maximum(norm(x) for x in A.diag)
Expand Down
10 changes: 7 additions & 3 deletions src/hessenberg.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ for T = (:UniformScaling, :Diagonal, :Bidiagonal, :Tridiagonal, :SymTridiagonal,
end
end

for T = (:Number, :UniformScaling, :Diagonal)
for T = (:Number, :UniformScaling)
@eval begin
*(H::UpperHessenberg, x::$T) = UpperHessenberg(H.data * x)
*(x::$T, H::UpperHessenberg) = UpperHessenberg(x * H.data)
Expand All @@ -146,19 +146,23 @@ for T = (:Number, :UniformScaling, :Diagonal)
end
end

function *(H::UpperHessenberg, U::UpperOrUnitUpperTriangular)
mul(H::UpperHessenberg, D::Diagonal) = UpperHessenberg(H.data * D)
mul(D::Diagonal, H::UpperHessenberg) = UpperHessenberg(D * H.data)
function mul(H::UpperHessenberg, U::UpperOrUnitUpperTriangular)
HH = mul!(matprod_dest(H, U, promote_op(matprod, eltype(H), eltype(U))), H, U)
UpperHessenberg(HH)
end
function *(U::UpperOrUnitUpperTriangular, H::UpperHessenberg)
function mul(U::UpperOrUnitUpperTriangular, H::UpperHessenberg)
HH = mul!(matprod_dest(U, H, promote_op(matprod, eltype(U), eltype(H))), U, H)
UpperHessenberg(HH)
end

/(H::UpperHessenberg, D::Diagonal) = UpperHessenberg(H.data / D)
function /(H::UpperHessenberg, U::UpperTriangular)
HH = _rdiv!(matprod_dest(H, U, promote_op(/, eltype(H), eltype(U))), H, U)
UpperHessenberg(HH)
end
\(D::Diagonal, H::UpperHessenberg) = UpperHessenberg(D \ H.data)
function /(H::UpperHessenberg, U::UnitUpperTriangular)
HH = _rdiv!(matprod_dest(H, U, promote_op(/, eltype(H), eltype(U))), H, U)
UpperHessenberg(HH)
Expand Down
4 changes: 2 additions & 2 deletions src/special.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,12 @@ _mul!(C::AbstractMatrix, A::AbstractTriangular, B::BandedMatrix, alpha::Number,
_mul!(C::AbstractMatrix, A::BandedMatrix, B::AbstractTriangular, alpha::Number, beta::Number) =
@stable_muladdmul _mul!(C, A, B, MulAddMul(alpha, beta))

function *(H::UpperHessenberg, B::Bidiagonal)
function mul(H::UpperHessenberg, B::Bidiagonal)
T = promote_op(matprod, eltype(H), eltype(B))
A = mul!(similar(H, T, size(H)), H, B)
return B.uplo == 'U' ? UpperHessenberg(A) : A
end
function *(B::Bidiagonal, H::UpperHessenberg)
function mul(B::Bidiagonal, H::UpperHessenberg)
T = promote_op(matprod, eltype(B), eltype(H))
A = mul!(similar(H, T, size(H)), B, H)
return B.uplo == 'U' ? UpperHessenberg(A) : A
Expand Down
6 changes: 3 additions & 3 deletions src/symmetric.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,15 +702,15 @@ for f in (:+, :-)
end
end

*(A::HermOrSym, B::HermOrSym) = A * copyto!(similar(parent(B)), B)
mul(A::HermOrSym, B::HermOrSym) = A * copyto!(similar(parent(B)), B)
# catch a few potential BLAS-cases
function *(A::HermOrSym{<:BlasFloat,<:StridedMatrix}, B::AdjOrTrans{<:BlasFloat,<:StridedMatrix})
function mul(A::HermOrSym{<:BlasFloat,<:StridedMatrix}, B::AdjOrTrans{<:BlasFloat,<:StridedMatrix})
T = promote_type(eltype(A), eltype(B))
mul!(similar(B, T, (size(A, 1), size(B, 2))),
convert(AbstractMatrix{T}, A),
copy_oftype(B, T)) # make sure the AdjOrTrans wrapper is resolved
end
function *(A::AdjOrTrans{<:BlasFloat,<:StridedMatrix}, B::HermOrSym{<:BlasFloat,<:StridedMatrix})
function mul(A::AdjOrTrans{<:BlasFloat,<:StridedMatrix}, B::HermOrSym{<:BlasFloat,<:StridedMatrix})
T = promote_type(eltype(A), eltype(B))
mul!(similar(B, T, (size(A, 1), size(B, 2))),
copy_oftype(A, T), # make sure the AdjOrTrans wrapper is resolved
Expand Down
2 changes: 1 addition & 1 deletion src/triangular.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1886,7 +1886,7 @@ end

## Some Triangular-Triangular cases. We might want to write tailored methods
## for these cases, but I'm not sure it is worth it.
for f in (:*, :\)
for f in (:mul, :\)
@eval begin
($f)(A::LowerTriangular, B::LowerTriangular) =
LowerTriangular(@invoke $f(A::LowerTriangular, B::AbstractMatrix))
Expand Down
Loading