Skip to content

Commit c93b432

Browse files
rfourquetrfourquet
authored
reset GLOBAL_RNG state in/out at-testset for reproducibility (#24445)
This is a follow-up on the recently introduced `guardsrand` functionality, first suggested at JuliaLang/julia#16940 (comment). Each `testset` block is now implicitly wrapped in a `guardsrand` block, which is more user-friendly and more systematic (only few users know about `guardsrand`). These are essentially two new features: 1) "in": in base, tests are run with the global RNG randomly seeded, but the seed is printed in case of failure to allow reproducing the failure; but even if the failure occurs after many tests, when they alter the global RNG state, one has to re-run the whole file, which can be time-consuming; with this change, at the beginning of each `testset`, the global RNG is re-seeded with its own seed: this allows to re-run only the failing `testset`, which can be done easily in the REPL (the seeding occurs for each loop in a `testset for`; this also allows to re-arrange `testset`s in arbitrary order w.r.t. the global RNG; 2) "out": a `testset` leaves no tracks of its use of `srand` or `rand` (this "feature" should be less and less needed/useful with the generalization of the use of `testset` blocks). Example: ``` @testset begin srand(123) rand() @testset for T in (Int, Float64) # here is an implicit srand(123), by 1) rand() end rand() # this value will not be affected if the sub-`testset` block # above is removed, or if another rand() call is added therein, by 2) end ``` Note that guardsrand can't be used directly, as then the testset's body is wrapped in a function, which causes problem with overwriting loop variable ("outer"), using `using`, defining new methods, etc. So we need to duplicate guardsrand's logic.
1 parent 3f1e64a commit c93b432

File tree

1 file changed

+94
-94
lines changed

1 file changed

+94
-94
lines changed

‎test/runtests.jl

+94-94
Original file line numberDiff line numberDiff line change
@@ -4,118 +4,118 @@ using IterativeEigensolvers
44
using Test
55

66
@testset "eigs" begin
7-
guardsrand(1234) do
8-
n = 10
9-
areal = sprandn(n,n,0.4)
10-
breal = sprandn(n,n,0.4)
11-
acmplx = complex.(sprandn(n,n,0.4), sprandn(n,n,0.4))
12-
bcmplx = complex.(sprandn(n,n,0.4), sprandn(n,n,0.4))
7+
srand(1234)
8+
n = 10
9+
areal = sprandn(n,n,0.4)
10+
breal = sprandn(n,n,0.4)
11+
acmplx = complex.(sprandn(n,n,0.4), sprandn(n,n,0.4))
12+
bcmplx = complex.(sprandn(n,n,0.4), sprandn(n,n,0.4))
1313

14-
testtol = 1e-6
14+
testtol = 1e-6
1515

16-
@testset for elty in (Float64, ComplexF64)
17-
if elty == ComplexF32 || elty == ComplexF64
18-
a = acmplx
19-
b = bcmplx
20-
else
21-
a = areal
22-
b = breal
23-
end
24-
a_evs = eigvals(Array(a))
25-
a = convert(SparseMatrixCSC{elty}, a)
26-
asym = a' + a # symmetric indefinite
27-
apd = a'*a # symmetric positive-definite
16+
@testset for elty in (Float64, ComplexF64)
17+
if elty == ComplexF32 || elty == ComplexF64
18+
a = acmplx
19+
b = bcmplx
20+
else
21+
a = areal
22+
b = breal
23+
end
24+
a_evs = eigvals(Array(a))
25+
a = convert(SparseMatrixCSC{elty}, a)
26+
asym = a' + a # symmetric indefinite
27+
apd = a'*a # symmetric positive-definite
2828

29-
b = convert(SparseMatrixCSC{elty}, b)
30-
bsym = b' + b
31-
bpd = b'*b
29+
b = convert(SparseMatrixCSC{elty}, b)
30+
bsym = b' + b
31+
bpd = b'*b
3232

33-
(d,v) = eigs(a, nev=3)
34-
@test a*v[:,2] ≈ d[2]*v[:,2]
35-
@test norm(v) > testtol # eigenvectors cannot be null vectors
36-
(d,v) = eigs(a, I, nev=3) # test eigs(A, B; kwargs...)
37-
@test a*v[:,2] ≈ d[2]*v[:,2]
38-
@test norm(v) > testtol # eigenvectors cannot be null vectors
39-
@test_logs (:warn,"Use symbols instead of strings for specifying which eigenvalues to compute") eigs(a, which="LM")
40-
@test_logs (:warn,"Adjusting ncv from 1 to 4") eigs(a, ncv=1, nev=2)
41-
@test_logs (:warn,"Adjusting nev from $n to $(n-2)") eigs(a, nev=n)
42-
# (d,v) = eigs(a, b, nev=3, tol=1e-8) # not handled yet
43-
# @test a*v[:,2] ≈ d[2]*b*v[:,2] atol=testtol
44-
# @test norm(v) > testtol # eigenvectors cannot be null vectors
45-
if elty <: Base.LinAlg.BlasComplex
46-
sr_ind = indmin(real.(a_evs))
47-
(d, v) = eigs(a, nev=1, which=:SR)
48-
@test d[1] ≈ a_evs[sr_ind]
49-
si_ind = indmin(imag.(a_evs))
50-
(d, v) = eigs(a, nev=1, which=:SI)
51-
@test d[1] ≈ a_evs[si_ind]
52-
lr_ind = indmax(real.(a_evs))
53-
(d, v) = eigs(a, nev=1, which=:LR)
54-
@test d[1] ≈ a_evs[lr_ind]
55-
li_ind = indmax(imag.(a_evs))
56-
(d, v) = eigs(a, nev=1, which=:LI)
57-
@test d[1] ≈ a_evs[li_ind]
58-
end
33+
(d,v) = eigs(a, nev=3)
34+
@test a*v[:,2] ≈ d[2]*v[:,2]
35+
@test norm(v) > testtol # eigenvectors cannot be null vectors
36+
(d,v) = eigs(a, I, nev=3) # test eigs(A, B; kwargs...)
37+
@test a*v[:,2] ≈ d[2]*v[:,2]
38+
@test norm(v) > testtol # eigenvectors cannot be null vectors
39+
@test_logs (:warn,"Use symbols instead of strings for specifying which eigenvalues to compute") eigs(a, which="LM")
40+
@test_logs (:warn,"Adjusting ncv from 1 to 4") eigs(a, ncv=1, nev=2)
41+
@test_logs (:warn,"Adjusting nev from $n to $(n-2)") eigs(a, nev=n)
42+
# (d,v) = eigs(a, b, nev=3, tol=1e-8) # not handled yet
43+
# @test a*v[:,2] ≈ d[2]*b*v[:,2] atol=testtol
44+
# @test norm(v) > testtol # eigenvectors cannot be null vectors
45+
if elty <: Base.LinAlg.BlasComplex
46+
sr_ind = indmin(real.(a_evs))
47+
(d, v) = eigs(a, nev=1, which=:SR)
48+
@test d[1] ≈ a_evs[sr_ind]
49+
si_ind = indmin(imag.(a_evs))
50+
(d, v) = eigs(a, nev=1, which=:SI)
51+
@test d[1] ≈ a_evs[si_ind]
52+
lr_ind = indmax(real.(a_evs))
53+
(d, v) = eigs(a, nev=1, which=:LR)
54+
@test d[1] ≈ a_evs[lr_ind]
55+
li_ind = indmax(imag.(a_evs))
56+
(d, v) = eigs(a, nev=1, which=:LI)
57+
@test d[1] ≈ a_evs[li_ind]
58+
end
5959

60-
(d,v) = eigs(asym, nev=3)
61-
@test asym*v[:,1] ≈ d[1]*v[:,1]
62-
@test eigs(asym; nev=1, sigma=d[3])[1][1] ≈ d[3]
63-
@test norm(v) > testtol # eigenvectors cannot be null vectors
60+
(d,v) = eigs(asym, nev=3)
61+
@test asym*v[:,1] ≈ d[1]*v[:,1]
62+
@test eigs(asym; nev=1, sigma=d[3])[1][1] ≈ d[3]
63+
@test norm(v) > testtol # eigenvectors cannot be null vectors
6464

65-
(d,v) = eigs(apd, nev=3)
66-
@test apd*v[:,3] ≈ d[3]*v[:,3]
67-
@test eigs(apd; nev=1, sigma=d[3])[1][1] ≈ d[3]
65+
(d,v) = eigs(apd, nev=3)
66+
@test apd*v[:,3] ≈ d[3]*v[:,3]
67+
@test eigs(apd; nev=1, sigma=d[3])[1][1] ≈ d[3]
6868

69-
(d,v) = eigs(apd, bpd, nev=3, tol=1e-8)
70-
@test apd*v[:,2] ≈ d[2]*bpd*v[:,2] atol=testtol
71-
@test norm(v) > testtol # eigenvectors cannot be null vectors
69+
(d,v) = eigs(apd, bpd, nev=3, tol=1e-8)
70+
@test apd*v[:,2] ≈ d[2]*bpd*v[:,2] atol=testtol
71+
@test norm(v) > testtol # eigenvectors cannot be null vectors
7272

73-
@testset "(shift-and-)invert mode" begin
74-
(d,v) = eigs(apd, nev=3, sigma=0)
75-
@test apd*v[:,3] ≈ d[3]*v[:,3]
76-
@test norm(v) > testtol # eigenvectors cannot be null vectors
73+
@testset "(shift-and-)invert mode" begin
74+
(d,v) = eigs(apd, nev=3, sigma=0)
75+
@test apd*v[:,3] ≈ d[3]*v[:,3]
76+
@test norm(v) > testtol # eigenvectors cannot be null vectors
7777

78-
(d,v) = eigs(apd, bpd, nev=3, sigma=0, tol=1e-8)
79-
@test apd*v[:,1] ≈ d[1]*bpd*v[:,1] atol=testtol
80-
@test norm(v) > testtol # eigenvectors cannot be null vectors
81-
end
78+
(d,v) = eigs(apd, bpd, nev=3, sigma=0, tol=1e-8)
79+
@test apd*v[:,1] ≈ d[1]*bpd*v[:,1] atol=testtol
80+
@test norm(v) > testtol # eigenvectors cannot be null vectors
81+
end
8282

83-
@testset "ArgumentErrors" begin
84-
@test_throws ArgumentError eigs(rand(elty,2,2))
85-
@test_throws ArgumentError eigs(a, nev=-1)
86-
@test_throws ArgumentError eigs(a, which=:Z)
87-
@test_throws ArgumentError eigs(a, which=:BE)
88-
@test_throws DimensionMismatch eigs(a, v0=zeros(elty,n+2))
89-
@test_throws ArgumentError eigs(a, v0=zeros(Int,n))
90-
if elty == Float64
91-
@test_throws ArgumentError eigs(a+a.',which=:SI)
92-
@test_throws ArgumentError eigs(a+a.',which=:LI)
93-
@test_throws ArgumentError eigs(a,sigma=rand(ComplexF32))
94-
end
83+
@testset "ArgumentErrors" begin
84+
@test_throws ArgumentError eigs(rand(elty,2,2))
85+
@test_throws ArgumentError eigs(a, nev=-1)
86+
@test_throws ArgumentError eigs(a, which=:Z)
87+
@test_throws ArgumentError eigs(a, which=:BE)
88+
@test_throws DimensionMismatch eigs(a, v0=zeros(elty,n+2))
89+
@test_throws ArgumentError eigs(a, v0=zeros(Int,n))
90+
if elty == Float64
91+
@test_throws ArgumentError eigs(a+a.',which=:SI)
92+
@test_throws ArgumentError eigs(a+a.',which=:LI)
93+
@test_throws ArgumentError eigs(a,sigma=rand(ComplexF32))
9594
end
9695
end
96+
end
9797

98-
@testset "Symmetric generalized with singular B" begin
99-
n = 10
100-
k = 3
101-
A = randn(n,n); A = A'A
102-
B = randn(n,k); B = B*B'
103-
@test sort(eigs(A, B, nev = k, sigma = 1.0)[1]) ≈ sort(eigvals(A, B)[1:k])
104-
end
98+
@testset "Symmetric generalized with singular B" begin
99+
srand(127)
100+
n = 10
101+
k = 3
102+
A = randn(n,n); A = A'A
103+
B = randn(n,k); B = B*B'
104+
@test sort(eigs(A, B, nev = k, sigma = 1.0)[1]) ≈ sort(eigvals(A, B)[1:k])
105105
end
106106
end
107107

108108
# Problematic example from #6965A
109109
let A6965 = [
110-
1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0
111-
-1.0 2.0 0.0 0.0 0.0 0.0 0.0 1.0
112-
-1.0 0.0 3.0 0.0 0.0 0.0 0.0 1.0
113-
-1.0 0.0 0.0 4.0 0.0 0.0 0.0 1.0
114-
-1.0 0.0 0.0 0.0 5.0 0.0 0.0 1.0
115-
-1.0 0.0 0.0 0.0 0.0 6.0 0.0 1.0
116-
-1.0 0.0 0.0 0.0 0.0 0.0 7.0 1.0
117-
-1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 8.0
118-
]
110+
1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0
111+
-1.0 2.0 0.0 0.0 0.0 0.0 0.0 1.0
112+
-1.0 0.0 3.0 0.0 0.0 0.0 0.0 1.0
113+
-1.0 0.0 0.0 4.0 0.0 0.0 0.0 1.0
114+
-1.0 0.0 0.0 0.0 5.0 0.0 0.0 1.0
115+
-1.0 0.0 0.0 0.0 0.0 6.0 0.0 1.0
116+
-1.0 0.0 0.0 0.0 0.0 0.0 7.0 1.0
117+
-1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 8.0
118+
]
119119
d, = eigs(A6965,which=:SM,nev=2,ncv=4,tol=eps())
120120
@test d[1] ≈ 2.5346936860350002
121121
@test real(d[2]) ≈ 2.6159972444834976

0 commit comments

Comments
 (0)