Skip to content
This repository was archived by the owner on Mar 12, 2021. It is now read-only.

Fix sparse mul! #692

Merged
merged 3 commits into from
Apr 27, 2020
Merged

Fix sparse mul! #692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f380ccd
Fix sparse mul!
amontoison Apr 22, 2020
c0a73bc
Improve mul! testset names
amontoison Apr 23, 2020
2ec414f
Fix A' * x products for complex CuSparseMatrixCSC
amontoison Apr 26, 2020
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
2 changes: 1 addition & 1 deletion src/sparse/interfaces.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Base.:(\)(adjA::Adjoint{T, LowerTriangular{T, S}},B::CuMatrix{T}) where {T<:Blas

LinearAlgebra.mul!(C::CuVector{T},A::CuSparseMatrix,B::CuVector) where {T} = mv!('N',one(T),A,B,zero(T),C,'O')
LinearAlgebra.mul!(C::CuVector{T},transA::Transpose{<:Any,<:CuSparseMatrix},B::CuVector) where {T} = mv!('T',one(T),parent(transA),B,zero(T),C,'O')
LinearAlgebra.mul!(C::CuVector{T},adjA::Adjoint{<:Any,<:CuSparseMatrix},B::CuVector) where {T} = mv!('C',one(T),parent(transA),B,zero(T),C,'O')
LinearAlgebra.mul!(C::CuVector{T},adjA::Adjoint{<:Any,<:CuSparseMatrix},B::CuVector) where {T} = mv!('C',one(T),parent(adjA),B,zero(T),C,'O')
LinearAlgebra.mul!(C::CuVector{T},A::HermOrSym{T,<:CuSparseMatrix{T}},B::CuVector{T}) where T = mv!('N',one(T),A,B,zero(T),C,'O')
LinearAlgebra.mul!(C::CuVector{T},transA::Transpose{<:Any, <:HermOrSym{T,<:CuSparseMatrix{T}}},B::CuVector{T}) where {T} = mv!('T',one(T),parent(transA),B,zero(T),C,'O')
LinearAlgebra.mul!(C::CuVector{T},adjA::Adjoint{<:Any, <:HermOrSym{T,<:CuSparseMatrix{T}}},B::CuVector{T}) where {T} = mv!('C',one(T),parent(adjA),B,zero(T),C,'O')
Expand Down
16 changes: 10 additions & 6 deletions src/sparse/wrappers.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,17 +567,21 @@ for (fname,elty) in ((:cusparseScsrmv, :Float32),
ctransa = 'T'
end
cutransa = cusparseop(ctransa)
cuind = cusparseindex(index)
Copy link
Member Author

Choose a reason for hiding this comment

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

cuind variable is not used. I removed it.

cudesc = getDescr(A,index)
n,m = Mat.dims
if ctransa == 'N'
chkmvdims(X,n,Y,m)
chkmvdims(X, n, Y, m)
end
if ctransa == 'T' || ctransa == 'C'
chkmvdims(X,m,Y,n)
chkmvdims(X, m, Y, n)
end
cudesc = getDescr(A,index)
nzVal = Mat.nzVal
if transa == 'C' && $elty <: Complex
nzVal = conj(Mat.nzVal)
end
$fname(handle(), cutransa, m, n, Mat.nnz, [alpha], Ref(cudesc),
Mat.nzVal, Mat.colPtr, Mat.rowVal, X, [beta], Y)
$fname(handle(),
cutransa, m, n, Mat.nnz, [alpha], Ref(cudesc), nzVal,
Mat.colPtr, Mat.rowVal, X, [beta], Y)
Y
end
end
Expand Down
46 changes: 46 additions & 0 deletions test/sparse.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2006,4 +2006,50 @@ end
end
end

@testset "mul!" begin
for elty in [Float32,Float64,ComplexF32,ComplexF64]
A = sparse(rand(elty,m,m))
x = rand(elty,m)
y = rand(elty,m)
@testset "csr -- $elty" begin
d_x = CuArray(x)
d_y = CuArray(y)
d_A = CuSparseMatrixCSR(A)
d_Aᵀ = transpose(d_A)
d_Aᴴ = adjoint(d_A)
CUSPARSE.mul!(d_y, d_A, d_x)
h_y = collect(d_y)
z = A * x
@test z ≈ h_y
CUSPARSE.mul!(d_y, d_Aᵀ, d_x)
h_y = collect(d_y)
z = transpose(A) * x
@test z ≈ h_y
CUSPARSE.mul!(d_y, d_Aᴴ, d_x)
h_y = collect(d_y)
z = adjoint(A) * x
@test z ≈ h_y
end
@testset "csc -- $elty" begin
d_x = CuArray(x)
d_y = CuArray(y)
d_A = CuSparseMatrixCSC(A)
d_Aᵀ = transpose(d_A)
d_Aᴴ = adjoint(d_A)
CUSPARSE.mul!(d_y, d_A, d_x)
h_y = collect(d_y)
z = A * x
@test z ≈ h_y
CUSPARSE.mul!(d_y, d_Aᵀ, d_x)
h_y = collect(d_y)
z = transpose(A) * x
@test z ≈ h_y
CUSPARSE.mul!(d_y, d_Aᴴ, d_x)
h_y = collect(d_y)
z = adjoint(A) * x
@test z ≈ h_y
end
end
end

end