Skip to content

Better error messages and tests for sm2 #2797

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Better error messages and tests for sm2 #2797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions lib/cusparse/level3.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ for (bname,aname,sname,elty) in ((:cusparseSbsrsm2_bufferSize, :cusparseSbsrsm2_
mX,nX = size(X)
nrhs = transxy == 'N' ? nX : mX
if transxy == 'N' && (mX != m)
throw(DimensionMismatch(""))
throw(DimensionMismatch("first dimensions of A ($m) and X ($mX) must match when transxy is 'N'"))
end
if transxy != 'N' && (nX != m)
throw(DimensionMismatch(""))
throw(DimensionMismatch("first dimension of A ($m) must match second dimension of X ($nX) when transxy is not 'N'"))
end
ldx = max(1,stride(X,2))
info = bsrsm2Info_t[0]
Expand Down Expand Up @@ -106,10 +106,10 @@ for (bname,aname,sname,elty) in ((:cusparseScsrsm2_bufferSizeExt, :cusparseScsrs
mX,nX = size(X)
nrhs = transxy == 'N' ? nX : mX
if transxy == 'N' && (mX != m)
throw(DimensionMismatch(""))
throw(DimensionMismatch("first dimensions of A ($m) and X ($mX) must match when transxy is 'N'"))
end
if transxy != 'N' && (nX != m)
throw(DimensionMismatch(""))
throw(DimensionMismatch("first dimension of A ($m) must match second dimension of X ($nX) when transxy is not 'N'"))
end
ldx = max(1,stride(X,2))
info = csrsm2Info_t[0]
Expand Down Expand Up @@ -182,10 +182,10 @@ for (bname,aname,sname,elty) in ((:cusparseScsrsm2_bufferSizeExt, :cusparseScsrs
mX,nX = size(X)
nrhs = transxy == 'N' ? nX : mX
if transxy == 'N' && (mX != m)
throw(DimensionMismatch(""))
throw(DimensionMismatch("first dimensions of A ($m) and X ($mX) must match when transxy is 'N'"))
end
if transxy != 'N' && (nX != m)
throw(DimensionMismatch(""))
throw(DimensionMismatch("first dimension of A ($m) must match second dimension of X ($nX) when transxy is not 'N'"))
end
ldx = max(1,stride(X,2))
info = csrsm2Info_t[0]
Expand Down
101 changes: 72 additions & 29 deletions test/libraries/cusparse/interfaces.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,21 +340,23 @@ using LinearAlgebra, SparseArrays
end

@testset "CuSparseMatrixCSR($f) $elty" for f in [transpose, adjoint], elty in [Float32, ComplexF32]
S = f(sprand(elty, 10, 10, 0.1))
m = 10
S = f(sprand(elty, m, m, 0.1))
@test SparseMatrixCSC(CuSparseMatrixCSR(S)) ≈ S

S = sprand(elty, 10, 10, 0.1)
S = sprand(elty, m, m, 0.1)
T = f(CuSparseMatrixCSR(S))
@test SparseMatrixCSC(CuSparseMatrixCSC(T)) ≈ f(S)

S = sprand(elty, 10, 10, 0.1)
S = sprand(elty, m, m, 0.1)
T = f(CuSparseMatrixCSC(S))
@test SparseMatrixCSC(CuSparseMatrixCSR(T)) ≈ f(S)
end

@testset "UniformScaling basic operations" begin
for elty in (Float32, Float64, ComplexF32, ComplexF64)
A = sprand(elty, 100, 100, 0.1)
m = 100
A = sprand(elty, m, m, 0.1)
U1 = 2*I
for SparseMatrixType in (CuSparseMatrixCSC, CuSparseMatrixCSR, CuSparseMatrixCOO)
B = SparseMatrixType(A)
Expand All @@ -367,9 +369,10 @@ using LinearAlgebra, SparseArrays

@testset "Diagonal basic operations" begin
for elty in (Float32, Float64, ComplexF32, ComplexF64)
A = sprand(elty, 100, 100, 0.1)
U2 = 2*I(100)
U3 = Diagonal(rand(elty, 100))
m = 100
A = sprand(elty, m, m, 0.1)
U2 = 2*I(m)
U3 = Diagonal(rand(elty, m))
for SparseMatrixType in (CuSparseMatrixCSC, CuSparseMatrixCSR, CuSparseMatrixCOO)
B = SparseMatrixType(A)
for op in (+, -, *)
Expand All @@ -395,11 +398,12 @@ using LinearAlgebra, SparseArrays
for triangle in [LowerTriangular, UnitLowerTriangular, UpperTriangular, UnitUpperTriangular]
@testset "ldiv!($triangle(CuSparseMatrixBSR), CuVector) -- $elty" for elty in [Float32,Float64,ComplexF32,ComplexF64]
@testset "opa = $opa" for opa in [identity, transpose, adjoint]
A = rand(elty, 10, 10)
m = 10
A = rand(elty, m, m)
A = triangle in (UnitLowerTriangular, LowerTriangular) ? tril(A) : triu(A)
A = triangle in (UnitLowerTriangular, UnitUpperTriangular) ? A - Diagonal(A) + I : A
A = sparse(A)
y = rand(elty, 10)
y = rand(elty, m)
dA = CuSparseMatrixBSR(A, 1)
dy = CuArray(y)
ldiv!(triangle(opa(A)), y)
Expand All @@ -410,11 +414,12 @@ using LinearAlgebra, SparseArrays

@testset "$triangle(CuSparseMatrixBSR) \\ CuVector -- $elty" for elty in [Float32,Float64,ComplexF32,ComplexF64]
@testset "opa = $opa" for opa in [identity, transpose, adjoint]
A = rand(elty, 10, 10)
m = 10
A = rand(elty, m, m)
A = triangle in (UnitLowerTriangular, LowerTriangular) ? tril(A) : triu(A)
A = triangle in (UnitLowerTriangular, UnitUpperTriangular) ? A - Diagonal(A) + I : A
A = sparse(A)
y = rand(elty, 10)
y = rand(elty, m)
dA = CuSparseMatrixBSR(A, 1)
dy = CuArray(y)
x = triangle(opa(A)) \ y
Expand All @@ -427,16 +432,23 @@ using LinearAlgebra, SparseArrays
@testset "opa = $opa" for opa in [identity, transpose, adjoint]
@testset "opb = $opb" for opb in [identity, transpose, adjoint]
elty <: Complex && opb == adjoint && continue
A = rand(elty, 10, 10)
m = 10
n = 2
A = rand(elty, m, m)
A = triangle in (UnitLowerTriangular, LowerTriangular) ? tril(A) : triu(A)
A = triangle in (UnitLowerTriangular, UnitUpperTriangular) ? A - Diagonal(A) + I : A
A = sparse(A)
B = opb == identity ? rand(elty, 10, 2) : rand(elty, 2, 10)
B = opb == identity ? rand(elty, m, n) : rand(elty, n, m)
dA = CuSparseMatrixBSR(A, 1)
dB = CuArray(B)
ldiv!(triangle(opa(A)), opb(B))
ldiv!(triangle(opa(dA)), opb(dB))
@test B ≈ collect(dB)
if CUSPARSE.version() < v"12.0"
B_bad = opb == identity ? rand(elty, m+1, n) : rand(elty, n, m+1)
error_str = opb == identity ? "first dimensions of A ($m) and X ($(m+1)) must match when transxy is 'N'" : "first dimension of A ($m) must match second dimension of X ($(m+1)) when transxy is not 'N'"
@test_throws DimensionMismatch(error_str) ldiv!(triangle(opa(dA)), opb(CuArray(B_bad)))
end
end
end
end
Expand All @@ -445,16 +457,23 @@ using LinearAlgebra, SparseArrays
@testset "opa = $opa" for opa in [identity, transpose, adjoint]
@testset "opb = $opb" for opb in [identity, transpose, adjoint]
elty <: Complex && opb == adjoint && continue
A = rand(elty, 10, 10)
m = 10
n = 2
A = rand(elty, m, m)
A = triangle in (UnitLowerTriangular, LowerTriangular) ? tril(A) : triu(A)
A = triangle in (UnitLowerTriangular, UnitUpperTriangular) ? A - Diagonal(A) + I : A
A = sparse(A)
B = opb == identity ? rand(elty, 10, 2) : rand(elty, 2, 10)
B = opb == identity ? rand(elty, m, n) : rand(elty, n, m)
dA = CuSparseMatrixBSR(A, 1)
dB = CuArray(B)
C = triangle(opa(A)) \ opb(B)
dC = triangle(opa(dA)) \ opb(dB)
@test C ≈ collect(dC)
if CUSPARSE.version() < v"12.0"
B_bad = opb == identity ? rand(elty, m+1, n) : rand(elty, n, m+1)
error_str = opb == identity ? "first dimensions of A ($m) and X ($(m+1)) must match when transxy is 'N'" : "first dimension of A ($m) must match second dimension of X ($(m+1)) when transxy is not 'N'"
@test_throws DimensionMismatch(error_str) ldiv!(triangle(opa(dA)), opb(CuArray(B_bad)))
end
end
end
end
Expand All @@ -466,11 +485,12 @@ using LinearAlgebra, SparseArrays
@testset "ldiv!($triangle($SparseMatrixType), CuVector) -- $elty" for elty in [Float64,ComplexF64]
@testset "opa = $opa" for opa in [identity, transpose, adjoint]
SparseMatrixType == CuSparseMatrixCSC && elty <: Complex && opa == adjoint && continue
A = A = rand(elty, 10, 10)
m = 10
A = A = rand(elty, m, m)
A = triangle in (UnitLowerTriangular, LowerTriangular) ? tril(A) : triu(A)
A = triangle in (UnitLowerTriangular, UnitUpperTriangular) ? A - Diagonal(A) + I : A
A = sparse(A)
y = rand(elty, 10)
y = rand(elty, m)
dA = SparseMatrixType(A)
dy = CuArray(y)
ldiv!(triangle(opa(A)), y)
Expand All @@ -482,12 +502,13 @@ using LinearAlgebra, SparseArrays
@testset "ldiv!(CuVector, $triangle($SparseMatrixType), CuVector) -- $elty" for elty in [Float64,ComplexF64]
@testset "opa = $opa" for opa in [identity, transpose, adjoint]
SparseMatrixType == CuSparseMatrixCSC && elty <: Complex && opa == adjoint && continue
A = A = rand(elty, 10, 10)
m = 10
A = A = rand(elty, m, m)
A = triangle in (UnitLowerTriangular, LowerTriangular) ? tril(A) : triu(A)
A = triangle in (UnitLowerTriangular, UnitUpperTriangular) ? A - Diagonal(A) + I : A
A = sparse(A)
y = rand(elty, 10)
x = rand(elty, 10)
y = rand(elty, m)
x = rand(elty, m)
dA = SparseMatrixType(A)
dy = CuArray(y)
dx = CuArray(x)
Expand All @@ -500,11 +521,12 @@ using LinearAlgebra, SparseArrays
@testset "$triangle($SparseMatrixType) \\ CuVector -- $elty" for elty in [Float64,ComplexF64]
@testset "opa = $opa" for opa in [identity, transpose, adjoint]
SparseMatrixType == CuSparseMatrixCSC && elty <: Complex && opa == adjoint && continue
A = rand(elty, 10, 10)
m = 10
A = rand(elty, m, m)
A = triangle in (UnitLowerTriangular, LowerTriangular) ? tril(A) : triu(A)
A = triangle in (UnitLowerTriangular, UnitUpperTriangular) ? A - Diagonal(A) + I : A
A = sparse(A)
y = rand(elty, 10)
y = rand(elty, m)
dA = SparseMatrixType(A)
dy = CuArray(y)
x = triangle(opa(A)) \ y
Expand All @@ -518,16 +540,23 @@ using LinearAlgebra, SparseArrays
@testset "opb = $opb" for opb in [identity, transpose, adjoint]
SparseMatrixType == CuSparseMatrixCSC && elty <: Complex && opa == adjoint && continue
elty <: Complex && opb == adjoint && continue
A = rand(elty, 10, 10)
m = 10
n = 2
A = rand(elty, m, m)
A = triangle in (UnitLowerTriangular, LowerTriangular) ? tril(A) : triu(A)
A = triangle in (UnitLowerTriangular, UnitUpperTriangular) ? A - Diagonal(A) + I : A
A = sparse(A)
B = opb == identity ? rand(elty, 10, 2) : rand(elty, 2, 10)
B = opb == identity ? rand(elty, m, n) : rand(elty, n, m)
dA = SparseMatrixType(A)
dB = CuArray(B)
ldiv!(triangle(opa(A)), opb(B))
ldiv!(triangle(opa(dA)), opb(dB))
@test B ≈ collect(dB)
if CUSPARSE.version() < v"12.0"
B_bad = opb == identity ? rand(elty, m+1, n) : rand(elty, n, m+1)
error_str = opb == identity ? "first dimensions of A ($m) and X ($(m+1)) must match when transxy is 'N'" : "first dimension of A ($m) must match second dimension of X ($(m+1)) when transxy is not 'N'"
@test_throws DimensionMismatch(error_str) ldiv!(triangle(opa(dA)), opb(CuArray(B_bad)))
end
end
end
end
Expand All @@ -537,18 +566,25 @@ using LinearAlgebra, SparseArrays
@testset "opb = $opb" for opb in [identity, transpose, adjoint]
SparseMatrixType == CuSparseMatrixCSC && elty <: Complex && opa == adjoint && continue
elty <: Complex && opb == adjoint && continue
A = rand(elty, 10, 10)
m = 10
n = 2
A = rand(elty, m, m)
A = triangle in (UnitLowerTriangular, LowerTriangular) ? tril(A) : triu(A)
A = triangle in (UnitLowerTriangular, UnitUpperTriangular) ? A - Diagonal(A) + I : A
A = sparse(A)
B = opb == identity ? rand(elty, 10, 2) : rand(elty, 2, 10)
C = rand(elty, 10, 2)
B = opb == identity ? rand(elty, m, n) : rand(elty, n, m)
C = rand(elty, m, n)
dA = SparseMatrixType(A)
dB = CuArray(B)
dC = CuArray(C)
ldiv!(C, triangle(opa(A)), opb(B))
ldiv!(dC, triangle(opa(dA)), opb(dB))
@test C ≈ collect(dC)
if CUSPARSE.version() < v"12.0"
B_bad = opb == identity ? rand(elty, m+1, n) : rand(elty, n, m+1)
error_str = opb == identity ? "first dimensions of A ($m) and X ($(m+1)) must match when transxy is 'N'" : "first dimension of A ($m) must match second dimension of X ($(m+1)) when transxy is not 'N'"
@test_throws DimensionMismatch(error_str) ldiv!(triangle(opa(dA)), opb(CuArray(B_bad)))
end
end
end
end
Expand All @@ -558,16 +594,23 @@ using LinearAlgebra, SparseArrays
@testset "opb = $opb" for opb in [identity, transpose, adjoint]
SparseMatrixType == CuSparseMatrixCSC && elty <: Complex && opa == adjoint && continue
elty <: Complex && opb == adjoint && continue
A = rand(elty, 10, 10)
m = 10
n = 2
A = rand(elty, m, m)
A = triangle in (UnitLowerTriangular, LowerTriangular) ? tril(A) : triu(A)
A = triangle in (UnitLowerTriangular, UnitUpperTriangular) ? A - Diagonal(A) + I : A
A = sparse(A)
B = opb == identity ? rand(elty, 10, 2) : rand(elty, 2, 10)
B = opb == identity ? rand(elty, m, n) : rand(elty, n, m)
dA = SparseMatrixType(A)
dB = CuArray(B)
C = triangle(opa(A)) \ opb(B)
dC = triangle(opa(dA)) \ opb(dB)
@test C ≈ collect(dC)
if CUSPARSE.version() < v"12.0"
B_bad = opb == identity ? rand(elty, m+1, n) : rand(elty, n, m+1)
error_str = opb == identity ? "first dimensions of A ($m) and X ($(m+1)) must match when transxy is 'N'" : "first dimension of A ($m) must match second dimension of X ($(m+1)) when transxy is not 'N'"
@test_throws DimensionMismatch(error_str) ldiv!(triangle(opa(dA)), opb(CuArray(B_bad)))
end
end
end
end
Expand Down