Skip to content

Commit cf9163f

Browse files
committed
Make use of mul indirection
1 parent 5cf41c4 commit cf9163f

File tree

6 files changed

+18
-16
lines changed

6 files changed

+18
-16
lines changed

src/bidiag.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1184,25 +1184,25 @@ function _dibimul!(C::Bidiagonal, A::Diagonal, B::Bidiagonal, _add)
11841184
C
11851185
end
11861186

1187-
function *(A::UpperOrUnitUpperTriangular, B::Bidiagonal)
1187+
function mul(A::UpperOrUnitUpperTriangular, B::Bidiagonal)
11881188
TS = promote_op(matprod, eltype(A), eltype(B))
11891189
C = mul!(similar(A, TS, size(A)), A, B)
11901190
return B.uplo == 'U' ? UpperTriangular(C) : C
11911191
end
11921192

1193-
function *(A::LowerOrUnitLowerTriangular, B::Bidiagonal)
1193+
function mul(A::LowerOrUnitLowerTriangular, B::Bidiagonal)
11941194
TS = promote_op(matprod, eltype(A), eltype(B))
11951195
C = mul!(similar(A, TS, size(A)), A, B)
11961196
return B.uplo == 'L' ? LowerTriangular(C) : C
11971197
end
11981198

1199-
function *(A::Bidiagonal, B::UpperOrUnitUpperTriangular)
1199+
function mul(A::Bidiagonal, B::UpperOrUnitUpperTriangular)
12001200
TS = promote_op(matprod, eltype(A), eltype(B))
12011201
C = mul!(similar(B, TS, size(B)), A, B)
12021202
return A.uplo == 'U' ? UpperTriangular(C) : C
12031203
end
12041204

1205-
function *(A::Bidiagonal, B::LowerOrUnitLowerTriangular)
1205+
function mul(A::Bidiagonal, B::LowerOrUnitLowerTriangular)
12061206
TS = promote_op(matprod, eltype(A), eltype(B))
12071207
C = mul!(similar(B, TS, size(B)), A, B)
12081208
return A.uplo == 'L' ? LowerTriangular(C) : C

src/diagonal.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ Base.literal_pow(::typeof(^), D::Diagonal, valp::Val) =
320320
Diagonal(Base.literal_pow.(^, D.diag, valp)) # for speed
321321
Base.literal_pow(::typeof(^), D::Diagonal, ::Val{-1}) = inv(D) # for disambiguation
322322

323-
function (*)(Da::Diagonal, Db::Diagonal)
323+
function mul(Da::Diagonal, Db::Diagonal)
324324
matmul_size_check(size(Da), size(Db))
325325
return Diagonal(Da.diag .* Db.diag)
326326
end
@@ -1018,8 +1018,8 @@ end
10181018
/(u::AdjointAbsVec, D::Diagonal) = (D' \ u')'
10191019
/(u::TransposeAbsVec, D::Diagonal) = transpose(transpose(D) \ transpose(u))
10201020
# disambiguation methods: Call unoptimized version for user defined AbstractTriangular.
1021-
*(A::AbstractTriangular, D::Diagonal) = @invoke *(A::AbstractMatrix, D::Diagonal)
1022-
*(D::Diagonal, A::AbstractTriangular) = @invoke *(D::Diagonal, A::AbstractMatrix)
1021+
mul(A::AbstractTriangular, D::Diagonal) = @invoke mul(A::AbstractMatrix, D::Diagonal)
1022+
mul(D::Diagonal, A::AbstractTriangular) = @invoke mul(D::Diagonal, A::AbstractMatrix)
10231023

10241024
_opnorm1(A::Diagonal) = maximum(norm(x) for x in A.diag)
10251025
_opnormInf(A::Diagonal) = maximum(norm(x) for x in A.diag)

