Skip to content

Commit b22e43a

Browse files
committed
Merge pull request #13437 from JuliaLang/anj/amb
Fix ambiguity warnings for triangular solves
2 parents d8adc97 + 127ee86 commit b22e43a

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

base/linalg/triangular.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ end
986986
### Left division with triangle to the left hence rhs cannot be transposed. No quotients.
987987
for (f, g) in ((:\, :A_ldiv_B!), (:Ac_ldiv_B, :Ac_ldiv_B!), (:At_ldiv_B, :At_ldiv_B!))
988988
@eval begin
989-
function ($f){TA,TB,S}(A::AbstractTriangular{TA,S}, B::StridedVecOrMat{TB})
989+
function ($f){TA,TB,S}(A::Union{UnitUpperTriangular{TA,S},UnitLowerTriangular{TA,S}}, B::StridedVecOrMat{TB})
990990
TAB = typeof(zero(TA)*zero(TB) + zero(TA)*zero(TB))
991991
($g)(convert(AbstractArray{TAB}, A), copy_oftype(B, TAB))
992992
end
@@ -995,7 +995,7 @@ end
995995
### Left division with triangle to the left hence rhs cannot be transposed. Quotients.
996996
for (f, g) in ((:\, :A_ldiv_B!), (:Ac_ldiv_B, :Ac_ldiv_B!), (:At_ldiv_B, :At_ldiv_B!))
997997
@eval begin
998-
function ($f){TA,TB,S}(A::AbstractTriangular{TA,S}, B::StridedVecOrMat{TB})
998+
function ($f){TA,TB,S}(A::Union{UpperTriangular{TA,S},LowerTriangular{TA,S}}, B::StridedVecOrMat{TB})
999999
TAB = typeof((zero(TA)*zero(TB) + zero(TA)*zero(TB))/one(TA))
10001000
($g)(convert(AbstractArray{TAB}, A), copy_oftype(B, TAB))
10011001
end
@@ -1013,7 +1013,7 @@ end
10131013
### Right division with triangle to the right hence lhs cannot be transposed. No quotients.
10141014
for (f, g) in ((:/, :A_rdiv_B!), (:A_rdiv_Bc, :A_rdiv_Bc!), (:A_rdiv_Bt, :A_rdiv_Bt!))
10151015
@eval begin
1016-
function ($f){TA,TB,S}(A::StridedVecOrMat{TA}, B::AbstractTriangular{TB,S})
1016+
function ($f){TA,TB,S}(A::StridedVecOrMat{TA}, B::Union{UnitUpperTriangular{TB,S},UnitLowerTriangular{TB,S}})
10171017
TAB = typeof(zero(TA)*zero(TB) + zero(TA)*zero(TB))
10181018
($g)(copy_oftype(A, TAB), convert(AbstractArray{TAB}, B))
10191019
end
@@ -1022,7 +1022,7 @@ end
10221022
### Right division with triangle to the right hence lhs cannot be transposed. Quotients.
10231023
for (f, g) in ((:/, :A_rdiv_B!), (:A_rdiv_Bc, :A_rdiv_Bc!), (:A_rdiv_Bt, :A_rdiv_Bt!))
10241024
@eval begin
1025-
function ($f){TA,TB,S}(A::StridedVecOrMat{TA}, B::AbstractTriangular{TB,S})
1025+
function ($f){TA,TB,S}(A::StridedVecOrMat{TA}, B::Union{UnitUpperTriangular{TB,S},UnitLowerTriangular{TB,S}})
10261026
TAB = typeof((zero(TA)*zero(TB) + zero(TA)*zero(TB))/one(TA))
10271027
($g)(copy_oftype(A, TAB), convert(AbstractArray{TAB}, B))
10281028
end

0 commit comments

Comments
 (0)