Skip to content

Backports to release v1.12 #1429

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

Open
wants to merge 1 commit into
base: release-1.12
Choose a base branch
from
Open

Backports to release v1.12 #1429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/tridiag.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1109,7 +1109,7 @@ function _opnorm1Inf(A::Tridiagonal, p)
case = p == Inf
lowerrange, upperrange = case ? (1:length(A.dl)-1, 2:length(A.dl)) : (2:length(A.dl), 1:length(A.dl)-1)
normfirst, normend = case ? (norm(first(A.d))+norm(first(A.du)), norm(last(A.dl))+norm(last(A.d))) : (norm(first(A.d))+norm(first(A.dl)), norm(last(A.du))+norm(last(A.d)))

size(A, 1) == 2 && return max(normfirst, normend)
return max(
mapreduce(t -> sum(norm, t),
max,
Expand All @@ -1124,7 +1124,7 @@ function _opnorm1Inf(A::SymTridiagonal, p::Real)
size(A, 1) == 1 && return norm(first(A.dv))
lowerrange, upperrange = 1:length(A.ev)-1, 2:length(A.ev)
normfirst, normend = norm(first(A.dv))+norm(first(A.ev)), norm(last(A.ev))+norm(last(A.dv))

size(A, 1) == 2 && return max(normfirst, normend)
return max(
mapreduce(t -> sum(norm, t),
max,
Expand Down
34 changes: 11 additions & 23 deletions test/bidiag.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1139,29 +1139,17 @@ end
end

@testset "opnorms" begin
B = Bidiagonal([1,-2,3,-4], [1,2,3], 'U')

@test opnorm(B, 1) == opnorm(Matrix(B), 1)
@test opnorm(B, 2) ≈ opnorm(Matrix(B), 2)
@test opnorm(B, Inf) == opnorm(Matrix(B), Inf)

B = Bidiagonal([1,-2,3,-4], [1,2,3], 'L')

@test opnorm(B, 1) == opnorm(Matrix(B), 1)
@test opnorm(B, 2) ≈ opnorm(Matrix(B), 2)
@test opnorm(B, Inf) == opnorm(Matrix(B), Inf)

B = Bidiagonal([2], Int[], 'L')

@test opnorm(B, 1) == opnorm(Matrix(B), 1)
@test opnorm(B, 2) ≈ opnorm(Matrix(B), 2)
@test opnorm(B, Inf) == opnorm(Matrix(B), Inf)

B = Bidiagonal([2], Int[], 'U')

@test opnorm(B, 1) == opnorm(Matrix(B), 1)
@test opnorm(B, 2) ≈ opnorm(Matrix(B), 2)
@test opnorm(B, Inf) == opnorm(Matrix(B), Inf)
for B in (Bidiagonal([1,-2,3,-4], [1,2,3], 'U'),
Bidiagonal([1,-2,3,-4], [1,2,3], 'L'),
Bidiagonal([2], Int[], 'L'),
Bidiagonal([2], Int[], 'U'),
Bidiagonal([1,-2], [-4], 'U'),
Bidiagonal([1,-2], [-4], 'L')
)
@test opnorm(B, 1) == opnorm(Matrix(B), 1)
@test opnorm(B, 2) ≈ opnorm(Matrix(B), 2)
@test opnorm(B, Inf) == opnorm(Matrix(B), Inf)
end
end

end # module TestBidiagonal
32 changes: 11 additions & 21 deletions test/tridiag.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,27 +1078,17 @@ end
end

@testset "opnorms" begin
T = Tridiagonal([1,2,3], [1,-2,3,-4], [1,2,3])

@test opnorm(T, 1) == opnorm(Matrix(T), 1)
@test_skip opnorm(T, 2) ≈ opnorm(Matrix(T), 2) # currently missing
@test opnorm(T, Inf) == opnorm(Matrix(T), Inf)

S = SymTridiagonal([1,-2,3,-4], [1,2,3])

@test opnorm(S, 1) == opnorm(Matrix(S), 1)
@test_skip opnorm(S, 2) ≈ opnorm(Matrix(S), 2) # currently missing
@test opnorm(S, Inf) == opnorm(Matrix(S), Inf)

T = Tridiagonal(Int[], [-5], Int[])
@test opnorm(T, 1) == opnorm(Matrix(T), 1)
@test_skip opnorm(T, 2) ≈ opnorm(Matrix(T), 2) # currently missing
@test opnorm(T, Inf) == opnorm(Matrix(T), Inf)

S = SymTridiagonal(T)
@test opnorm(S, 1) == opnorm(Matrix(S), 1)
@test_skip opnorm(S, 2) ≈ opnorm(Matrix(S), 2) # currently missing
@test opnorm(S, Inf) == opnorm(Matrix(S), Inf)
for T in (Tridiagonal([1,2,3], [1,-2,3,-4], [1,2,3]),
SymTridiagonal([1,-2,3,-4], [1,2,3]),
Tridiagonal(Int[], [-5], Int[]),
SymTridiagonal([-5], Int[]),
Tridiagonal([1], [1,-2], [3]),
SymTridiagonal([1,-2], [3])
)
@test opnorm(T, 1) == opnorm(Matrix(T), 1)
@test_skip opnorm(T, 2) ≈ opnorm(Matrix(T), 2) # currently missing
@test opnorm(T, Inf) == opnorm(Matrix(T), Inf)
end
end

end # module TestTridiagonal