Skip to content

Test two combinations in triangular test sets #1294

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 6 commits into from
Apr 22, 2025
Merged

Test two combinations in triangular test sets #1294

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f68e856
Fix variable name in testtriag.jl loop
jishnub Apr 21, 2025
e3eacb6
Remove unintended dot
jishnub Apr 21, 2025
d8530d7
Select types randomly
jishnub Apr 21, 2025
63aeb4a
Revert "Select types randomly"
jishnub Apr 22, 2025
bd03267
Update condition as suggested
jishnub Apr 22, 2025
e883422
Change `elty2` and `eltyB` loop bounds
jishnub Apr 22, 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: 17 additions & 13 deletions test/testtriag.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# This file is a part of Julia. License is MIT: https://julialang.org/license

function rand_except(elty2_list, elty1)
v = copy(elty2_list)
ind_match = findfirst(==(elty1), v)
if !isnothing(ind_match)
deleteat!(v, ind_match)
end
rand(v)
end

# The following test block tries to call all methods in base/linalg/triangular.jl in order for a combination of input element types. Keep the ordering when adding code.
function test_triangular(elty1_types)
n = 9
Expand Down Expand Up @@ -314,12 +323,10 @@ function test_triangular(elty1_types)
@test ((A1 \ A1)::t1) ≈ M1 \ M1

# Begin loop for second Triangular matrix
@testset for elty2 in (Float32, Float64, BigFloat, ComplexF32, ComplexF64, Complex{BigFloat}, Int)
# Only test methods for the same element type and a single combination of mixed element types
# to avoid too much compilation
if !(elty1 == elty2 || elty1 ∈ (ComplexF32, Int) || elty1 ∈ (ComplexF32, Int))
continue
end
# Only test methods for the same element type and a single combination of mixed element types
# to avoid too much compilation
elty2_list = [Float32, Float64, BigFloat, ComplexF32, ComplexF64, Complex{BigFloat}, Int]
@testset for elty2 in (elty1, rand_except(elty2_list, elty1))
@testset for (t2, uplo2) in ((UpperTriangular, :U),
(UnitUpperTriangular, :U),
(LowerTriangular, :L),
Expand Down Expand Up @@ -409,13 +416,10 @@ function test_triangular(elty1_types)
end
end

@testset for eltyB in (Float32, Float64, BigFloat, ComplexF32, ComplexF64, Complex{BigFloat})
# Only test methods for the same element type and a single combination of mixed element types
# to avoid too much compilation
if !(elty1 == eltyB || elty1 ∈ (ComplexF32, Int) || eltyB ∈ (ComplexF32, Int))
continue
end

# Only test methods for the same element type and a single combination of mixed element types
# to avoid too much compilation
eltyB_list = [Float32, Float64, BigFloat, ComplexF32, ComplexF64, Complex{BigFloat}]
@testset for eltyB in (elty1, rand_except(eltyB_list, elty1))
B = convert(Matrix{eltyB}, (elty1 <: Complex ? real(A1) : A1) * fill(1.0, n, n))

Tri = Tridiagonal(rand(eltyB, n - 1), rand(eltyB, n), rand(eltyB, n - 1))
Expand Down