some test streamline

Author: Jutho

test/eig.jl

@@ -45,7 +45,7 @@ end
         atol = sqrt(eps(real(T)))
 
         D1, V1, ϵ1 = @constinferred eig_trunc(A; alg, trunc = truncrank(r))
-        @test length(D1.diag) == r
+        @test length(diagview(D1)) == r
         @test A * V1 ≈ V1 * D1
         @test ϵ1 ≈ norm(view(D₀, (r + 1):m)) atol = atol
 
@@ -81,13 +81,13 @@ end
     A = V * D * inv(V)
     alg = TruncatedAlgorithm(LAPACK_Simple(), truncrank(2))
     D2, V2, ϵ2 = @constinferred eig_trunc(A; alg)
-    @test diagview(D2) ≈ diagview(D)[1:2] rtol = sqrt(eps(real(T)))
+    @test diagview(D2) ≈ diagview(D)[1:2]
     @test ϵ2 ≈ norm(diagview(D)[3:4]) atol = atol
     @test_throws ArgumentError eig_trunc(A; alg, trunc = (; maxrank = 2))
 
     alg = TruncatedAlgorithm(LAPACK_Simple(), truncerror(; atol = 0.2, p = 1))
     D3, V3, ϵ3 = @constinferred eig_trunc(A; alg)
-    @test diagview(D3) ≈ diagview(D)[1:2] rtol = sqrt(eps(real(T)))
+    @test diagview(D3) ≈ diagview(D)[1:2]
     @test ϵ3 ≈ norm(diagview(D)[3:4]) atol = atol
 end
 

test/eigh.jl

@@ -90,13 +90,13 @@ end
     A = (A + A') / 2
     alg = TruncatedAlgorithm(LAPACK_QRIteration(), truncrank(2))
     D2, V2, ϵ2 = @constinferred eigh_trunc(A; alg)
-    @test diagview(D2) ≈ diagview(D)[1:2] rtol = sqrt(eps(real(T)))
+    @test diagview(D2) ≈ diagview(D)[1:2]
     @test_throws ArgumentError eigh_trunc(A; alg, trunc = (; maxrank = 2))
     @test ϵ2 ≈ norm(diagview(D)[3:4]) atol = atol
 
     alg = TruncatedAlgorithm(LAPACK_QRIteration(), truncerror(; atol = 0.2))
     D3, V3, ϵ3 = @constinferred eigh_trunc(A; alg)
-    @test diagview(D3) ≈ diagview(D)[1:2] rtol = sqrt(eps(real(T)))
+    @test diagview(D3) ≈ diagview(D)[1:2]
     @test ϵ3 ≈ norm(diagview(D)[3:4]) atol = atol
 end
 

test/svd.jl

@@ -115,7 +115,8 @@ end
             r = minmn - 2
 
             U1, S1, V1ᴴ, ϵ1 = @constinferred svd_trunc(A; alg, trunc = truncrank(r))
-            @test length(S1.diag) == r
+            @test length(diagview(S1)) == r
+            @test diagview(S1) ≈ S₀[1:r]
             @test LinearAlgebra.opnorm(A - U1 * S1 * V1ᴴ) ≈ S₀[r + 1]
             # Test truncation error
             @test ϵ1 ≈ norm(view(S₀, (r + 1):minmn)) atol = atol
@@ -124,19 +125,19 @@ end
             trunc = trunctol(; atol = s * S₀[r + 1])
 
             U2, S2, V2ᴴ, ϵ2 = @constinferred svd_trunc(A; alg, trunc)
-            @test length(S2.diag) == r
+            @test length(diagview(S2)) == r
             @test U1 ≈ U2
             @test S1 ≈ S2
             @test V1ᴴ ≈ V2ᴴ
-            @test ϵ2 ≈ ϵ1
+            @test ϵ2 ≈ norm(view(S₀, (r + 1):minmn)) atol = atol
 
             trunc = truncerror(; atol = s * norm(@view(S₀[(r + 1):end])))
             U3, S3, V3ᴴ, ϵ3 = @constinferred svd_trunc(A; alg, trunc)
-            @test length(S3.diag) == r
+            @test length(diagview(S3)) == r
             @test U1 ≈ U3
             @test S1 ≈ S3
             @test V1ᴴ ≈ V3ᴴ
-            @test ϵ3 ≈ ϵ1
+            @test ϵ3 ≈ norm(view(S₀, (r + 1):minmn)) atol = atol
         end
     end
 end
@@ -162,27 +163,28 @@ end
                 (rtol, maxrank) -> truncrank(maxrank) & trunctol(; rtol),
             )
             U1, S1, V1ᴴ, ϵ1 = svd_trunc(A; alg, trunc = trunc_fun(0.2, 1))
-            @test length(S1.diag) == 1
-            @test S1.diag ≈ S.diag[1:1] rtol = sqrt(eps(real(T)))
+            @test length(diagview(S1)) == 1
+            @test diagview(S1) ≈ diagview(S)[1:1]
 
             U2, S2, V2ᴴ, ϵ2 = svd_trunc(A; alg, trunc = trunc_fun(0.2, 3))
-            @test length(S2.diag) == 2
-            @test S2.diag ≈ S.diag[1:2] rtol = sqrt(eps(real(T)))
+            @test length(diagview(S2)) == 2
+            @test diagview(S2) ≈ diagview(S)[1:2]
         end
     end
 end
 
 @testset "svd_trunc! specify truncation algorithm T = $T" for T in BLASFloats
     rng = StableRNG(123)
+    atol = sqrt(eps(real(T)))
     m = 4
     U = qr_compact(randn(rng, T, m, m))[1]
     S = Diagonal(real(T)[0.9, 0.3, 0.1, 0.01])
     Vᴴ = qr_compact(randn(rng, T, m, m))[1]
     A = U * S * Vᴴ
     alg = TruncatedAlgorithm(LAPACK_DivideAndConquer(), trunctol(; atol = 0.2))
     U2, S2, V2ᴴ, ϵ2 = @constinferred svd_trunc(A; alg)
-    @test diagview(S2) ≈ diagview(S)[1:2] rtol = sqrt(eps(real(T)))
-    @test ϵ2 ≈ norm(diagview(S)[3:4])
+    @test diagview(S2) ≈ diagview(S)[1:2]
+    @test ϵ2 ≈ norm(diagview(S)[3:4]) atol = atol
     @test_throws ArgumentError svd_trunc(A; alg, trunc = (; maxrank = 2))
 end