provide enough space when sparse(Unit..Triangular(Sparse..)) (Julia…

…Lang#34124)
Liozou · Jan 4, 2020 · ccfc55f · ccfc55f
1 parent 2c4db8f
commit ccfc55f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/stdlib/SparseArrays/src/sparseconvert.jl b/stdlib/SparseArrays/src/sparseconvert.jl
@@ -183,9 +183,10 @@ function _sparsem(A::AbstractTriangularSparse{Tv}) where Tv
  Ti = eltype(rowval)
  fnzrange = A isa Union{UpperTriangular,UnitUpperTriangular} ? nzrangeup : nzrangelo
  unit = A isa Union{UnitUpperTriangular,UnitLowerTriangular}
+ nz = nnz(S) + n * unit
  newcolptr = Vector{Ti}(undef, n+1)
- newrowval = Vector{Ti}(undef, nnz(S))
- newnzval = Vector{Tv}(undef, nnz(S))
+ newrowval = Vector{Ti}(undef, nz)
+ newnzval = Vector{Tv}(undef, nz)
  newcolptr[1] = 1
  uplo = fnzrange == nzrangeup
  newk = 1
@@ -233,7 +234,7 @@ function _sparsem(taA::Union{Transpose{Tv,<:AbstractTriangularSparse},
  uplo = A isa Union{UpperTriangular,UnitUpperTriangular}
 
  newcolptr = Vector{Ti}(undef, n+1)
- fill!(newcolptr, 1unit)
+ fill!(newcolptr, unit)
  newcolptr[1] = 1
  @inbounds for j = 1:n
  for k = fnzrange(A, j)

diff --git a/stdlib/SparseArrays/test/sparse.jl b/stdlib/SparseArrays/test/sparse.jl
@@ -2694,6 +2694,9 @@ end
  @test sparse([1,2,3,4,5]') == SparseMatrixCSC([1 2 3 4 5])
  @test sparse(UpperTriangular(A')) == UpperTriangular(B')
  @test sparse(Adjoint(UpperTriangular(A'))) == Adjoint(UpperTriangular(B'))
+ @test sparse(UnitUpperTriangular(spzeros(5,5))) == I
+ deepwrap(A) = (Adjoint(LowerTriangular(view(Symmetric(A), 5:7, 4:6))))
+ @test sparse(deepwrap(A)) == Matrix(deepwrap(B))
 end
 
 @testset "unary operations on matrices where length(nzval)>nnz" begin