[SparseArraysBase] Absorb SparseArrayDOKs (#1592)

* [SparseArraysBase] Absorb `SparseArrayDOKs`

* [NDTensors] Bump to v0.3.71

Author: mtfishman

NDTensors/Project.toml

@@ -1,7 +1,7 @@
 name = "NDTensors"
 uuid = "23ae76d9-e61a-49c4-8f12-3f1a16adf9cf"
 authors = ["Matthew Fishman <[email protected]>"]
-version = "0.3.70"
+version = "0.3.71"
 
 [deps]
 Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"

NDTensors/src/backup/arraystorage/blocksparsearray/storage/contract.jl

@@ -1,5 +1,5 @@
 # TODO: Define in `SparseArraysBase`.
-using ..SparseArrayDOKs: SparseArrayDOK
+using ..SparseArraysBase: SparseArrayDOK
 
 # TODO: This is inefficient, need to optimize.
 # Look at `contract_labels`, `contract_blocks` and `maybe_contract_blocks!` in:

NDTensors/src/imports.jl

@@ -39,7 +39,6 @@ for lib in [
   :TensorAlgebra,
   :NestedPermutedDimsArrays,
   :SparseArraysBase,
-  :SparseArrayDOKs,
   :DiagonalArrays,
   :BlockSparseArrays,
   :NamedDimsArrays,

NDTensors/src/lib/AllocateData/test/runtests.jl

@@ -3,7 +3,7 @@ using NDTensors.AllocateData: AllocateData, allocate, allocate_zeros, zero_init
 using LinearAlgebra: Diagonal, Hermitian
 using NDTensors.DiagonalArrays: DiagonalArray
 using NDTensors.BlockSparseArrays: BlockSparseArray
-using NDTensors.SparseArrayDOKs: SparseArrayDOK
+using NDTensors.SparseArraysBase: SparseArrayDOK
 using Test: @test, @testset, @test_broken, @test_throws
 
 const arraytypes = (

NDTensors/src/lib/BlockSparseArrays/src/BlockArraysExtensions/BlockArraysExtensions.jl

@@ -581,7 +581,7 @@ function view!(a::AbstractArray{<:Any,N}, index::Vararg{BlockIndexRange{1},N}) w
 end
 
 using MacroTools: @capture
-using NDTensors.SparseArrayDOKs: is_getindex_expr
+using NDTensors.SparseArraysBase: is_getindex_expr
 macro view!(expr)
   if !is_getindex_expr(expr)
     error("@view must be used with getindex syntax (as `@view! a[i,j,...]`)")

NDTensors/src/lib/BlockSparseArrays/src/backup/qr.jl

@@ -1,4 +1,4 @@
-using ...SparseArrayDOKs: SparseArrayDOK
+using ...SparseArraysBase: SparseArrayDOK
 
 # Check if the matrix has 1 or fewer entries
 # per row/column.

NDTensors/src/lib/BlockSparseArrays/src/blocksparsearray/blocksparsearray.jl

@@ -1,6 +1,6 @@
 using BlockArrays: BlockArrays, Block, BlockedUnitRange, blockedrange, blocklength
 using Dictionaries: Dictionary
-using ..SparseArrayDOKs: SparseArrayDOK
+using ..SparseArraysBase: SparseArrayDOK
 
 # TODO: Delete this.
 ## using BlockArrays: blocks

NDTensors/src/lib/BlockSparseArrays/src/blocksparsearray/defaults.jl

@@ -1,6 +1,6 @@
 using BlockArrays: Block
 using Dictionaries: Dictionary
-using ..SparseArrayDOKs: SparseArrayDOK
+using ..SparseArraysBase: SparseArrayDOK
 
 # Construct the sparse structure storing the blocks
 function default_blockdata(

NDTensors/src/lib/BlockSparseArrays/test/test_basics.jl

@@ -31,7 +31,7 @@ using NDTensors.BlockSparseArrays:
   view!
 using NDTensors.GPUArraysCoreExtensions: cpu
 using NDTensors.SparseArraysBase: stored_length
-using NDTensors.SparseArrayDOKs: SparseArrayDOK, SparseMatrixDOK, SparseVectorDOK
+using NDTensors.SparseArraysBase: SparseArrayDOK, SparseMatrixDOK, SparseVectorDOK
 using NDTensors.TensorAlgebra: contract
 using Test: @test, @test_broken, @test_throws, @testset, @inferred
 include("TestBlockSparseArraysUtils.jl")

NDTensors/src/lib/DiagonalArrays/src/diagonalarray/diagonalarray.jl

@@ -1,6 +1,6 @@
 using ..SparseArraysBase: Zero, getindex_zero_function
-# TODO: Put into `DiagonalArraysSparseArrayDOKsExt`?
-using ..SparseArrayDOKs: SparseArrayDOKs, SparseArrayDOK
+# TODO: Put into `DiagonalArraysSparseArraysBaseExt`?
+using ..SparseArraysBase: SparseArraysBase, SparseArrayDOK
 
 struct DiagonalArray{T,N,Diag<:AbstractVector{T},Zero} <: AbstractDiagonalArray{T,N}
   diag::Diag
@@ -94,7 +94,7 @@ SparseArraysBase.sparse_storage(a::DiagonalArray) = a.diag
 # `SparseArraysBase`
 # Defines similar when the output can't be `DiagonalArray`,
 # such as in `reshape`.
-# TODO: Put into `DiagonalArraysSparseArrayDOKsExt`?
+# TODO: Put into `DiagonalArraysSparseArraysBaseExt`?
 # TODO: Special case 2D to output `SparseMatrixCSC`?
 function SparseArraysBase.sparse_similar(
   a::DiagonalArray, elt::Type, dims::Tuple{Vararg{Int}}