[SparseArraysBase] Absorb SparseArrayDOKs (#1592)

* [SparseArraysBase] Absorb `SparseArrayDOKs` * [NDTensors] Bump to v0.3.71
ITensor · Nov 16, 2024 · 549e7f1 · 549e7f1 · mtfishman · Nov 16, 2024
1 parent 9ef8ae2
commit 549e7f1
Show file tree

Hide file tree

Showing 26 changed files with 24 additions and 30 deletions.
diff --git a/NDTensors/Project.toml b/NDTensors/Project.toml
@@ -1,7 +1,7 @@
 name = "NDTensors"
 uuid = "23ae76d9-e61a-49c4-8f12-3f1a16adf9cf"
 authors = ["Matthew Fishman <mfishman@flatironinstitute.org>"]
-version = "0.3.70"
+version = "0.3.71"
 
 [deps]
 Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"

diff --git a/NDTensors/src/backup/arraystorage/blocksparsearray/storage/contract.jl b/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:

diff --git a/NDTensors/src/imports.jl b/NDTensors/src/imports.jl
@@ -39,7 +39,6 @@ for lib in [
   :TensorAlgebra,
   :NestedPermutedDimsArrays,
   :SparseArraysBase,
-  :SparseArrayDOKs,
   :DiagonalArrays,
   :BlockSparseArrays,
   :NamedDimsArrays,

diff --git a/NDTensors/src/lib/AllocateData/test/runtests.jl b/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 = (

diff --git a/NDTensors/src/lib/BlockSparseArrays/src/BlockArraysExtensions/BlockArraysExtensions.jl b/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,...]`)")

diff --git a/NDTensors/src/lib/BlockSparseArrays/src/backup/qr.jl b/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.

diff --git a/NDTensors/src/lib/BlockSparseArrays/src/blocksparsearray/blocksparsearray.jl b/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

diff --git a/NDTensors/src/lib/BlockSparseArrays/src/blocksparsearray/defaults.jl b/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(

diff --git a/NDTensors/src/lib/BlockSparseArrays/test/test_basics.jl b/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")

diff --git a/NDTensors/src/lib/DiagonalArrays/src/diagonalarray/diagonalarray.jl b/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}}

diff --git a/NDTensors/src/lib/DiagonalArrays/test/runtests.jl b/NDTensors/src/lib/DiagonalArrays/test/runtests.jl
@@ -1,7 +1,7 @@
 @eval module $(gensym())
 using Test: @test, @testset, @test_broken
 using NDTensors.DiagonalArrays: DiagonalArrays, DiagonalArray, DiagonalMatrix, diaglength
-using NDTensors.SparseArrayDOKs: SparseArrayDOK
+using NDTensors.SparseArraysBase: SparseArrayDOK
 using NDTensors.SparseArraysBase: stored_length
 @testset "Test NDTensors.DiagonalArrays" begin
   @testset "README" begin

diff --git a/...NamedDimsArraysSparseArrayInterfaceExt.jl → ...est_NamedDimsArraysSparseArraysBaseExt.jl b/...NamedDimsArraysSparseArrayInterfaceExt.jl → ...est_NamedDimsArraysSparseArraysBaseExt.jl
diff --git a/NDTensors/src/lib/SparseArrayDOKs/.JuliaFormatter.toml b/NDTensors/src/lib/SparseArrayDOKs/.JuliaFormatter.toml
diff --git a/NDTensors/src/lib/SparseArrayDOKs/src/SparseArrayDOKs.jl b/NDTensors/src/lib/SparseArrayDOKs/src/SparseArrayDOKs.jl
diff --git a/NDTensors/src/lib/SparseArrayDOKs/test/Project.toml b/NDTensors/src/lib/SparseArrayDOKs/test/Project.toml
diff --git a/NDTensors/src/lib/SparseArraysBase/src/SparseArraysBase.jl b/NDTensors/src/lib/SparseArraysBase/src/SparseArraysBase.jl
@@ -28,4 +28,9 @@ include("abstractsparsearray/convert.jl")
 include("abstractsparsearray/cat.jl")
 include("abstractsparsearray/SparseArraysBaseSparseArraysExt.jl")
 include("abstractsparsearray/SparseArraysBaseLinearAlgebraExt.jl")
+include("sparsearraydok/defaults.jl")
+include("sparsearraydok/sparsearraydok.jl")
+include("sparsearraydok/sparsematrixdok.jl")
+include("sparsearraydok/sparsevectordok.jl")
+include("sparsearraydok/arraylayouts.jl")
 end
diff --git a/...c/lib/SparseArrayDOKs/src/arraylayouts.jl → ...ysBase/src/sparsearraydok/arraylayouts.jl b/...c/lib/SparseArrayDOKs/src/arraylayouts.jl → ...ysBase/src/sparsearraydok/arraylayouts.jl
diff --git a/...s/src/lib/SparseArrayDOKs/src/defaults.jl → ...ArraysBase/src/sparsearraydok/defaults.jl b/...s/src/lib/SparseArrayDOKs/src/defaults.jl → ...ArraysBase/src/sparsearraydok/defaults.jl
diff --git a/...lib/SparseArrayDOKs/src/sparsearraydok.jl → ...Base/src/sparsearraydok/sparsearraydok.jl b/...lib/SparseArrayDOKs/src/sparsearraydok.jl → ...Base/src/sparsearraydok/sparsearraydok.jl
diff --git a/...ib/SparseArrayDOKs/src/sparsematrixdok.jl → ...ase/src/sparsearraydok/sparsematrixdok.jl b/...ib/SparseArrayDOKs/src/sparsematrixdok.jl → ...ase/src/sparsearraydok/sparsematrixdok.jl
diff --git a/...ib/SparseArrayDOKs/src/sparsevectordok.jl → ...ase/src/sparsearraydok/sparsevectordok.jl b/...ib/SparseArrayDOKs/src/sparsevectordok.jl → ...ase/src/sparsearraydok/sparsevectordok.jl
diff --git a/NDTensors/src/lib/SparseArraysBase/test/Project.toml b/NDTensors/src/lib/SparseArraysBase/test/Project.toml
@@ -1,6 +1,7 @@
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
 Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
+Dictionaries = "85a47980-9c8c-11e8-2b9f-f7ca1fa99fb4"
 NDTensors = "23ae76d9-e61a-49c4-8f12-3f1a16adf9cf"
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
diff --git a/NDTensors/src/lib/SparseArraysBase/test/runtests.jl b/NDTensors/src/lib/SparseArraysBase/test/runtests.jl
@@ -1,5 +1,5 @@
 @eval module $(gensym())
-for filename in ["abstractsparsearray", "array", "diagonalarray"]
+for filename in ["sparsearraydok", "abstractsparsearray", "array", "diagonalarray"]
   include("test_$filename.jl")
 end
 end
diff --git a/.../src/lib/SparseArrayDOKs/test/runtests.jl → ...rseArraysBase/test/test_sparsearraydok.jl b/.../src/lib/SparseArrayDOKs/test/runtests.jl → ...rseArraysBase/test/test_sparsearraydok.jl
@@ -7,8 +7,8 @@
 
 using Dictionaries: Dictionary
 using Test: @test, @testset, @test_broken
-using NDTensors.SparseArrayDOKs:
-  SparseArrayDOKs, SparseArrayDOK, SparseMatrixDOK, @maybe_grow
+using NDTensors.SparseArraysBase:
+  SparseArraysBase, SparseArrayDOK, SparseMatrixDOK, @maybe_grow
 using NDTensors.SparseArraysBase: storage_indices, stored_length
 using SparseArrays: SparseMatrixCSC, nnz
 @testset "SparseArrayDOK (eltype=$elt)" for elt in
@@ -98,7 +98,7 @@ using SparseArrays: SparseMatrixCSC, nnz
   end
   @testset "Maybe Grow Feature" begin
     a = SparseArrayDOK{elt,2}((0, 0))
-    SparseArrayDOKs.setindex_maybe_grow!(a, 230, 2, 3)
+    SparseArraysBase.setindex_maybe_grow!(a, 230, 2, 3)
     @test size(a) == (2, 3)
     @test a[2, 3] == 230
     # Test @maybe_grow macro

diff --git a/NDTensors/test/Project.toml b/NDTensors/test/Project.toml
@@ -1,5 +1,6 @@
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
+ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
 BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
 Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"
 Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"

diff --git a/NDTensors/test/lib/runtests.jl b/NDTensors/test/lib/runtests.jl
@@ -18,7 +18,7 @@ using Test: @testset
   "NestedPermutedDimsArrays",
   "SmallVectors",
   "SortedSets",
-  "SparseArrayDOKs",
+  "SparseArraysBase",
   "SymmetrySectors",
   "TagSets",
   "TensorAlgebra",