Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BlockSparseArrays] Use new SparseArrayDOK type in BlockSparseArrays #1272

Merged
merged 34 commits into from
Dec 2, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
6401807
[NDTensors] Start SparseArrayDOKs module
mtfishman Nov 25, 2023
9e4142c
Reorganization
mtfishman Nov 26, 2023
0677dfa
Format
mtfishman Nov 26, 2023
995c3f9
Start making SparseArrayInterface module, to be used by SparseArrayDO…
mtfishman Nov 28, 2023
b696a7e
Update interface
mtfishman Nov 28, 2023
e984cbe
Add another test
mtfishman Nov 28, 2023
475ee31
Improved map
mtfishman Nov 28, 2023
36961f8
New SparseArrayDOKs using SparseArrayInterface
mtfishman Nov 28, 2023
25f8229
Fix namespace issues
mtfishman Nov 29, 2023
3b3c50d
One more namespace issue
mtfishman Nov 29, 2023
a20e819
More namespace issues
mtfishman Nov 29, 2023
d571bd9
Julia 1.6 backwards compatibility
mtfishman Nov 29, 2023
410df32
Use SparseArrayInterface in DiagonalArrays
mtfishman Nov 29, 2023
41c9816
Format
mtfishman Nov 29, 2023
420692a
Fix loading issue
mtfishman Nov 29, 2023
c6dcefe
Missing include, improve README
mtfishman Nov 29, 2023
2478166
[BlockSparseArrays] Start using SparseArrayDOK
mtfishman Nov 29, 2023
43929be
Small fixes
mtfishman Nov 30, 2023
f70a520
Merge branch 'main' into NDTensors_new_BlockSparseArrays
mtfishman Nov 30, 2023
41b92b8
Change SparseArray to SparseArrayDOK
mtfishman Nov 30, 2023
af5ff02
Format
mtfishman Nov 30, 2023
a1733f6
Temporarily remove broken tests
mtfishman Nov 30, 2023
1be1d00
Introduct AbstractSparseArray, start rewriting BlockSparseArray
mtfishman Dec 1, 2023
97f3df4
Move AbstractSparseArray to SparseArrayInterface
mtfishman Dec 1, 2023
32d375a
Improve testing and organization
mtfishman Dec 1, 2023
0ea3eee
DiagonalArrays reorganization and simplification
mtfishman Dec 1, 2023
f918aee
Get more BlockSparseArrays tests passing
mtfishman Dec 1, 2023
fc0ff14
Move arraytensor code to backup files
mtfishman Dec 1, 2023
8487d0c
Move arraystorage code to backup files
mtfishman Dec 1, 2023
fc9ff82
Try fixing tests
mtfishman Dec 1, 2023
b5b643d
Comment
mtfishman Dec 1, 2023
796f33d
Merge main
mtfishman Dec 1, 2023
4d1453d
Fix namespace issue
mtfishman Dec 1, 2023
1f04d9c
Remove arraytensor test
mtfishman Dec 1, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Try fixing tests
  • Loading branch information
mtfishman committed Dec 1, 2023
commit fc9ff82fcf74ac04a181204859da0e06a82eb285
2 changes: 2 additions & 0 deletions NDTensors/src/diag/diagtensor.jl
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
using .DiagonalArrays: diaglength

const DiagTensor{ElT,N,StoreT,IndsT} = Tensor{ElT,N,StoreT,IndsT} where {StoreT<:Diag}
const NonuniformDiagTensor{ElT,N,StoreT,IndsT} =
Tensor{ElT,N,StoreT,IndsT} where {StoreT<:NonuniformDiag}
Expand Down
2 changes: 1 addition & 1 deletion NDTensors/src/lib/GradedAxes/test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@eval module $(gensym())
using NDTensors.BlockArrays: Block, blocklength, blocklengths, findblock
using BlockArrays: Block, blocklength, blocklengths, findblock
using NDTensors.GradedAxes:
GradedAxes,
blockmerge,
Expand Down
10 changes: 5 additions & 5 deletions src/ITensorsNamedDimsArraysExt/src/to_nameddimsarray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ function to_nameddimsarray(x::BlockSparseTensor)
return named(arraystorage, name.(inds(x)))
end

using ..NDTensors: CombinerTensor, CombinerArray, storage
# TODO: Delete when we directly use `CombinerArray` as storage.
function to_nameddimsarray(t::CombinerTensor)
return named(CombinerArray(storage(t), to_axes(inds(t))), name.(inds(t)))
end
## using ..NDTensors: CombinerTensor, CombinerArray, storage
## # TODO: Delete when we directly use `CombinerArray` as storage.
## function to_nameddimsarray(t::CombinerTensor)
## return named(CombinerArray(storage(t), to_axes(inds(t))), name.(inds(t)))
## end

to_nameddimsarray(t::ITensor) = ITensor(to_nameddimsarray(t.tensor))

Expand Down
Loading