Skip to content

More tests and bugfixes for CUSOLVER #2707

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
kshyatt merged 2 commits into from
Mar 21, 2025
Merged

More tests and bugfixes for CUSOLVER #2707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17dd92e
More tests and bugfixes for CUSOLVER
kshyatt Mar 20, 2025
aeeb48f
Add a test for sytrs
kshyatt Mar 21, 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
4 changes: 2 additions & 2 deletions lib/cusolver/dense_generic.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ function Xgeqrf!(A::StridedCuMatrix{T}) where {T <: BlasFloat}
end

# Xsytrs
function sytrs!(uplo::Char, A::StridedCuMatrix{T}, p::CuVector{Int64}, B::StridedCuMatrix{T}) where {T <: BlasFloat}
function sytrs!(uplo::Char, A::StridedCuMatrix{T}, p::CuVector{Int64}, B::StridedCuVecOrMat{T}) where {T <: BlasFloat}
Comment thread
kshyatt marked this conversation as resolved.
chkuplo(uplo)
n = checksquare(A)
nrhs = size(B, 2)
Expand All @@ -149,7 +149,7 @@ function sytrs!(uplo::Char, A::StridedCuMatrix{T}, p::CuVector{Int64}, B::Stride
B
end

function sytrs!(uplo::Char, A::StridedCuMatrix{T}, B::StridedCuMatrix{T}) where {T <: BlasFloat}
function sytrs!(uplo::Char, A::StridedCuMatrix{T}, B::StridedCuVecOrMat{T}) where {T <: BlasFloat}
chkuplo(uplo)
n = checksquare(A)
nrhs = size(B, 2)
Expand Down
8 changes: 4 additions & 4 deletions lib/cusolver/linalg.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function Base.:\(_A::CuMatOrAdj, _B::CuOrAdj)
end

function Base.:\(_A::Symmetric{<:Any,<:CuMatOrAdj}, _B::CuOrAdj)
uplo = A.uplo
uplo = _A.uplo
A, B = copy_cublasfloat(_A.data, _B)

# LDLᴴ decomposition with partial pivoting
Expand Down Expand Up @@ -371,9 +371,9 @@ for (triangle, uplo, diag) in ((:LowerTriangular, 'L', 'N'),
@eval begin
function LinearAlgebra.inv(A::$triangle{T,<:StridedCuMatrix{T}}) where T <: BlasFloat
n = checksquare(A)
B = copy(A.data)
trtri!(uplo, diag, B)
return B
B = copy(parent(A))
trtri!($uplo, $diag, B)
return $triangle(B)
end
end
end
9 changes: 7 additions & 2 deletions test/libraries/cusolver/dense.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ k = 1
A = rand(elty,n,n)
A = uplo == 'L' ? tril(A) : triu(A)
A = diag == 'N' ? A : A - Diagonal(A) + I
dA = triangle(CuArray(A))
dA = triangle(view(CuArray(A), 1:2:n, 1:2:n)) # without this view, we are hitting the CUBLAS method!
dA⁻¹ = inv(dA)
dI = dA.data * dA⁻¹
dI = CuArray(dA) * CuArray(dA⁻¹)
@test Array(dI) ≈ I
end
end
Expand Down Expand Up @@ -265,6 +265,8 @@ k = 1
A += A'
d_A = CuArray(A)
Eig = eigen(LinearAlgebra.Hermitian(A))
d_eig = eigen(d_A)
@test Eig.values ≈ collect(d_eig.values)
d_eig = eigen(LinearAlgebra.Hermitian(d_A))
@test Eig.values ≈ collect(d_eig.values)
h_V = collect(d_eig.vectors)
Expand Down Expand Up @@ -533,6 +535,7 @@ k = 1
B = rand(elty, n)
d_B = CuArray(B)
@test collect(d_M \ d_B) ≈ M \ B
@test_throws DimensionMismatch("arguments must have the same number of rows") d_M \ CUDA.ones(elty, n+1)
A = rand(elty, m, n) # A is a matrix and B,C is a vector
d_A = CuArray(A)
M = qr(A)
Expand Down Expand Up @@ -782,7 +785,9 @@ end
Bf = cublasfloat.(B)
bf = cublasfloat.(b)
@test Array(d_A \ d_B) ≈ (Af \ Bf)
@test Array(Symmetric(d_A) \ d_B) ≈ (Af \ Bf)
@test Array(d_A \ d_b) ≈ (Af \ bf)
@test Array(Symmetric(d_A) \ d_b) ≈ (Af \ bf)
@inferred d_A \ d_B
@inferred d_A \ d_b
end
Expand Down
6 changes: 6 additions & 0 deletions test/libraries/cusolver/dense_generic.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,21 +96,27 @@ p = 5
@testset "pivoting = $pivoting" for pivoting in (false, true)
A = rand(elty,n,n)
B = rand(elty,n,p)
C = rand(elty,n)
A = A + transpose(A)
d_A = CuMatrix(A)
d_B = CuMatrix(B)
d_C = CuVector(C)
!pivoting && (CUSOLVER.version() < v"11.7.2") && continue
if pivoting
d_A, d_ipiv, _ = CUSOLVER.sytrf!(uplo, d_A; pivoting)
d_ipiv = CuVector{Int64}(d_ipiv)
CUSOLVER.sytrs!(uplo, d_A, d_ipiv, d_B)
CUSOLVER.sytrs!(uplo, d_A, d_ipiv, d_C)
else
d_A, _ = CUSOLVER.sytrf!(uplo, d_A; pivoting)
CUSOLVER.sytrs!(uplo, d_A, d_B)
CUSOLVER.sytrs!(uplo, d_A, d_C)
end
A, ipiv, _ = LAPACK.sytrf!(uplo, A)
LAPACK.sytrs!(uplo, A, ipiv, B)
LAPACK.sytrs!(uplo, A, ipiv, C)
@test B ≈ collect(d_B)
@test C ≈ collect(d_C)
end
end
end
Expand Down