Move SparseArrays to an extension (#163)

* Move SparseArrays to an extension

* bump version to v0.12.3

Project.toml

@@ -1,6 +1,6 @@
 name = "BlockBandedMatrices"
 uuid = "ffab5731-97b5-5995-9138-79e8c1846df0"
-version = "0.12.2"
+version = "0.12.3"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
@@ -12,6 +12,12 @@ MatrixFactorizations = "a3b82374-2e81-5b9e-98ce-41277c0e4c87"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
+[weakdeps]
+SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+
+[extensions]
+BlockBandedMatricesSparseArraysExt = "SparseArrays"
+
 [compat]
 Aqua = "0.6"
 ArrayLayouts = "1"
@@ -24,7 +30,8 @@ julia = "1.6"
 [extras]
 Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Aqua", "Random", "Test"]
+test = ["Aqua", "Random", "SparseArrays", "Test"]

ext/BlockBandedMatricesSparseArraysExt.jl

@@ -0,0 +1,27 @@
+module BlockBandedMatricesSparseArraysExt
+
+using BlockBandedMatrices
+using BandedMatrices
+using BandedMatrices: _banded_rowval, _banded_colval, _banded_nzval
+using BlockArrays: blockaxes, blockcolsupport
+import SparseArrays: sparse
+
+function sparse(A::BandedBlockBandedMatrix)
+    i = Vector{Int}()
+    j = Vector{Int}()
+    z = Vector{eltype(A)}()
+    for J = blockaxes(A,2), K = blockcolsupport(A, J)
+        B = view(A, K, J)
+        ĩ = _banded_rowval(B)
+        j̃ = _banded_colval(B)
+        z̃ = _banded_nzval(B)
+        ĩ .+= first(axes(A,1)[K])-1
+        j̃ .+= first(axes(A,2)[J])-1
+        append!(i, ĩ)
+        append!(j, j̃)
+        append!(z, z̃)
+    end
+    sparse(i, j, z, size(A)...)
+end
+
+end

src/BandedBlockBandedMatrix.jl

@@ -257,24 +257,6 @@ axes(A::BandedBlockBandedMatrix) = (A.raxis, axes(A.data,2))
 
 bandedblockbandeddata(A::BandedBlockBandedMatrix) = A.data
 
-function sparse(A::BandedBlockBandedMatrix)
-    i = Vector{Int}()
-    j = Vector{Int}()
-    z = Vector{eltype(A)}()
-    for J = blockaxes(A,2), K = blockcolsupport(A, J)
-        B = view(A, K, J)
-        ĩ = _banded_rowval(B)
-        j̃ = _banded_colval(B)
-        z̃ = _banded_nzval(B)
-        ĩ .+= first(axes(A,1)[K])-1
-        j̃ .+= first(axes(A,2)[J])-1
-        append!(i, ĩ)
-        append!(j, j̃)
-        append!(z, z̃)
-    end
-    sparse(i, j, z, size(A)...)
-end
-
 ################################
 # BandedBlockBandedMatrix Interface #
 ################################

src/BlockBandedMatrices.jl

@@ -1,5 +1,5 @@
 module BlockBandedMatrices
-using BlockArrays, BandedMatrices, ArrayLayouts, FillArrays, SparseArrays, MatrixFactorizations
+using BlockArrays, BandedMatrices, ArrayLayouts, FillArrays, MatrixFactorizations
 using LinearAlgebra
 
 import Base: getindex, setindex!, checkbounds, @propagate_inbounds, convert,
@@ -19,7 +19,6 @@ import LinearAlgebra.BLAS: BlasInt, BlasFloat, @blasfunc, BlasComplex, BlasReal
 import LinearAlgebra.LAPACK: chktrans, chkdiag, chklapackerror, checksquare, chkstride1,
                     chkuplo
 import MatrixFactorizations: ql, ql!, _ql, QLPackedQ, AdjQRPackedQLayout, AdjQLPackedQLayout, QR, QRPackedQ
-import SparseArrays: sparse
 
 import ArrayLayouts: BlasMatLmulVec, MatLmulVec, MatLmulMat,
                     triangularlayout, UpperTriangularLayout, TriangularLayout, MatLdivVec,
@@ -42,8 +41,7 @@ import BandedMatrices: isbanded, bandwidths, bandwidth, banded_getindex, colrang
                         BandedLayout, BandedColumnMajor, BandedColumns, bandedcolumns,
                         BandedSubBandedMatrix, bandeddata,
                         _BandedMatrix, colstart, colstop, rowstart, rowstop,
-                        BandedStyle, _fill_lmul!, bandshift,
-                        _banded_colval, _banded_rowval, _banded_nzval # for sparse
+                        BandedStyle, _fill_lmul!, bandshift
 
 export BandedBlockBandedMatrix, BlockBandedMatrix, BlockSkylineMatrix, blockbandwidth, blockbandwidths,
         subblockbandwidth, subblockbandwidths, Ones, Zeros, Fill, Block, BlockTridiagonal, BlockBidiagonal, isblockbanded
@@ -68,4 +66,8 @@ include("interfaceimpl.jl")
 include("triblockbanded.jl")
 include("adjtransblockbanded.jl")
 
+if !isdefined(Base, :get_extension)
+    include("../ext/BlockBandedMatricesSparseArraysExt.jl")
+end
+
 end # module