Skip to content

Test Diagonal functions against non-dense matrices #1316

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 3 commits into from
May 11, 2025
Merged

Test Diagonal functions against non-dense matrices #1316

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff9af69
Test Diagonal functions against non-dense matrices
jishnub Apr 27, 2025
3ebc113
Bespoke wrapper to avoid Diagonal methods
jishnub Apr 27, 2025
e022e2c
Add relative tolerance to power test
jishnub Apr 27, 2025
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
30 changes: 23 additions & 7 deletions test/diagonal.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,17 @@ using .Main.SizedArrays
const n=12 # Size of matrix problem to test
Random.seed!(1)

# wrapper to avoid dispatching to diagonal methods
struct NotDiagonal{T,A<:AbstractMatrix{T}} <: AbstractMatrix{T}
a :: A
end
Base.size(N::NotDiagonal) = size(N.a)
Base.getindex(N::NotDiagonal, i::Int, j::Int) = N.a[i, j]
LinearAlgebra.isdiag(N::NotDiagonal) = false # this contradicts `getindex`
LinearAlgebra.ishermitian(N::NotDiagonal) = ishermitian(N.a)
LinearAlgebra.istriu(N::NotDiagonal) = istriu(N.a)
LinearAlgebra.istril(N::NotDiagonal) = istril(N.a)

@testset for relty in (Float32, Float64, BigFloat), elty in (relty, Complex{relty})
dd=convert(Vector{elty}, randn(n))
vv=convert(Vector{elty}, randn(n))
Expand All @@ -34,13 +45,18 @@ Random.seed!(1)
UU+=im*convert(Matrix{elty}, randn(n,n))
end
D = Diagonal(dd)
DM = Matrix(Diagonal(dd))
M = Matrix(D)
# we can't directly compare with a Matrix, since the dense methods often dispatch
# to Diagonal ones. We therefore compare with other structured matrix types
# which have their own implementations.
# We wrap the complex matrices in NotDiagonal to avoid falling back to Diagonal methods
DM = elty <: Real ? Hermitian(M) : NotDiagonal(UpperTriangular(M))

@testset "constructor" begin
for x in (dd, GenericArray(dd))
@test Diagonal(x)::Diagonal{elty,typeof(x)} == DM
@test Diagonal(x)::Diagonal{elty,typeof(x)} == M
@test Diagonal(x).diag === x
@test Diagonal{elty}(x)::Diagonal{elty,typeof(x)} == DM
@test Diagonal{elty}(x)::Diagonal{elty,typeof(x)} == M
@test Diagonal{elty}(x).diag === x
@test Diagonal{elty}(D) === D
end
Expand Down Expand Up @@ -80,9 +96,9 @@ Random.seed!(1)
@test typeof(convert(Diagonal{ComplexF32},D)) <: Diagonal{ComplexF32}
@test typeof(convert(AbstractMatrix{ComplexF32},D)) <: Diagonal{ComplexF32}

@test Array(real(D)) == real(DM)
@test Array(abs.(D)) == abs.(DM)
@test Array(imag(D)) == imag(DM)
@test Array(real(D)) == real(M)
@test Array(abs.(D)) == abs.(M)
@test Array(imag(D)) == imag(M)

@test parent(D) == dd
@test D[1,1] == dd[1]
Expand Down Expand Up @@ -224,7 +240,7 @@ Random.seed!(1)
if elty <: Real
@test Array(abs.(D)^a) ≈ abs.(DM)^a
else
@test Array(D^a) ≈ DM^a
@test Array(D^a) ≈ DM^a rtol=max(eps(relty), 1e-15) # TODO: improve precision
end
@test Diagonal(1:100)^2 == Diagonal((1:100).^2)
p = 3
Expand Down