Base.sum for ExtendableSparse; depend on Julia 1.10

Author: j-fu

Project.toml

@@ -35,20 +35,20 @@ ILUZero = "0.2"
 IncompleteLU = "^0.2.1"
 InteractiveUtils = "1.11.0"
 IterativeSolvers = "0.9"
-LinearAlgebra = "1.9"
+LinearAlgebra = "1.10"
 LinearSolve = "2.36.0, 3.7.1"
 Metis = "1"
 MultiFloats = "1, 2"
 OhMyThreads = "0.6, 0.7, 0.8"
-Printf = "1.9"
-Random = "1.9"
+Printf = "1.10"
+Random = "1.10"
 RecursiveFactorization = "0.2"
 SciMLPublic = "1.0.1"
-SparseArrays = "1.9"
+SparseArrays = "1.10"
 Sparspak = "0.3.6"
 StaticArrays = "1"
-Test = "1.9"
-julia = "1.9"
+Test = "1.10"
+julia = "1.10"
 
 [extras]
 AMGCLWrap = "4f76b812-4ba5-496d-b042-d70715554288"

src/ExtendableSparse.jl

@@ -8,7 +8,7 @@ module ExtendableSparse
 using DocStringExtensions: DocStringExtensions, SIGNATURES, TYPEDEF, TYPEDFIELDS, TYPEDSIGNATURES
 using ILUZero: ILUZero
 using LinearAlgebra: LinearAlgebra, Diagonal, Hermitian, Symmetric, Tridiagonal, mul!, ldiv!
-using SparseArrays: SparseArrays, AbstractSparseMatrix, AbstractSparseMatrixCSC, SparseMatrixCSC
+using SparseArrays: SparseArrays, AbstractSparseMatrix, AbstractSparseMatrixCSC, SparseMatrixCSC, indtype
 using SparseArrays: dropzeros!, findnz, nzrange, sparse, spzeros, rowvals, getcolptr, nonzeros, nnz
 using Sparspak: sparspaklu
 using SciMLPublic: @public

src/abstractextendablesparsematrixcsc.jl

@@ -106,6 +106,12 @@ Return element type.
 """
 Base.eltype(::AbstractExtendableSparseMatrixCSC{Tv, Ti}) where {Tv, Ti} = Tv
 
+"""
+    SparseArrays.indtype(A::AbstractExtendableSparseMatrixCSC{Tv, Ti})
+
+Return element type.
+"""
+SparseArrays.indtype(A::AbstractExtendableSparseMatrixCSC{Tv, Ti})  where {Tv, Ti} = Ti 
 
 """
     SparseArrays.SparseMatrixCSC(A::AbstractExtendableSparseMatrixCSC)
@@ -360,6 +366,37 @@ function Base.:-(csc::SparseMatrixCSC, ext::AbstractExtendableSparseMatrixCSC)
     return csc - sparse(ext)
 end
 
+"""
+    Base.sum(M::AbstractVector{TM}) where TM<:AbstractExtendableSparseMatrixCSC
+
+Efficient sum of ExtendableSparse matrices.
+"""
+function Base.sum(M::AbstractVector{TM}) where TM<:AbstractExtendableSparseMatrixCSC
+    Ti = promote_type(indtype.(M)...)
+    Tv = promote_type(eltype.(M)...)
+    return _sum(M,Tv,Ti)
+end
+
+function _sum(M, ::Type{Tv}, ::Type{Ti}) where {Tv, Ti}
+    l = sum(nnz, M)
+    I = Vector{Ti}(undef, l)
+    J = Vector{Ti}(undef, l)
+    V = Vector{Tv}(undef, l)
+
+    i = 1
+    @time for m in M
+        (; colptr, nzval, rowval) = sparse(m)
+        for icsc in 1:(length(colptr) - 1)
+            for j in colptr[icsc]:(colptr[icsc + 1] - 1)
+                I[i] = rowval[j]
+                J[i] = icsc
+                V[i] = nzval[j]
+                i = i + 1
+            end
+        end
+    end
+    return SparseArrays.sparse!(I, J, V)
+end
 
 """
 $(TYPEDSIGNATURES)

src/sparsematrixdict.jl

@@ -135,11 +135,7 @@ function SparseArrays.sparse(mat::SparseMatrixDict{Tv, Ti}) where {Tv, Ti}
         V[i] = v
         i = i + 1
     end
-    @static if VERSION >= v"1.10"
-        return SparseArrays.sparse!(I, J, V, size(mat)..., +)
-    else
-        return SparseArrays.sparse(I, J, V, size(mat)..., +)
-    end
+    return SparseArrays.sparse!(I, J, V, size(mat)..., +)
 end
 
 """
@@ -172,11 +168,7 @@ function Base.:+(dictmatrix::SparseMatrixDict{Tv, Ti}, cscmatrix::SparseMatrixCS
         end
 
         @assert l == i - 1
-        @static if VERSION >= v"1.10"
-            return SparseArrays.sparse!(I, J, V, m, n, +)
-        else
-            return SparseArrays.sparse(I, J, V, m, n, +)
-        end
+        return SparseArrays.sparse!(I, J, V, m, n, +)
     end
     return cscmatrix
 end

src/sparsematrixdilnkc.jl

@@ -443,11 +443,7 @@ function Base.sum(lnkdictmatrices::Vector{SparseMatrixDILNKC{Tv, Ti}}, cscmatrix
             end
         end
         @assert l == i - 1
-        @static if VERSION >= v"1.10"
-            return SparseArrays.sparse!(I, J, V, m, n, +)
-        else
-            return SparseArrays.sparse(I, J, V, m, n, +)
-        end
+        return SparseArrays.sparse!(I, J, V, m, n, +)
     end
     return cscmatrix
 end

src/sparsematrixlnk.jl

@@ -18,7 +18,7 @@ can be conveniently updated via `push!`.  No copying of existing data is necessa
 
 Via the type aliases [`STExtendableSparseMatrixCSC`](@ref), [`ExtendableSparseMatrixCSC`](@ref),
 and [`ExtendableSparseMatrix`](@ref) this extension is used as default for handling
-scalar assembly.
+sequential assembly.
 
 
 $(TYPEDFIELDS)