More fixes

Author: termi-official

src/linalg.jl

@@ -1326,26 +1326,26 @@ function _mul!(nzrang::Function, diagop::Function, odiagop::Function, C::Strided
 end
 
 # row range up to (and including if excl=false) diagonal
-function nzrangeup(A::AbstractSparseMatrixCSC, i, excl=false)
+function nzrangeup(A::SparseMatrixCSCUnion3, i, excl=false)
     r = nzrange(A, i); r1 = r.start; r2 = r.stop
     rv = rowvals(A)
     @inbounds r2 < r1 || rv[r2] <= i - excl ? r : r1:(searchsortedlast(view(rv, r1:r2), i - excl) + r1-1)
 end
 # row range from diagonal (included if excl=false) to end
-function nzrangelo(A::AbstractSparseMatrixCSC, i, excl=false)
+function nzrangelo(A::SparseMatrixCSCUnion3, i, excl=false)
     r = nzrange(A, i); r1 = r.start; r2 = r.stop
     rv = rowvals(A)
     @inbounds r2 < r1 || rv[r1] >= i + excl ? r : (searchsortedfirst(view(rv, r1:r2), i + excl) + r1-1):r2
 end
-function nzrangeup(A::AbstractSparseMatrixCSR, i, excl=false)
-    r = nzrange(A, i); r1 = r.start; r2 = r.stop
-    rv = colvals(A)
-    @inbounds r2 < r1 || rv[r1] >= i + excl ? r : (searchsortedfirst(view(rv, r1:r2), i + excl) + r1-1):r2
+function nzrangeup(A::SparseMatrixCSRUnion3, i, excl=false)
+    c = nzrange(A, i); c1 = c.start; c2 = c.stop
+    cv = colvals(A)
+    @inbounds c2 < c1 || cv[c1] >= i + excl ? c : (searchsortedfirst(view(cv, c1:c2), i + excl) + c1-1):c2
 end
-function nzrangelo(A::AbstractSparseMatrixCSR, i, excl=false)
-    r = nzrange(A, i); r1 = r.start; r2 = r.stop
-    rv = colvals(A)
-    @inbounds r2 < r1 || rv[r2] <= i - excl ? r : r1:(searchsortedlast(view(rv, r1:r2), i - excl) + r1-1)
+function nzrangelo(A::SparseMatrixCSRUnion3, i, excl=false)
+    c = nzrange(A, i); c1 = c.start; c2 = c.stop
+    cv = colvals(A)
+    @inbounds c2 < c1 || cv[c2] <= i - excl ? c : c1:(searchsortedlast(view(cv, c1:c2), i - excl) + c1-1)
 end
 
 dot(x::AbstractVector, A::RealHermSymComplexHerm{<:Any,<:AbstractSparseMatrixCSC}, y::AbstractVector) =

src/sparseconvert.jl

@@ -366,7 +366,7 @@ function _sparsem(taA::AdjOrTrans{Tv,<:AbstractTriangularSparseCSC}) where {Tv}
             newcolptr[j] = ni + 1
         end
     end
-    _sparse_gen(n, m, newcolptr, newrowval, newnzval)
+    _sparse_gen_csc(SparseMatrixCSC, n, m, newcolptr, newrowval, newnzval)
 end
 
 function _sparsem(taA::AdjOrTrans{Tv,<:AbstractTriangularSparseCSR{Tv,<:Any,MatrixType}}) where {Tv, MatrixType}
@@ -421,7 +421,7 @@ function _sparsem(taA::AdjOrTrans{Tv,<:AbstractTriangularSparseCSR{Tv,<:Any,Matr
             newrowptr[j] = ni + 1
         end
     end
-    _sparse_gen(MatrixType, n, m, newrowptr, newcolval, newnzval)
+    _sparse_gen_csr(MatrixType, n, m, newrowptr, newcolval, newnzval)
 end
 
 function _sparse_gen_csc(T, m, n, newcolptr, newrowval, newnzval)

src/sparsematrix.jl

@@ -190,6 +190,7 @@ const SparseMatrixCSCColumnSubset{Tv,Ti} =
     SubArray{Tv,2,<:AbstractSparseMatrixCSC{Tv,Ti},
         Tuple{Base.Slice{Base.OneTo{Int}},I}} where {I<:AbstractVector{<:Integer}}
 const SparseMatrixCSCUnion2{Tv,Ti} = Union{AbstractSparseMatrixCSC{Tv,Ti}, SparseMatrixCSCColumnSubset{Tv,Ti}}
+const SparseMatrixCSCUnion3{Tv,Ti} = Union{AbstractSparseMatrixCSC{Tv,Ti}, SparseMatrixCSCColumnSubset{Tv,Ti}, SparseMatrixCSCView{Tv, Ti}}
 
 getcolptr(S::SorF)     = getfield(S, :colptr)
 getcolptr(S::SparseMatrixCSCView) = view(getcolptr(parent(S)), first(S.indices[2]):(last(S.indices[2]) + 1))
@@ -202,12 +203,13 @@ nzvalview(S::AbstractSparseMatrixCSC) = view(nonzeros(S), 1:nnz(S))
 
 const SparseMatrixCSRView{Tv,Ti} =
     SubArray{Tv,2,<:AbstractSparseMatrixCSR{Tv,Ti},
-        Tuple{Base.Slice{Base.OneTo{Int}},I}} where {I<:AbstractUnitRange{<:Integer}}
+        Tuple{I,Base.Slice{Base.OneTo{Int}}}} where {I<:AbstractUnitRange{<:Integer}}
 const SparseMatrixCSRRowSubset{Tv,Ti} =
     SubArray{Tv,2,<:AbstractSparseMatrixCSR{Tv,Ti},
         Tuple{I,Base.Slice{Base.OneTo{Int}}}} where {I<:AbstractVector{<:Integer}}
 const SparseMatrixCSRUnion{Tv,Ti}  = Union{AbstractSparseMatrixCSR{Tv,Ti}, SparseMatrixCSRView{Tv,Ti}}
 const SparseMatrixCSRUnion2{Tv,Ti} = Union{AbstractSparseMatrixCSR{Tv,Ti}, SparseMatrixCSRRowSubset{Tv,Ti}}
+const SparseMatrixCSRUnion3{Tv,Ti} = Union{AbstractSparseMatrixCSR{Tv,Ti}, SparseMatrixCSRRowSubset{Tv,Ti}, SparseMatrixCSRView{Tv, Ti}}
 
 getrowptr(S::AbstractSparseMatrixCSR) = getfield(S, :rowptr)
 getrowptr(S::SparseMatrixCSRView)     = view(getrowptr(parent(S)), first(S.indices[2]):(last(S.indices[2]) + 1))