Skip to content

N5 n3 patch 1 #19

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 4 commits into from
Sep 25, 2021
Merged

N5 n3 patch 1 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b4ab3c
Update diagonal.jl
N5N3 Sep 25, 2021
eecbf7c
Update diagonal.jl
N5N3 Sep 25, 2021
83b791f
Update hessenberg.jl
N5N3 Sep 25, 2021
a59ee72
Update diagonal.jl
N5N3 Sep 25, 2021
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
31 changes: 17 additions & 14 deletions stdlib/LinearAlgebra/src/diagonal.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,9 @@ function mul!(C::AbstractMatrix, Da::Diagonal, Db::Diagonal, alpha::Number, beta
return C
end

(/)(A::AbstractVecOrMat, D::Diagonal) =
_rdiv!(similar(A, promote_op(/, eltype(A), eltype(D))), A, D)
_promote_dotop(f, args...) = promote_op(f, eltype.(args)...)

/(A::AbstractVecOrMat, D::Diagonal) = _rdiv!(similar(A, _promote_dotop(/, A, D), size(A)), A, D)

rdiv!(A::AbstractVecOrMat, D::Diagonal) = _rdiv!(A, A, D)
# avoid copy when possible via internal 3-arg backend
Expand All @@ -338,21 +339,10 @@ function _rdiv!(B::AbstractVecOrMat, A::AbstractVecOrMat, D::Diagonal)
end
B
end
# Optimization for Diagonal / Diagonal
function _rdiv!(Dc::Diagonal, Db::Diagonal, Da::Diagonal)
n, k = length(Db.diag), length(Db.diag)
n == k || throw(DimensionMismatch("left hand side has $n columns but D is $k by $k"))
j = findfirst(iszero, Da.diag)
isnothing(j) || throw(SingularException(j))
Dc.diag .= Db.diag ./ Da.diag
Dc
end

(\)(D::Diagonal, B::AbstractVecOrMat) =
ldiv!(similar(B, promote_op(\, eltype(D), eltype(B))), D, B)
\(D::Diagonal, B::AbstractVecOrMat) = ldiv!(similar(B, _promote_dotop(\, D, B), size(B)), D, B)

ldiv!(D::Diagonal, B::AbstractVecOrMat) = ldiv!(B, D, B)
ldiv!(Dc::Diagonal, Da::Diagonal, Db::Diagonal) = Diagonal(ldiv!(Dc.diag, Da, Db.diag))
function ldiv!(B::AbstractVecOrMat, D::Diagonal, A::AbstractVecOrMat)
require_one_based_indexing(A, B)
d = length(D.diag)
Expand All @@ -365,6 +355,19 @@ function ldiv!(B::AbstractVecOrMat, D::Diagonal, A::AbstractVecOrMat)
B .= D.diag .\ A
end

# Optimizations for \, / between Diagonals
\(D::Diagonal, B::Diagonal) = ldiv!(similar(B, _promote_dotop(\, D, B)), D, B)
/(A::Diagonal, D::Diagonal) = _rdiv!(similar(A, _promote_dotop(/, A, D)), A, D)
function _rdiv!(Dc::Diagonal, Db::Diagonal, Da::Diagonal)
n, k = length(Db.diag), length(Db.diag)
n == k || throw(DimensionMismatch("left hand side has $n columns but D is $k by $k"))
j = findfirst(iszero, Da.diag)
isnothing(j) || throw(SingularException(j))
Dc.diag .= Db.diag ./ Da.diag
Dc
end
ldiv!(Dc::Diagonal, Da::Diagonal, Db::Diagonal) = Diagonal(ldiv!(Dc.diag, Da, Db.diag))

# (l/r)mul!, l/rdiv!, *, / and \ Optimization for AbstractTriangular.
# These functions are generally more efficient if we calculate the whole data field.
# The following code implements them in a unified patten to avoid missing.
Expand Down
4 changes: 2 additions & 2 deletions stdlib/LinearAlgebra/test/diagonal.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,8 @@ Random.seed!(1)
@test D2*D' ≈ Array(D2)*Array(D)'

#division of two Diagonals
@test D/D2 ≈ Diagonal(D.diag./D2.diag)
@test D\D2 ≈ Diagonal(D2.diag./D.diag)
@test (D/D2)::Diagonal ≈ Diagonal(D.diag./D2.diag)
@test (D\D2)::Diagonal ≈ Diagonal(D2.diag./D.diag)

# QR \ Diagonal
A = rand(elty, n, n)
Expand Down
6 changes: 2 additions & 4 deletions stdlib/LinearAlgebra/test/hessenberg.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,10 @@ let n = 10
@testset "Multiplication/division" begin
for x = (5, 5I, Diagonal(d), Bidiagonal(d,dl,:U),
UpperTriangular(A), UnitUpperTriangular(A))
@test H*x == Array(H)*x broken = eltype(H) <: Furlong && x isa Bidiagonal
@test x*H == x*Array(H) broken = eltype(H) <: Furlong && x isa Bidiagonal
@test (H*x)::UpperHessenberg == Array(H)*x broken = eltype(H) <: Furlong && x isa Bidiagonal
@test (x*H)::UpperHessenberg == x*Array(H) broken = eltype(H) <: Furlong && x isa Bidiagonal
@test H/x == Array(H)/x broken = eltype(H) <: Furlong && x isa Union{Bidiagonal, UpperTriangular}
@test x\H == x\Array(H) broken = eltype(H) <: Furlong && x isa Union{Bidiagonal, UpperTriangular}
@test H*x isa UpperHessenberg broken = eltype(H) <: Furlong && x isa Bidiagonal
@test x*H isa UpperHessenberg broken = eltype(H) <: Furlong && x isa Bidiagonal
@test H/x isa UpperHessenberg broken = eltype(H) <: Furlong && x isa Bidiagonal
@test x\H isa UpperHessenberg broken = eltype(H) <: Furlong && x isa Bidiagonal
end
Expand Down