src/hessenberg.jl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ for T = (:UniformScaling, :Diagonal, :Bidiagonal, :Tridiagonal, :SymTridiagonal,
137137
end
138138
end
139139

140-
for T = (:Number, :UniformScaling, :Diagonal)
140+
for T = (:Number, :UniformScaling)
141141
@eval begin
142142
*(H::UpperHessenberg, x::$T) = UpperHessenberg(H.data * x)
143143
*(x::$T, H::UpperHessenberg) = UpperHessenberg(x * H.data)
@@ -146,11 +146,13 @@ for T = (:Number, :UniformScaling, :Diagonal)
146146
end
147147
end
148148

149-
function *(H::UpperHessenberg, U::UpperOrUnitUpperTriangular)
149+
mul(H::UpperHessenberg, D::Diagonal) = UpperHessenberg(H.data * D)
150+
mul(D::Diagonal, H::UpperHessenberg) = UpperHessenberg(D * H.data)
151+
function mul(H::UpperHessenberg, U::UpperOrUnitUpperTriangular)
150152
HH = mul!(matprod_dest(H, U, promote_op(matprod, eltype(H), eltype(U))), H, U)
151153
UpperHessenberg(HH)
152154
end
153-
function *(U::UpperOrUnitUpperTriangular, H::UpperHessenberg)
155+
function mul(U::UpperOrUnitUpperTriangular, H::UpperHessenberg)
154156
HH = mul!(matprod_dest(U, H, promote_op(matprod, eltype(U), eltype(H))), U, H)
155157
UpperHessenberg(HH)
156158
end

src/special.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,12 @@ _mul!(C::AbstractMatrix, A::AbstractTriangular, B::BandedMatrix, alpha::Number,
120120
_mul!(C::AbstractMatrix, A::BandedMatrix, B::AbstractTriangular, alpha::Number, beta::Number) =
121121
@stable_muladdmul _mul!(C, A, B, MulAddMul(alpha, beta))
122122

123-
function *(H::UpperHessenberg, B::Bidiagonal)
123+
function mul(H::UpperHessenberg, B::Bidiagonal)
124124
T = promote_op(matprod, eltype(H), eltype(B))
125125
A = mul!(similar(H, T, size(H)), H, B)
126126
return B.uplo == 'U' ? UpperHessenberg(A) : A
127127
end
128-
function *(B::Bidiagonal, H::UpperHessenberg)
128+
function mul(B::Bidiagonal, H::UpperHessenberg)
129129
T = promote_op(matprod, eltype(B), eltype(H))
130130
A = mul!(similar(H, T, size(H)), B, H)
131131
return B.uplo == 'U' ? UpperHessenberg(A) : A

src/symmetric.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -702,15 +702,15 @@ for f in (:+, :-)
702702
end
703703
end
704704

705-
*(A::HermOrSym, B::HermOrSym) = A * copyto!(similar(parent(B)), B)
705+
mul(A::HermOrSym, B::HermOrSym) = A * copyto!(similar(parent(B)), B)
706706
# catch a few potential BLAS-cases
707-
function *(A::HermOrSym{<:BlasFloat,<:StridedMatrix}, B::AdjOrTrans{<:BlasFloat,<:StridedMatrix})
707+
function mul(A::HermOrSym{<:BlasFloat,<:StridedMatrix}, B::AdjOrTrans{<:BlasFloat,<:StridedMatrix})
708708
T = promote_type(eltype(A), eltype(B))
709709
mul!(similar(B, T, (size(A, 1), size(B, 2))),
710710
convert(AbstractMatrix{T}, A),
711711
copy_oftype(B, T)) # make sure the AdjOrTrans wrapper is resolved
712712
end
713-
function *(A::AdjOrTrans{<:BlasFloat,<:StridedMatrix}, B::HermOrSym{<:BlasFloat,<:StridedMatrix})
713+
function mul(A::AdjOrTrans{<:BlasFloat,<:StridedMatrix}, B::HermOrSym{<:BlasFloat,<:StridedMatrix})
714714
T = promote_type(eltype(A), eltype(B))
715715
mul!(similar(B, T, (size(A, 1), size(B, 2))),
716716
copy_oftype(A, T), # make sure the AdjOrTrans wrapper is resolved

src/triangular.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1886,7 +1886,7 @@ end
18861886

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

0 commit comments

Comments
 (0)