More fixes

Author: termi-official

src/abstractsparse.jl

@@ -48,6 +48,8 @@ Supertype for matrix with compressed sparse row (CSR).
 """
 abstract type AbstractSparseMatrixCSR{Tv,Ti<:Integer} <: AbstractSparseMatrix{Tv,Ti} end
 
+const AbstractSparseMatrixCSCOrCSR{Tv,Ti} = Union{AbstractSparseMatrixCSR{Tv,Ti}, AbstractSparseMatrixCSC{Tv,Ti}}
+
 """
     issparse(S)
 

src/sparsematrix.jl

@@ -26,7 +26,7 @@ struct SparseMatrixCSC{Tv,Ti<:Integer} <: AbstractSparseMatrixCSC{Tv,Ti}
     function SparseMatrixCSC{Tv,Ti}(m::Integer, n::Integer, colptr::Vector{Ti},
                             rowval::Vector{Ti}, nzval::Vector{Tv}) where {Tv,Ti<:Integer}
         sparse_check_Ti(m, n, Ti)
-        _goodbuffers(Int(m), Int(n), colptr, rowval, nzval) ||
+        _goodbufferscsc(Int(m), Int(n), colptr, rowval, nzval) ||
             throw(ArgumentError("Invalid buffers for SparseMatrixCSC construction n=$n, colptr=$(summary(colptr)), rowval=$(summary(rowval)), nzval=$(summary(nzval))"))
         new(Int(m), Int(n), colptr, rowval, nzval)
     end
@@ -73,7 +73,7 @@ struct FixedSparseCSC{Tv,Ti<:Integer} <: AbstractSparseMatrixCSC{Tv,Ti}
                             rowval::ReadOnly{Ti,1,Vector{Ti}},
                             nzval::Vector{Tv}) where {Tv,Ti<:Integer}
         sparse_check_Ti(m, n, Ti)
-        _goodbuffers(Int(m), Int(n), parent(colptr), parent(rowval), nzval) ||
+        _goodbufferscsc(Int(m), Int(n), parent(colptr), parent(rowval), nzval) ||
             throw(ArgumentError("Invalid buffers for FixedSparseCSC construction n=$n, colptr=$(summary(colptr)), rowval=$(summary(rowval)), nzval=$(summary(nzval))"))
         new(Int(m), Int(n), colptr, rowval, nzval)
     end
@@ -164,15 +164,21 @@ end
 
 size(S::SorF) = (getfield(S, :m), getfield(S, :n))
 
-_goodbuffers(S::AbstractSparseMatrixCSC) = _goodbuffers(size(S)..., getcolptr(S), getrowval(S), nonzeros(S))
-_checkbuffers(S::AbstractSparseMatrixCSC) = (@assert _goodbuffers(S); S)
+_goodbuffers(S::AbstractSparseMatrixCSC) = _goodbufferscsc(size(S)..., getcolptr(S), getrowval(S), nonzeros(S))
+_goodbuffers(S::AbstractSparseMatrixCSR) = _goodbufferscsr(size(S)..., getrowptr(S), getcolval(S), nonzeros(S))
+_checkbuffers(S::AbstractSparseMatrixCSCOrCSR) = (@assert _goodbuffers(S); S)
 _checkbuffers(S::Union{Adjoint, Transpose}) = (_checkbuffers(parent(S)); S)
 
-function _goodbuffers(m, n, colptr, rowval, nzval)
+function _goodbufferscsc(m, n, colptr, rowval, nzval)
     (length(colptr) == n + 1 && colptr[end] - 1 == length(rowval) == length(nzval))
     # stronger check for debugging purposes
     # && all(issorted(@view rowval[colptr[i]:colptr[i+1]-1]) for i=1:n)
 end
+function _goodbufferscsr(m, n, rowptr, colval, nzval)
+    (length(rowptr) == m + 1 && rowptr[end] - 1 == length(colval) == length(nzval))
+    # stronger check for debugging purposes
+    # && all(issorted(@view rowval[colptr[i]:colptr[i+1]-1]) for i=1:n)
+end
 
 # Define an alias for views of a SparseMatrixCSC which include all rows and a unit range of the columns.
 # Also define a union of SparseMatrixCSC and this view since many methods can be defined efficiently for
@@ -1535,11 +1541,9 @@ end
 function _computerowptrs_halfperm!(X::AbstractSparseMatrixCSR{Tv,Ti}, A::AbstractSparseMatrixCSR{TvA,Ti}) where {Tv,TvA,Ti}
     # Compute `transpose(A[q,:])`'s column counts. Store shifted forward one position in getcolptr(X).
     fill!(getrowptr(X), 0)
-    @show colvals(A)
     for k in 1:nnz(A)
         getrowptr(X)[colvals(A)[k]+1] += 1
     end
-    @show getrowptr(X)
     # Compute `transpose(A[q,:])`'s column pointers. Store shifted forward one position in getcolptr(X).
     getrowptr(X)[1] = 1
     countsum = 1
@@ -1647,7 +1651,7 @@ function ftranspose(A::MatrixType, f::Function, eltype::Type{Tv} = TvA) where {T
                    Vector{Ti}(undef, 0),
                    Vector{Tv}(undef, 0))
     sizehint!(X, nnz(A))
-    return halfperm!(X, A, 1:size(A, 2), f)
+    return halfperm!(X, A, 1:size(A, 1), f)
 end
 
 adjoint(A::AbstractSparseMatrixCSC) = Adjoint(A)

test/transeposecscmat.jl renamed to test/transposecscmat.jl

@@ -43,7 +43,7 @@ SparseArrays.nonzeros(A::TransposeSparseMatrixCSC)  = nonzeros(A.A.parent)
     @test typeof(ATTAT) <: SparseArrays.AbstractSparseMatrixCSR
     @test all(ATTAT .== A*A')
 
-    A = TransposeSparseMatrixCSC(sprandn(3,2,0.5))
+    A  = TransposeSparseMatrixCSC(sprandn(3,2,0.5))
     B1 = TransposeSparseMatrixCSC(sprandn(3,4,0.5))
     B2 = TransposeSparseMatrixCSC(sprandn(3,3,0.5))
     B3 = TransposeSparseMatrixCSC(sprandn(4,3,0.5))