Skip to content

Commit dabcbd3

Browse files
committed
Support CSC
1 parent b79926a commit dabcbd3

File tree

5 files changed

+459
-261
lines changed

5 files changed

+459
-261
lines changed

lib/mkl/array.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ mutable struct oneSparseMatrixCSC{Tv, Ti} <: oneAbstractSparseMatrix{Tv, Ti}
1818
colPtr::oneVector{Ti}
1919
rowVal::oneVector{Ti}
2020
nzVal::oneVector{Tv}
21-
dims::NTuple{2,Int}
21+
dims::NTuple{2, Int}
2222
nnz::Ti
2323
end
2424

@@ -46,7 +46,7 @@ SparseArrays.nnz(A::oneAbstractSparseMatrix) = A.nnz
4646
SparseArrays.nonzeros(A::oneAbstractSparseMatrix) = A.nzVal
4747

4848
for (gpu, cpu) in [:oneSparseMatrixCSR => :SparseMatrixCSC,
49-
:oneSparseMatrixCSC => :SparseMatrixCSC,
49+
:oneSparseMatrixCSC => :SparseMatrixCSC,
5050
:oneSparseMatrixCOO => :SparseMatrixCSC]
5151
@eval Base.show(io::IOContext, x::$gpu) =
5252
show(io, $cpu(x))

lib/mkl/interfaces.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ function LinearAlgebra.generic_matvecmul!(C::oneVector{T}, tA::AbstractChar, A::
77
sparse_gemv!(tA, _add.alpha, A, B, _add.beta, C)
88
end
99

10-
function LinearAlgebra.generic_matvecmul!(C::oneVector{T}, tA::AbstractChar, A::oneSparseMatrixCSC{T}, B::oneVector{T}, _add::MulAddMul) where T <: BlasReal
10+
function LinearAlgebra.generic_matvecmul!(C::oneVector{T}, tA::AbstractChar, A::oneSparseMatrixCSC{T}, B::oneVector{T}, _add::MulAddMul) where {T <: BlasReal}
1111
tA = tA in ('S', 's', 'H', 'h') ? 'T' : flip_trans(tA)
12-
sparse_gemv!(tA, _add.alpha, A, B, _add.beta, C)
12+
return sparse_gemv!(tA, _add.alpha, A, B, _add.beta, C)
1313
end
1414

1515
function LinearAlgebra.generic_matmatmul!(C::oneMatrix{T}, tA, tB, A::oneSparseMatrixCSR{T}, B::oneMatrix{T}, _add::MulAddMul) where T <: BlasFloat
@@ -18,10 +18,10 @@ function LinearAlgebra.generic_matmatmul!(C::oneMatrix{T}, tA, tB, A::oneSparseM
1818
sparse_gemm!(tA, tB, _add.alpha, A, B, _add.beta, C)
1919
end
2020

21-
function LinearAlgebra.generic_matmatmul!(C::oneMatrix{T}, tA, tB, A::oneSparseMatrixCSC{T}, B::oneMatrix{T}, _add::MulAddMul) where T <: BlasReal
21+
function LinearAlgebra.generic_matmatmul!(C::oneMatrix{T}, tA, tB, A::oneSparseMatrixCSC{T}, B::oneMatrix{T}, _add::MulAddMul) where {T <: BlasReal}
2222
tA = tA in ('S', 's', 'H', 'h') ? 'T' : flip_trans(tA)
2323
tB = tB in ('S', 's', 'H', 'h') ? 'N' : tB
24-
sparse_gemm!(tA, tB, _add.alpha, A, B, _add.beta, C)
24+
return sparse_gemm!(tA, tB, _add.alpha, A, B, _add.beta, C)
2525
end
2626

2727
function LinearAlgebra.generic_trimatdiv!(C::oneVector{T}, uploc, isunitc, tfun::Function, A::oneSparseMatrixCSR{T}, B::oneVector{T}) where T <: BlasFloat

0 commit comments

Comments
 (0)