Use sparse! and spzeros! in more places (#1084)

ext/FerriteMetis.jl

@@ -6,10 +6,9 @@ if VERSION >= v"1.10.0-DEV.90"
 
 using Ferrite:
     Ferrite, CellIterator, ConstraintHandler, DofHandler, DofOrder, celldofs, ndofs,
-    ndofs_per_cell
+    ndofs_per_cell, spzeros!!
 using Metis.LibMetis: idx_t
 using Metis: Metis
-using SparseArrays: sparse
 
 struct MetisOrder <: DofOrder.Ext{Metis}
     coupling::Union{Matrix{Bool},Nothing}
@@ -75,8 +74,7 @@ function Ferrite.compute_renumber_permutation(
     end
     @assert length(I) == length(J) == idx
     N = ndofs(dh)
-    # TODO: Use spzeros! in Julia 1.10.
-    S = sparse(I, J, zeros(Float32, length(I)), N, N)
+    S = spzeros!!(Float32, I, J, N, N)
 
     # Add entries from affine constraints
     if ch !== nothing

src/Dofs/ConstraintHandler.jl

@@ -767,7 +767,7 @@ function create_constraint_matrix(ch::ConstraintHandler{dh,T}) where {dh,T}
     end
     g[ch.prescribed_dofs] .= ch.inhomogeneities
 
-    C = sparse(I, J,  V, ndofs(ch.dh), length(ch.free_dofs))
+    C = sparse!!(I, J, V, ndofs(ch.dh), length(ch.free_dofs))
 
     return C, g
 end

src/Ferrite.jl

@@ -14,8 +14,7 @@ using NearestNeighbors:
 using OrderedCollections:
     OrderedSet
 using SparseArrays:
-    SparseArrays, SparseMatrixCSC, nonzeros, nzrange, rowvals, sparse,
-    AbstractSparseMatrixCSC
+    SparseArrays, SparseMatrixCSC, nonzeros, nzrange, rowvals, AbstractSparseMatrixCSC
 using StaticArrays:
     StaticArrays, MArray, MMatrix, SArray, SMatrix, SVector
 using WriteVTK:

src/arrayutils.jl

@@ -87,15 +87,14 @@ function fillzero!(A::Symmetric{T,<:SparseMatrixCSC}) where T
 end
 
 # Compat and convenience layer around SparseArrays.spzeros! (SparseArrays.jl#284, SparseArrays.jl#315)
-function spzeros!!(::Type{Tv}, I::Vector{Ti}, J::Vector{Ti}, m::Int, n::Int) where {Tv, Ti <: Integer}
-    @assert length(I) == length(J)
-    @static if isdefined(SparseArrays, :spzeros!)
-        klasttouch = Vector{Ti}(undef, n)
-        csrrowptr  = Vector{Ti}(undef, m + 1)
-        csrcolval  = Vector{Ti}(undef, length(I))
-        S = SparseArrays.spzeros!(Tv, I, J, m, n, klasttouch, csrrowptr, csrcolval, I, J)
-    else
-        S = sparse(I, J, zeros(Tv, length(I)), m, n)
+if VERSION >= v"1.10.0"
+    const sparse!! = SparseArrays.sparse!
+    const spzeros!! = SparseArrays.spzeros!
+else
+    function sparse!!(I::AbstractVector, J::AbstractVector, V::AbstractVector, m::Integer, n::Integer)
+        return SparseArrays.sparse(I, J, V, m, n)
+    end
+    function spzeros!!(::Type{T}, I::AbstractVector, J::AbstractVector, m::Integer, n::Integer) where T
+        return sparse!!(I, J, zeros(T, length(I)), m, n)
     end
-    return S
 end

src/assembler.jl

@@ -128,7 +128,7 @@ function finish_assemble(a::COOAssembler)
     # Create the matrix
     nrows = a.nrows == -1 ? maximum(a.I) : a.nrows
     ncols = a.ncols == -1 ? maximum(a.J) : a.ncols
-    K = sparse(a.I, a.J, a.V, nrows, ncols)
+    K = sparse!!(a.I, a.J, a.V, nrows, ncols)
     # Finalize the vector
     f = a.f
     if !isempty(f)