Skip to content

Commit 210604b

Browse files
kshyattkshyatt
committed
Fix _coo_type
1 parent b81ef0e commit 210604b

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

‎src/host/sparse.jl‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function LinearAlgebra.norm(A::AbstractGPUSparseMatrix{T}, p::Real=2) where T
6767
end
6868

6969
function SparseArrays.findnz(S::MT) where {MT <: AbstractGPUSparseMatrix}
70-
S2 = _coo_type(MT)(S)
70+
S2 = coo_type(MT)(S)
7171
I = S2.rowInd
7272
J = S2.colInd
7373
V = S2.nzVal
@@ -107,61 +107,61 @@ end
107107
for SparseMatrixType in [:AbstractGPUSparseMatrixCSC, :AbstractGPUSparseMatrixCSR]
108108
@eval begin
109109
LinearAlgebra.triu(A::ST, k::Integer) where {T, ST<:$SparseMatrixType{T}} =
110-
ST( triu(_coo_type(A)(A), k) )
110+
ST( triu(coo_type(A)(A), k) )
111111
LinearAlgebra.triu(A::Transpose{T,<:ST}, k::Integer) where {T, ST<:$SparseMatrixType{T}} =
112-
ST( triu(_coo_type(A)(_sptranspose(parent(A))), k) )
112+
ST( triu(coo_type(A)(_sptranspose(parent(A))), k) )
113113
LinearAlgebra.triu(A::Adjoint{T,<:ST}, k::Integer) where {T, ST<:$SparseMatrixType{T}} =
114-
ST( triu(_coo_type(A)(_spadjoint(parent(A))), k) )
114+
ST( triu(coo_type(A)(_spadjoint(parent(A))), k) )
115115

116116
LinearAlgebra.tril(A::ST, k::Integer) where {T, ST<:$SparseMatrixType{T}} =
117-
ST( tril(_coo_type(A)(A), k) )
117+
ST( tril(coo_type(A)(A), k) )
118118
LinearAlgebra.tril(A::Transpose{T,<:ST}, k::Integer) where {T, ST<:$SparseMatrixType{T}} =
119-
ST( tril(_coo_type(A)(_sptranspose(parent(A))), k) )
119+
ST( tril(coo_type(A)(_sptranspose(parent(A))), k) )
120120
LinearAlgebra.tril(A::Adjoint{T,<:ST}, k::Integer) where {T, ST<:$SparseMatrixType{T}} =
121-
ST( tril(_coo_type(A)(_spadjoint(parent(A))), k) )
121+
ST( tril(coo_type(A)(_spadjoint(parent(A))), k) )
122122

123123
LinearAlgebra.triu(A::Union{ST, Transpose{T,<:ST}, Adjoint{T,<:ST}}) where {T, ST<:$SparseMatrixType{T}} =
124-
ST( triu(_coo_type(A)(A), 0) )
124+
ST( triu(coo_type(A)(A), 0) )
125125
LinearAlgebra.tril(A::Union{ST,Transpose{T,<:ST}, Adjoint{T,<:ST}}) where {T, ST<:$SparseMatrixType{T}} =
126-
ST( tril(_coo_type(A)(A), 0) )
126+
ST( tril(coo_type(A)(A), 0) )
127127

128128
LinearAlgebra.kron(A::ST, B::ST) where {T, ST<:$SparseMatrixType{T}} =
129-
ST( kron(_coo_type(A)(A), _coo_type(B)(B)) )
129+
ST( kron(coo_type(A)(A), coo_type(B)(B)) )
130130
LinearAlgebra.kron(A::ST, B::Diagonal) where {T, ST<:$SparseMatrixType{T}} =
131-
ST( kron(_coo_type(A)(A), B) )
131+
ST( kron(coo_type(A)(A), B) )
132132
LinearAlgebra.kron(A::Diagonal, B::ST) where {T, ST<:$SparseMatrixType{T}} =
133-
ST( kron(A, _coo_type(B)(B)) )
133+
ST( kron(A, coo_type(B)(B)) )
134134

