Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 3 additions & 12 deletions src/implementations/svd.jl
Original file line number Diff line number Diff line change
Expand Up @@ -398,29 +398,20 @@ function svd_trunc_no_error!(A::AbstractMatrix, USVᴴ, alg::TruncatedAlgorithm{
(Utr, Str, Vᴴtr), _ = truncate(svd_trunc!, (U, S, Vᴴ), alg.trunc)

do_gauge_fix = get(alg.alg.kwargs, :fixgauge, default_fixgauge())::Bool
# the output matrices here are the same size as for svd_full!
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am confused about the conclusion of the resolved comments, and just about the validity of this comment in the code, as well as why it is here in between those two code lines. The arguments to gaugefix! on the line below are already truncated, right?

do_gauge_fix && gaugefix!(svd_trunc!, Utr, Vᴴtr)

return Utr, Str, Vᴴtr
end

function svd_trunc!(A::AbstractMatrix, USVᴴ, alg::TruncatedAlgorithm{<:GPU_Randomized})
U, S, Vᴴ = USVᴴ
check_input(svd_trunc!, A, (U, S, Vᴴ), alg.alg)
_gpu_Xgesvdr!(A, diagview(S), U, Vᴴ; alg.alg.kwargs...)

# TODO: make sure that truncation is based on maxrank, otherwise this might be wrong
(Utr, Str, Vᴴtr), _ = truncate(svd_trunc!, (U, S, Vᴴ), alg.trunc)

Utr, Str, Vᴴtr = svd_trunc_no_error!(A, USVᴴ, alg)
# normal `truncation_error!` does not work here since `S` is not the full singular value spectrum
normS = norm(diagview(Str))
normA = norm(A)
# equivalent to sqrt(normA^2 - normS^2)
# but may be more accurate
ϵ = sqrt((normA + normS) * (normA - normS))

do_gauge_fix = get(alg.alg.kwargs, :fixgauge, default_fixgauge())::Bool
do_gauge_fix && gaugefix!(svd_trunc!, Utr, Vᴴtr)

ϵ = sqrt((normA + normS) * abs(normA - normS))
return Utr, Str, Vᴴtr, ϵ
end

Expand Down
3 changes: 3 additions & 0 deletions test/svd.jl
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ for T in (BLASFloats..., GenericFloats...), m in (0, 54), n in (0, 37, m, 63)
CUSOLVER_Jacobi(),
)
TestSuite.test_svd_algs(CuMatrix{T}, (m, n), CUDA_SVD_ALGS)
k = 5
p = min(m, n) - k - 2
min(m, n) > k + 2 && TestSuite.test_randomized_svd(CuMatrix{T}, (m, n), (MatrixAlgebraKit.TruncatedAlgorithm(CUSOLVER_Randomized(; k, p, niters = 20), truncrank(k)),))
if n == m
TestSuite.test_svd(Diagonal{T, CuVector{T}}, m)
TestSuite.test_svd_algs(Diagonal{T, CuVector{T}}, m, (DiagonalAlgorithm(),))
Expand Down
13 changes: 13 additions & 0 deletions test/testsuite/svd.jl
Original file line number Diff line number Diff line change
Expand Up @@ -312,3 +312,16 @@ function test_svd_trunc_algs(
end
end
end

function test_randomized_svd(T::Type, sz, algs; kwargs...)
summary_str = testargs_summary(T, sz)
return @testset "randomized svd_trunc! algorithm $alg $summary_str" for alg in algs
A = instantiate_matrix(T, sz)
Ac = deepcopy(A)
m, n = size(A)
minmn = min(m, n)
S₀ = collect(svd_vals(A))
U1, S1, V1ᴴ, ϵ1 = @testinferred svd_trunc(A; alg)
@test collect(diagview(S1))[1:alg.alg.k] ≈ S₀[1:alg.alg.k]
end
end