Move SparseArrays to an extension (#158)

* Move SparseArrays to an extension

* Don't import Base explicitly

* Add explicit tests

* Bump version to v1.3.0

Author: jishnub

Project.toml

@@ -8,15 +8,22 @@ FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
+[weakdeps]
+SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+
+[extensions]
+ArrayLayoutsSparseArraysExt = "SparseArrays"
+
 [compat]
 FillArrays = "1.2.1"
 julia = "1.6"
 
 [extras]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Base64", "Random", "StableRNGs", "Test"]
+test = ["Base64", "Random", "StableRNGs", "SparseArrays", "Test"]

ext/ArrayLayoutsSparseArraysExt.jl

@@ -0,0 +1,23 @@
+module ArrayLayoutsSparseArraysExt
+
+using ArrayLayouts
+using ArrayLayouts: _copyto!
+using SparseArrays
+import LinearAlgebra
+
+import Base: copyto!
+
+# ambiguity from sparsematrix.jl
+copyto!(dest::LayoutMatrix, src::SparseArrays.AbstractSparseMatrixCSC) =
+	_copyto!(dest, src)
+
+copyto!(dest::SubArray{<:Any,2,<:LayoutMatrix}, src::SparseArrays.AbstractSparseMatrixCSC) =
+	_copyto!(dest, src)
+
+@inline LinearAlgebra.dot(a::LayoutArray{<:Number}, b::SparseArrays.SparseVectorUnion{<:Number}) =
+	ArrayLayouts.dot(a,b)
+
+@inline LinearAlgebra.dot(a::SparseArrays.SparseVectorUnion{<:Number}, b::LayoutArray{<:Number}) =
+	ArrayLayouts.dot(a,b)
+
+end

src/ArrayLayouts.jl

@@ -1,6 +1,6 @@
 module ArrayLayouts
 using Base: _typed_hcat
-using Base, Base.Broadcast, LinearAlgebra, FillArrays, SparseArrays
+using Base.Broadcast, LinearAlgebra, FillArrays
 using LinearAlgebra.BLAS
 
 using Base: AbstractCartesianIndex, OneTo, oneto, RangeIndex, ReinterpretArray, ReshapedArray,
@@ -275,9 +275,6 @@ copyto!(dest::AbstractMatrix, src::AdjOrTrans{<:Any,<:LayoutArray}) = _copyto!(d
 copyto!(dest::SubArray{<:Any,2,<:LayoutArray}, src::AdjOrTrans{<:Any,<:LayoutArray}) = _copyto!(dest, src)
 copyto!(dest::SubArray{<:Any,2,<:LayoutMatrix}, src::SubArray{<:Any,2,<:AdjOrTrans{<:Any,<:LayoutArray}}) = _copyto!(dest, src)
 copyto!(dest::AbstractMatrix, src::SubArray{<:Any,2,<:AdjOrTrans{<:Any,<:LayoutArray}}) = _copyto!(dest, src)
-# ambiguity from sparsematrix.jl
-copyto!(dest::LayoutMatrix, src::SparseArrays.AbstractSparseMatrixCSC) = _copyto!(dest, src)
-copyto!(dest::SubArray{<:Any,2,<:LayoutMatrix}, src::SparseArrays.AbstractSparseMatrixCSC) = _copyto!(dest, src)
 if isdefined(LinearAlgebra, :copymutable_oftype)
     LinearAlgebra.copymutable_oftype(A::Union{LayoutArray,Symmetric{<:Any,<:LayoutMatrix},Hermitian{<:Any,<:LayoutMatrix},
                                                                 UpperOrLowerTriangular{<:Any,<:LayoutMatrix},
@@ -417,4 +414,9 @@ Base.typed_vcat(::Type{T}, A::LayoutVecOrMats, B::LayoutVecOrMats, C::AbstractVe
 Base.typed_hcat(::Type{T}, A::LayoutVecOrMats, B::LayoutVecOrMats, C::AbstractVecOrMat...) where T = typed_hcat(T, A, B, C...)
 Base.typed_vcat(::Type{T}, A::AbstractVecOrMat, B::LayoutVecOrMats, C::AbstractVecOrMat...) where T = typed_vcat(T, A, B, C...)
 Base.typed_hcat(::Type{T}, A::AbstractVecOrMat, B::LayoutVecOrMats, C::AbstractVecOrMat...) where T = typed_hcat(T, A, B, C...)
+
+if !isdefined(Base, :get_extension)
+    include("../ext/ArrayLayoutsSparseArraysExt.jl")
+end
+
 end # module

src/mul.jl

@@ -362,8 +362,6 @@ dot(a, b) = materialize(Dot(a, b))
 @inline LinearAlgebra.dot(a::AbstractArray, b::LayoutArray) = dot(a,b)
 @inline LinearAlgebra.dot(a::LayoutVector, b::AbstractFill{<:Any,1}) = FillArrays._fill_dot_rev(a,b)
 @inline LinearAlgebra.dot(a::AbstractFill{<:Any,1}, b::LayoutVector) = FillArrays._fill_dot(a,b)
-@inline LinearAlgebra.dot(a::LayoutArray{<:Number}, b::SparseArrays.SparseVectorUnion{<:Number}) = dot(a,b)
-@inline LinearAlgebra.dot(a::SparseArrays.SparseVectorUnion{<:Number}, b::LayoutArray{<:Number}) = dot(a,b)
 
 @inline LinearAlgebra.dot(a::SubArray{<:Any,N,<:LayoutArray}, b::AbstractArray) where N = dot(a,b)
 @inline LinearAlgebra.dot(a::SubArray{<:Any,N,<:LayoutArray}, b::LayoutArray) where N = dot(a,b)

test/test_layoutarray.jl

@@ -480,6 +480,29 @@ MemoryLayout(::Type{MyVector}) = DenseColumnMajor()
         end
     end
 
+    @testset "sparse" begin
+        @testset "MyVector" begin
+            V = MyVector([1:4;])
+            V2 = MyVector(2*[1:4;])
+            S = 2*sparse(V)
+            copyto!(V, S)
+            @test S == V2
+            V = MyVector([1:4;])
+            copyto!(view(V, :), S)
+            @test S == V2
+        end
+        @testset "MyMatrix" begin
+            M = MyMatrix(reshape([1:4;], 2, 2))
+            M2 = MyMatrix(reshape(2*[1:4;], 2, 2))
+            S = 2*sparse(M)
+            copyto!(M, S)
+            @test S == M2
+            M = MyMatrix(reshape([1:4;], 2, 2))
+            copyto!(view(M, :, :), S)
+            @test S == M2
+        end
+    end
+
     @testset "mul! with subarrays" begin
             A = MyMatrix(randn(3,3))
             V = view(A, 1:3, 1:3)
@@ -500,6 +523,7 @@ MemoryLayout(::Type{MyVector}) = DenseColumnMajor()
             @test mul!(copy(B), A, V, 2.0, 3.0) ≈ 2A * A + 3B
             @test mul!(MyMatrix(copy(B)), A, V, 2.0, 3.0) ≈ 2A * A + 3B
             @test mul!(copy(x), V, x, 2.0, 3.0) ≈ 2A * x + 3x
+
     end
 end