Skip to content

Commit 7f0fd0f

Browse files
tkftkf
committed
Rename: getcolptr -> colptrs
1 parent 5ae63b8 commit 7f0fd0f

File tree

10 files changed

+217
-217
lines changed

10 files changed

+217
-217
lines changed

‎stdlib/SparseArrays/src/higherorderfns.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import Base: map, map!, broadcast, copy, copyto!
99
using Base: front, tail, to_shape
1010
using ..SparseArrays: SparseVector, SparseMatrixCSC, AbstractSparseVector,
1111
AbstractSparseMatrix, AbstractSparseArray, indtype, nnz, nzrange,
12-
SparseVectorUnion, AdjOrTransSparseVectorUnion, nonzeroinds, nonzeros, rowvals, getcolptr
12+
SparseVectorUnion, AdjOrTransSparseVectorUnion, nonzeroinds, nonzeros, rowvals, colptrs
1313
using Base.Broadcast: BroadcastStyle, Broadcasted, flatten
1414
using LinearAlgebra
1515

@@ -119,13 +119,13 @@ const SpBroadcasted2{Style<:SPVM,Axes,F,Args<:Tuple{SparseVecOrMat,SparseVecOrMa
119119
@inline colrange(A::SparseMatrixCSC, j) = nzrange(A, j)
120120
@inline colstartind(A::SparseVector, j) = one(indtype(A))
121121
@inline colboundind(A::SparseVector, j) = convert(indtype(A), length(nonzeroinds(A)) + 1)
122-
@inline colstartind(A::SparseMatrixCSC, j) = getcolptr(A)[j]
123-
@inline colboundind(A::SparseMatrixCSC, j) = getcolptr(A)[j + 1]
122+
@inline colstartind(A::SparseMatrixCSC, j) = colptrs(A)[j]
123+
@inline colboundind(A::SparseMatrixCSC, j) = colptrs(A)[j + 1]
124124
@inline storedinds(A::SparseVector) = nonzeroinds(A)
125125
@inline storedinds(A::SparseMatrixCSC) = rowvals(A)
126126
@inline storedvals(A::SparseVecOrMat) = nonzeros(A)
127127
@inline setcolptr!(A::SparseVector, j, val) = val
128-
@inline setcolptr!(A::SparseMatrixCSC, j, val) = getcolptr(A)[j] = val
128+
@inline setcolptr!(A::SparseMatrixCSC, j, val) = colptrs(A)[j] = val
129129
function trimstorage!(A::SparseVecOrMat, maxstored)
130130
resize!(storedinds(A), maxstored)
131131
resize!(storedvals(A), maxstored)
@@ -286,7 +286,7 @@ end
286286
function _densestructure!(A::SparseMatrixCSC)
287287
nnzA = size(A, 1) * size(A, 2)
288288
expandstorage!(A, nnzA)
289-
copyto!(getcolptr(A), 1:size(A, 1):(nnzA + 1))
289+
copyto!(colptrs(A), 1:size(A, 1):(nnzA + 1))
290290
for k in _densecoloffsets(A)
291291
copyto!(rowvals(A), k + 1, 1:size(A, 1))
292292
end
@@ -812,7 +812,7 @@ function _broadcast_notzeropres!(f::Tf, fillvalue, C::SparseVecOrMat, A::SparseV
812812
return C
813813
end
814814
_finishempty!(C::SparseVector) = C
815-
_finishempty!(C::SparseMatrixCSC) = (fill!(getcolptr(C), 1); C)
815+
_finishempty!(C::SparseMatrixCSC) = (fill!(colptrs(C), 1); C)
816816

817817
# special case - vector outer product
818818
_copy(f::typeof(*), x::SparseVectorUnion, y::AdjOrTransSparseVectorUnion) = _outer(x, y)

‎stdlib/SparseArrays/src/linalg.jl

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function mul!(C::StridedVecOrMat, A::SparseMatrixCSC, B::Union{StridedVector,Adj
4343
for k = 1:size(C, 2)
4444
@inbounds for col = 1:size(A, 2)
4545
αxj = B[col,k] * α
46-
for j = getcolptr(A)[col]:(getcolptr(A)[col + 1] - 1)
46+
for j = colptrs(A)[col]:(colptrs(A)[col + 1] - 1)
4747
C[rv[j], k] += nzv[j]*αxj
4848
end
4949
end
@@ -68,7 +68,7 @@ function mul!(C::StridedVecOrMat, adjA::Adjoint{<:Any,<:SparseMatrixCSC}, B::Uni
6868
for k = 1:size(C, 2)
6969
@inbounds for col = 1:size(A, 2)
7070
tmp = zero(eltype(C))
71-
for j = getcolptr(A)[col]:(getcolptr(A)[col + 1] - 1)
71+
for j = colptrs(A)[col]:(colptrs(A)[col + 1] - 1)
7272
tmp += adjoint(nzv[j])*B[rv[j],k]
7373
end
7474
C[col,k] += tmp * α
@@ -94,7 +94,7 @@ function mul!(C::StridedVecOrMat, transA::Transpose{<:Any,<:SparseMatrixCSC}, B:
9494
for k = 1:size(C, 2)
9595
@inbounds for col = 1:size(A, 2)
9696
tmp = zero(eltype(C))
97-
for j = getcolptr(A)[col]:(getcolptr(A)[col + 1] - 1)
97+
for j = colptrs(A)[col]:(colptrs(A)[col + 1] - 1)
9898
tmp += transpose(nzv[j])*B[rv[j],k]
9999
end
100100
C[col,k] += tmp * α
@@ -126,7 +126,7 @@ function mul!(C::StridedVecOrMat, X::AdjOrTransStridedMatrix, A::SparseMatrixCSC
126126
if β != 1
127127
β != 0 ? rmul!(C, β) : fill!(C, zero(eltype(C)))
128128
end
129-
@inbounds for multivec_row=1:mX, col = 1:size(A, 2), k=getcolptr(A)[col]:(getcolptr(A)[col+1]-1)
129+
@inbounds for multivec_row=1:mX, col = 1:size(A, 2), k=colptrs(A)[col]:(colptrs(A)[col+1]-1)
130130
C[multivec_row, col] += α * X[multivec_row, rv[k]] * nzv[k] # perhaps suboptimal position of α?
131131
end
132132
C
@@ -145,7 +145,7 @@ function mul!(C::StridedVecOrMat, X::AdjOrTransStridedMatrix, adjA::Adjoint{<:An
145145
if β != 1
146146
β != 0 ? rmul!(C, β) : fill!(C, zero(eltype(C)))
147147
end
148-
@inbounds for col = 1:size(A, 2), k=getcolptr(A)[col]:(getcolptr(A)[col+1]-1), multivec_col=1:mX
148+
@inbounds for col = 1:size(A, 2), k=colptrs(A)[col]:(colptrs(A)[col+1]-1), multivec_col=1:mX
149149
C[multivec_col, rv[k]] += α * X[multivec_col, col] * adjoint(nzv[k]) # perhaps suboptimal position of α?
150150
end
151151
C
@@ -164,7 +164,7 @@ function mul!(C::StridedVecOrMat, X::AdjOrTransStridedMatrix, transA::Transpose{
164164
if β != 1
165165
β != 0 ? rmul!(C, β) : fill!(C, zero(eltype(C)))
166166
end
167-
@inbounds for col = 1:size(A, 2), k=getcolptr(A)[col]:(getcolptr(A)[col+1]-1), multivec_col=1:mX
167+
@inbounds for col = 1:size(A, 2), k=colptrs(A)[col]:(colptrs(A)[col+1]-1), multivec_col=1:mX
168168
C[multivec_col, rv[k]] += α * X[multivec_col, col] * transpose(nzv[k]) # perhaps suboptimal position of α?
169169
end
170170
C
@@ -296,8 +296,8 @@ function dot(A::SparseMatrixCSC{T1,S1},B::SparseMatrixCSC{T2,S2}) where {T1,T2,S
296296
size(B) == (m,n) || throw(DimensionMismatch("matrices must have the same dimensions"))
297297
r = dot(zero(T1), zero(T2))
298298
@inbounds for j = 1:n
299-
ia = getcolptr(A)[j]; ia_nxt = getcolptr(A)[j+1]
300-
ib = getcolptr(B)[j]; ib_nxt = getcolptr(B)[j+1]
299+
ia = colptrs(A)[j]; ia_nxt = colptrs(A)[j+1]
300+
ib = colptrs(B)[j]; ib_nxt = colptrs(B)[j+1]
301301
if ia < ia_nxt && ib < ib_nxt
302302
ra = rowvals(A)[ia]; rb = rowvals(B)[ib]
303303
while true
@@ -376,7 +376,7 @@ function _lmul!(U::UpperTriangularPlain, B::StridedVecOrMat)
376376
nrowB, ncolB = size(B, 1), size(B, 2)
377377
aa = getnzval(A)
378378
ja = getrowval(A)
379-
ia = getcolptr(A)
379+
ia = colptrs(A)
380380

381381
joff = 0
382382
for k = 1:ncolB
@@ -417,7 +417,7 @@ function _lmul!(L::LowerTriangularPlain, B::StridedVecOrMat)
417417
nrowB, ncolB = size(B, 1), size(B, 2)
418418
aa = getnzval(A)
419419
ja = getrowval(A)
420-
ia = getcolptr(A)
420+
ia = colptrs(A)
421421

422422
joff = 0
423423
for k = 1:ncolB
@@ -459,7 +459,7 @@ function _lmul!(U::UpperTriangularWrapped, B::StridedVecOrMat)
459459
nrowB, ncolB = size(B, 1), size(B, 2)
460460
aa = getnzval(A)
461461
ja = getrowval(A)
462-
ia = getcolptr(A)
462+
ia = colptrs(A)
463463
Z = zero(eltype(A))
464464

465465
joff = 0
@@ -499,7 +499,7 @@ function _lmul!(L::LowerTriangularWrapped, B::StridedVecOrMat)
499499
nrowB, ncolB = size(B, 1), size(B, 2)
500500
aa = getnzval(A)
501501
ja = getrowval(A)
502-
ia = getcolptr(A)
502+
ia = colptrs(A)
503503
Z = zero(eltype(A))
504504

505505
joff = 0
@@ -549,7 +549,7 @@ function _ldiv!(L::LowerTriangularPlain, B::StridedVecOrMat)
549549
nrowB, ncolB = size(B, 1), size(B, 2)
550550
aa = getnzval(A)
551551
ja = getrowval(A)
552-
ia = getcolptr(A)
552+
ia = colptrs(A)
553553

554554
joff = 0
555555
for k = 1:ncolB
@@ -591,7 +591,7 @@ function _ldiv!(U::UpperTriangularPlain, B::StridedVecOrMat)
591591
nrowB, ncolB = size(B, 1), size(B, 2)
592592
aa = getnzval(A)
593593
ja = getrowval(A)
594-
ia = getcolptr(A)
594+
ia = colptrs(A)
595595

596596
joff = 0
597597
for k = 1:ncolB
@@ -634,7 +634,7 @@ function _ldiv!(L::LowerTriangularWrapped, B::StridedVecOrMat)
634634
nrowB, ncolB = size(B, 1), size(B, 2)
635635
aa = getnzval(A)
636636
ja = getrowval(A)
637-
ia = getcolptr(A)
637+
ia = colptrs(A)
638638

639639
joff = 0
640640
for k = 1:ncolB
@@ -680,7 +680,7 @@ function _ldiv!(U::UpperTriangularWrapped, B::StridedVecOrMat)
680680
nrowB, ncolB = size(B, 1), size(B, 2)
681681
aa = getnzval(A)
682682
ja = getrowval(A)
683-
ia = getcolptr(A)
683+
ia = colptrs(A)
684684

685685
joff = 0
686686
for k = 1:ncolB
@@ -817,7 +817,7 @@ function ldiv!(D::Diagonal{T}, A::SparseMatrixCSC{T}) where {T}
817817
for i=1:length(b)
818818
iszero(b[i]) && throw(SingularException(i))
819819
end
820-
@inbounds for col = 1:size(A, 2), p = getcolptr(A)[col]:(getcolptr(A)[col + 1] - 1)
820+
@inbounds for col = 1:size(A, 2), p = colptrs(A)[col]:(colptrs(A)[col + 1] - 1)
821821
nonz[p] = b[Arowval[p]] \ nonz[p]
822822
end
823823
A
@@ -837,7 +837,7 @@ function triu(S::SparseMatrixCSC{Tv,Ti}, k::Integer=0) where {Tv,Ti}
837837
colptr[col] = 1
838838
end
839839
for col = max(k+1,1) : n
840-
for c1 = getcolptr(S)[col] : getcolptr(S)[col+1]-1
840+
for c1 = colptrs(S)[col] : colptrs(S)[col+1]-1
841841
rowvals(S)[c1] > col - k && break
842842
nnz += 1
843843
end
@@ -847,8 +847,8 @@ function triu(S::SparseMatrixCSC{Tv,Ti}, k::Integer=0) where {Tv,Ti}
847847
nzval = Vector{Tv}(undef, nnz)
848848
A = SparseMatrixCSC(m, n, colptr, rowval, nzval)
849849
for col = max(k+1,1) : n
850-
c1 = getcolptr(S)[col]
851-
for c2 = getcolptr(A)[col] : getcolptr(A)[col+1]-1
850+
c1 = colptrs(S)[col]
851+
for c2 = colptrs(A)[col] : colptrs(A)[col+1]-1
852852
rowvals(A)[c2] = rowvals(S)[c1]
853853
nonzeros(A)[c2] = nonzeros(S)[c1]
854854
c1 += 1
@@ -863,8 +863,8 @@ function tril(S::SparseMatrixCSC{Tv,Ti}, k::Integer=0) where {Tv,Ti}
863863
nnz = 0
864864
colptr[1] = 1
865865
for col = 1 : min(n, m+k)
866-
l1 = getcolptr(S)[col+1]-1
867-
for c1 = 0 : (l1 - getcolptr(S)[col])
866+
l1 = colptrs(S)[col+1]-1
867+
for c1 = 0 : (l1 - colptrs(S)[col])
868868
rowvals(S)[l1 - c1] < col - k && break
869869
nnz += 1
870870
end
@@ -877,9 +877,9 @@ function tril(S::SparseMatrixCSC{Tv,Ti}, k::Integer=0) where {Tv,Ti}
877877
nzval = Vector{Tv}(undef, nnz)
878878
A = SparseMatrixCSC(m, n, colptr, rowval, nzval)
879879
for col = 1 : min(n, m+k)
880-
c1 = getcolptr(S)[col+1]-1
881-
l2 = getcolptr(A)[col+1]-1
882-
for c2 = 0 : l2 - getcolptr(A)[col]
880+
c1 = colptrs(S)[col+1]-1
881+
l2 = colptrs(A)[col+1]-1
882+
for c2 = 0 : l2 - colptrs(A)[col]
883883
rowvals(A)[l2 - c2] = rowvals(S)[c1]
884884
nonzeros(A)[l2 - c2] = nonzeros(S)[c1]
885885
c1 -= 1
@@ -902,7 +902,7 @@ function sparse_diff1(S::SparseMatrixCSC{Tv,Ti}) where {Tv,Ti}
902902
for col = 1 : n
903903
last_row = 0
904904
last_val = 0
905-
for k = getcolptr(S)[col] : getcolptr(S)[col+1]-1
905+
for k = colptrs(S)[col] : colptrs(S)[col+1]-1
906906
row = rowvals(S)[k]
907907
val = nonzeros(S)[k]
908908
if row > 1
@@ -939,7 +939,7 @@ function sparse_diff2(a::SparseMatrixCSC{Tv,Ti}) where {Tv,Ti}
939939

940940
z = zero(Tv)
941941

942-
colptr_a = getcolptr(a)
942+
colptr_a = colptrs(a)
943943
rowval_a = rowvals(a)
944944
nzval_a = nonzeros(a)
945945

@@ -1045,7 +1045,7 @@ function opnorm(A::SparseMatrixCSC, p::Real=2)
10451045
nA::Tsum = 0
10461046
for j=1:n
10471047
colSum::Tsum = 0
1048-
for i = getcolptr(A)[j]:getcolptr(A)[j+1]-1
1048+
for i = colptrs(A)[j]:colptrs(A)[j+1]-1
10491049
colSum += abs(nonzeros(A)[i])
10501050
end
10511051
nA = max(nA, colSum)
@@ -1261,12 +1261,12 @@ function kron(A::SparseMatrixCSC{T1,S1}, B::SparseMatrixCSC{T2,S2}) where {T1,S1
12611261
colptrC[1] = 1
12621262
col = 1
12631263
@inbounds for j = 1:nA
1264-
startA = getcolptr(A)[j]
1265-
stopA = getcolptr(A)[j+1] - 1
1264+
startA = colptrs(A)[j]
1265+
stopA = colptrs(A)[j+1] - 1
12661266
lA = stopA - startA + 1
12671267
for i = 1:nB
1268-
startB = getcolptr(B)[i]
1269-
stopB = getcolptr(B)[i+1] - 1
1268+
startB = colptrs(B)[i]
1269+
stopB = colptrs(B)[i+1] - 1
12701270
lB = stopB - startB + 1
12711271
ptr_range = (1:lB) .+ (colptrC[col]-1)
12721272
colptrC[col+1] = colptrC[col] + lA*lB
@@ -1324,9 +1324,9 @@ inv(A::SparseMatrixCSC) = error("The inverse of a sparse matrix can often be den
13241324

13251325
# Copy colptr and rowval from one sparse matrix to another
13261326
function copyinds!(C::SparseMatrixCSC, A::SparseMatrixCSC)
1327-
if getcolptr(C) !== getcolptr(A)
1328-
resize!(getcolptr(C), length(getcolptr(A)))
1329-
copyto!(getcolptr(C), getcolptr(A))
1327+
if colptrs(C) !== colptrs(A)
1328+
resize!(colptrs(C), length(colptrs(A)))
1329+
copyto!(colptrs(C), colptrs(A))
13301330
end
13311331
if rowvals(C) !== rowvals(A)
13321332
resize!(rowvals(C), length(rowvals(A)))
@@ -1343,7 +1343,7 @@ function mul!(C::SparseMatrixCSC, A::SparseMatrixCSC, D::Diagonal{T, <:Vector})
13431343
Cnzval = nonzeros(C)
13441344
Anzval = nonzeros(A)
13451345
resize!(Cnzval, length(Anzval))
1346-
for col = 1:n, p = getcolptr(A)[col]:(getcolptr(A)[col+1]-1)
1346+
for col = 1:n, p = colptrs(A)[col]:(colptrs(A)[col+1]-1)
13471347
@inbounds Cnzval[p] = Anzval[p] * b[col]
13481348
end
13491349
C
@@ -1358,7 +1358,7 @@ function mul!(C::SparseMatrixCSC, D::Diagonal{T, <:Vector}, A::SparseMatrixCSC)
13581358
Anzval = nonzeros(A)
13591359
Arowval = rowvals(A)
13601360
resize!(Cnzval, length(Anzval))
1361-
for col = 1:n, p = getcolptr(A)[col]:(getcolptr(A)[col+1]-1)
1361+
for col = 1:n, p = colptrs(A)[col]:(colptrs(A)[col+1]-1)
13621362
@inbounds Cnzval[p] = b[Arowval[p]] * Anzval[p]
13631363
end
13641364
C
@@ -1394,7 +1394,7 @@ function rmul!(A::SparseMatrixCSC, D::Diagonal)
13941394
m, n = size(A)
13951395
(n == size(D, 1)) || throw(DimensionMismatch())
13961396
Anzval = nonzeros(A)
1397-
@inbounds for col = 1:n, p = getcolptr(A)[col]:(getcolptr(A)[col + 1] - 1)
1397+
@inbounds for col = 1:n, p = colptrs(A)[col]:(colptrs(A)[col + 1] - 1)
13981398
Anzval[p] = Anzval[p] * D.diag[col]
13991399
end
14001400
return A
@@ -1405,7 +1405,7 @@ function lmul!(D::Diagonal, A::SparseMatrixCSC)
14051405
(m == size(D, 2)) || throw(DimensionMismatch())
14061406
Anzval = nonzeros(A)
14071407
Arowval = rowvals(A)
1408-
@inbounds for col = 1:n, p = getcolptr(A)[col]:(getcolptr(A)[col + 1] - 1)
1408+
@inbounds for col = 1:n, p = colptrs(A)[col]:(colptrs(A)[col + 1] - 1)
14091409
Anzval[p] = D.diag[Arowval[p]] * Anzval[p]
14101410
end
14111411
return A

0 commit comments

Comments
 (0)