Skip to content

Commit 987a159

Browse files
committed
Strip defs involving RowVector from base/linalg/symmetric.jl and touch up tests.
1 parent 4a8ded8 commit 987a159

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

base/deprecated.jl

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3033,6 +3033,16 @@ end
30333033
BroadcastStyle(::Type{<:Base.RowVector{T,<:Vector}}) where T = Broadcast.MatrixStyle()
30343034
end
30353035

3036+
# methods involving RowVector from base/linalg/symmetric.jl, to deprecate
3037+
@eval Base.LinAlg begin
3038+
*(A::RowVector, transB::Transpose{<:Any,<:RealHermSymComplexSym}) = A * transB.parent
3039+
*(A::RowVector, adjB::Adjoint{<:Any,<:RealHermSymComplexHerm}) = A * adjB.parent
3040+
\(A::HermOrSym{<:Any,<:StridedMatrix}, B::RowVector) = invoke(\, Tuple{AbstractMatrix, RowVector}, A, B)
3041+
*(A::Adjoint{<:Any,<:RealHermSymComplexHerm}, B::Adjoint{<:Any,<:RowVector}) = A.parent * B
3042+
*(A::Adjoint{<:Any,<:RealHermSymComplexHerm}, B::Transpose{<:Any,<:RowVector}) = A.parent * B
3043+
*(A::Transpose{<:Any,<:RealHermSymComplexSym}, B::Adjoint{<:Any,<:RowVector}) = A.parent * B
3044+
*(A::Transpose{<:Any,<:RealHermSymComplexSym}, B::Transpose{<:Any,<:RowVector}) = A.parent * B
3045+
end
30363046

30373047
# issue #24822
30383048
@deprecate_binding Display AbstractDisplay

base/linalg/symmetric.jl

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,6 @@ mul!(C::StridedMatrix{T}, A::StridedMatrix{T}, B::Hermitian{T,<:StridedMatrix})
339339
*(adjA::Adjoint{<:Any,<:RealHermSymComplexSym}, adjB::Adjoint{<:Any,<:RealHermSymComplexHerm}) = adjA * adjB.parent
340340
*(adjA::Adjoint{<:Any,<:RealHermSymComplexHerm}, adjB::Adjoint{<:Any,<:RealHermSymComplexSym}) = adjA.parent * adjB
341341

342-
# ambiguities with RowVector
343-
*(A::RowVector, transB::Transpose{<:Any,<:RealHermSymComplexSym}) = A * transB.parent
344-
*(A::RowVector, adjB::Adjoint{<:Any,<:RealHermSymComplexHerm}) = A * adjB.parent
345342
# ambiguities with AbstractTriangular
346343
*(transA::Transpose{<:Any,<:RealHermSymComplexSym}, B::AbstractTriangular) = transA.parent * B
347344
*(A::AbstractTriangular, transB::Transpose{<:Any,<:RealHermSymComplexSym}) = A * transB.parent
@@ -372,8 +369,6 @@ det(A::Symmetric) = det(factorize(A))
372369
# Bunch-Kaufman solves can not utilize BLAS-3 for multiple right hand sides
373370
# so using LU is faster for AbstractMatrix right hand side
374371
\(A::HermOrSym{<:Any,<:StridedMatrix}, B::AbstractMatrix) = \(lufact(A), B)
375-
# ambiguity with RowVector
376-
\(A::HermOrSym{<:Any,<:StridedMatrix}, B::RowVector) = invoke(\, Tuple{AbstractMatrix, RowVector}, A, B)
377372

378373
function _inv(A::HermOrSym)
379374
n = checksquare(A)
@@ -759,11 +754,6 @@ end
759754
*(A::Transpose{<:Any,<:RealHermSymComplexSym}, B::Adjoint{<:Any,<:AbstractMatrix}) = A.parent * B
760755
*(A::Transpose{<:Any,<:RealHermSymComplexSym}, B::Transpose{<:Any,<:AbstractVector}) = A.parent * B
761756
*(A::Transpose{<:Any,<:RealHermSymComplexSym}, B::Transpose{<:Any,<:AbstractMatrix}) = A.parent * B
762-
# dismabiguation methods: *(Adj/Trans of RealHermSymComplex{Herm|Sym}, Adj/Trans of RowVector)
763-
*(A::Adjoint{<:Any,<:RealHermSymComplexHerm}, B::Adjoint{<:Any,<:RowVector}) = A.parent * B
764-
*(A::Adjoint{<:Any,<:RealHermSymComplexHerm}, B::Transpose{<:Any,<:RowVector}) = A.parent * B
765-
*(A::Transpose{<:Any,<:RealHermSymComplexSym}, B::Adjoint{<:Any,<:RowVector}) = A.parent * B
766-
*(A::Transpose{<:Any,<:RealHermSymComplexSym}, B::Transpose{<:Any,<:RowVector}) = A.parent * B
767757

768758
# dismabiguation methods: *(Adj/Trans of AbsTri or RealHermSymComplex{Herm|Sym}, Adj/Trans of other)
769759
*(A::Adjoint{<:Any,<:AbstractTriangular}, B::Adjoint{<:Any,<:RealHermSymComplexHerm}) = A * B.parent

test/linalg/symmetric.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,13 +289,13 @@ end
289289
@testset "linalg binary ops" begin
290290
@testset "mat * vec" begin
291291
@test Symmetric(asym)*x+y asym*x+y
292-
# testing fallbacks for RowVector * SymHerm.'
292+
# testing fallbacks for Transpose-vector * SymHerm.'
293293
xadj = x.'
294294
@test xadj * Symmetric(asym).' xadj * asym
295295
@test x' * Symmetric(asym) x' * asym
296296

297297
@test Hermitian(aherm)*x+y aherm*x+y
298-
# testing fallbacks for RowVector * SymHerm'
298+
# testing fallbacks for Adjoint-vector * SymHerm'
299299
xadj = x'
300300
@test x' * Hermitian(aherm) x' * aherm
301301
@test xadj * Hermitian(aherm)' xadj * aherm

0 commit comments

Comments
 (0)