Preserve unstored in copy and similar

Author: mtfishman

src/abstractsparsearray.jl

@@ -11,6 +11,38 @@ function DerivableInterfaces.interface(::Type{<:AbstractSparseArray})
   return SparseArrayInterface()
 end
 
+function Base.copy(a::AnyAbstractSparseArray)
+  return copyto!(similar(a), a)
+end
+
+function Base.similar(a::AnyAbstractSparseArray)
+  return SparseArrayDOK(Unstored(unstored(a)))
+end
+function Base.similar(a::AnyAbstractSparseArray, T::Type)
+  return SparseArrayDOK(Unstored(unstoredsimilar(unstored(a), T)))
+end
+function Base.similar(a::AnyAbstractSparseArray, ax::Tuple)
+  return similar(a, eltype(a), ax)
+end
+function Base.similar(a::AnyAbstractSparseArray, T::Type, ax::Tuple)
+  return similar_sparsearray(a, T, ax)
+end
+# Fix ambiguity error.
+function Base.similar(a::AnyAbstractSparseArray, T::Type, ax::Tuple{Int,Vararg{Int}})
+  return similar_sparsearray(a, T, ax)
+end
+# Fix ambiguity error.
+function Base.similar(
+  a::AnyAbstractSparseArray,
+  T::Type,
+  ax::Tuple{Union{Integer,Base.OneTo},Vararg{Union{Integer,Base.OneTo}}},
+)
+  return similar_sparsearray(a, T, ax)
+end
+function similar_sparsearray(a::AnyAbstractSparseArray, T::Type, ax::Tuple)
+  return SparseArrayDOK(Unstored(unstoredsimilar(unstored(a), T, ax)))
+end
+
 using DerivableInterfaces: @derive
 
 # TODO: These need to be loaded since `AbstractArrayOps`
@@ -25,9 +57,6 @@ using LinearAlgebra: LinearAlgebra
   Base.getindex(::T, ::Int...)
   Base.setindex!(::T, ::Any, ::Any...)
   Base.setindex!(::T, ::Any, ::Int...)
-  Base.similar(::T, ::Type, ::Tuple{Vararg{Int}})
-  Base.similar(::T, ::Type, ::Tuple{Base.OneTo,Vararg{Base.OneTo}})
-  Base.copy(::T)
   Base.copy!(::AbstractArray, ::T)
   Base.copyto!(::AbstractArray, ::T)
   Base.map(::Any, ::T...)

src/abstractsparsearrayinterface.jl

@@ -26,15 +26,13 @@ unstored(a::AbstractArray) = Zeros{eltype(a)}(axes(a))
 function unstoredsimilar(a::AbstractArray, T::Type, ax::Tuple)
   return Zeros{T}(ax)
 end
-function unstoredsimilar(a::AbstractArray, T::Type)
-  return unstoredsimilar(a, T, axes(a))
-end
 function unstoredsimilar(a::AbstractArray, ax::Tuple)
   return unstoredsimilar(a, eltype(a), ax)
 end
-function unstoredsimilar(a::AbstractArray)
-  return unstoredsimilar(a, eltype(a), axes(a))
+function unstoredsimilar(a::AbstractArray, T::Type)
+  return AbstractArray{T}(a)
 end
+unstoredsimilar(a::AbstractArray) = a
 
 # Generic functionality for converting to a
 # dense array, trying to preserve information
@@ -104,23 +102,6 @@ Base.size(a::StoredValues) = size(a.storedindices)
   return setindex!(a.array, value, a.storedindices[I])
 end
 
-@interface ::AbstractSparseArrayInterface function Base.similar(
-  a::AbstractArray, T::Type, ax::Tuple
-)
-  return SparseArrayDOK(Unstored(unstoredsimilar(unstored(a), T, ax)))
-end
-# Fix ambiguity error with DerivableInterfaces.jl.
-@interface ::AbstractSparseArrayInterface function Base.similar(
-  a::AbstractArray, T::Type, ax::Tuple{Int,Vararg{Int}}
-)
-  return SparseArrayDOK(Unstored(unstoredsimilar(unstored(a), T, ax)))
-end
-# Fix ambiguity error with DerivableInterfaces.jl.
-@interface ::AbstractSparseArrayInterface function Base.similar(
-  a::AbstractArray, T::Type, ax::Tuple{Base.OneTo,Vararg{Base.OneTo}}
-)
-  return SparseArrayDOK(Unstored(unstoredsimilar(unstored(a), T, ax)))
-end
 using DerivableInterfaces: DerivableInterfaces, zero!
 
 # `zero!` isn't defined in `Base`, but it is defined in `ArrayLayouts`