135135
LinearAlgebra.kron(A::Transpose{T,<:ST}, B::ST) where {T, ST<:$SparseMatrixType{T}} =
136-
ST( kron(_coo_type(A)(_sptranspose(parent(A))), _coo_type(B)(B)) )
136+
ST( kron(coo_type(A)(_sptranspose(parent(A))), coo_type(B)(B)) )
137137
LinearAlgebra.kron(A::ST, B::Transpose{T,<:ST}) where {T, ST<:$SparseMatrixType{T}} =
138-
ST( kron(_coo_type(A)(A), _coo_type(parent(B))(_sptranspose(parent(B)))) )
138+
ST( kron(coo_type(A)(A), coo_type(parent(B))(_sptranspose(parent(B)))) )
139139
LinearAlgebra.kron(A::Transpose{T,<:ST}, B::Transpose{T,<:ST}) where {T, ST<:$SparseMatrixType{T}} =
140-
ST( kron(_coo_type(A)(_sptranspose(parent(A))), _coo_type(parent(B))(_sptranspose(parent(B)))) )
140+
ST( kron(coo_type(A)(_sptranspose(parent(A))), coo_type(parent(B))(_sptranspose(parent(B)))) )
141141
LinearAlgebra.kron(A::Transpose{T,<:ST}, B::Diagonal) where {T, ST<:$SparseMatrixType{T}} =
142-
ST( kron(_coo_type(A)(_sptranspose(parent(A))), B) )
142+
ST( kron(coo_type(A)(_sptranspose(parent(A))), B) )
143143
LinearAlgebra.kron(A::Diagonal, B::Transpose{T,<:ST}) where {T, ST<:$SparseMatrixType{T}} =
144-
ST( kron(A, _coo_type(B)(_sptranspose(parent(B)))) )
144+
ST( kron(A, coo_type(B)(_sptranspose(parent(B)))) )
145145

146146
LinearAlgebra.kron(A::Adjoint{T,<:ST}, B::ST) where {T, ST<:$SparseMatrixType{T}} =
147-
ST( kron(_coo_type(A)(_spadjoint(parent(A))), _coo_type(B)(B)) )
147+
ST( kron(coo_type(A)(_spadjoint(parent(A))), coo_type(B)(B)) )
148148
LinearAlgebra.kron(A::ST, B::Adjoint{T,<:ST}) where {T, ST<:$SparseMatrixType{T}} =
149-
ST( kron(_coo_type(A)(A), _coo_type(parent(B))(_spadjoint(parent(B)))) )
149+
ST( kron(coo_type(A)(A), coo_type(parent(B))(_spadjoint(parent(B)))) )
150150
LinearAlgebra.kron(A::Adjoint{T,<:ST}, B::Adjoint{T,<:ST}) where {T, ST<:$SparseMatrixType{T}} =
151-
ST( kron(_coo_type(parent(A))(_spadjoint(parent(A))), _coo_type(parent(B))(_spadjoint(parent(B)))) )
151+
ST( kron(coo_type(parent(A))(_spadjoint(parent(A))), coo_type(parent(B))(_spadjoint(parent(B)))) )
152152
LinearAlgebra.kron(A::Adjoint{T,<:ST}, B::Diagonal) where {T, ST<:$SparseMatrixType{T}} =
153-
ST( kron(_coo_type(parent(A))(_spadjoint(parent(A))), B) )
153+
ST( kron(coo_type(parent(A))(_spadjoint(parent(A))), B) )
154154
LinearAlgebra.kron(A::Diagonal, B::Adjoint{T,<:ST}) where {T, ST<:$SparseMatrixType{T}} =
155-
ST( kron(A, _coo_type(parent(B))(_spadjoint(parent(B)))) )
155+
ST( kron(A, coo_type(parent(B))(_spadjoint(parent(B)))) )
156156

157157

158158
function Base.reshape(A::ST, dims::Dims) where {ST<:$SparseMatrixType}
159-
B = _coo_type(A)(A)
159+
B = coo_type(A)(A)
160160
ST(reshape(B, dims))
161161
end
162162

163163
function SparseArrays.droptol!(A::ST, tol::Real) where {ST<:$SparseMatrixType}
164-
B = _coo_type(A)(A)
164+
B = coo_type(A)(A)
165165
droptol!(B, tol)
166166
copyto!(A, ST(B))
167167
end

0 commit comments

Comments
 (0)