Merge branch 'main' into BlockSparseArrays_gpu

ITensor · Nov 6, 2024 · 01d71eb · 01d71eb
2 parents cbd1a17 + c105287
commit 01d71eb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 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.53"
+version = "0.3.54"
 
 [deps]
 Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"

diff --git a/NDTensors/src/lib/BlockSparseArrays/ext/BlockSparseArraysGradedAxesExt/test/runtests.jl b/NDTensors/src/lib/BlockSparseArrays/ext/BlockSparseArraysGradedAxesExt/test/runtests.jl
@@ -15,6 +15,7 @@ using NDTensors.GradedAxes:
   isdual
 using NDTensors.LabelledNumbers: label
 using NDTensors.SparseArrayInterface: nstored
+using NDTensors.SymmetrySectors: U1
 using NDTensors.TensorAlgebra: fusedims, splitdims
 using LinearAlgebra: adjoint
 using Random: randn!
@@ -26,13 +27,6 @@ function blockdiagonal!(f, a::AbstractArray)
   return a
 end
 
-struct U1
-  n::Int
-end
-GradedAxes.dual(c::U1) = U1(-c.n)
-GradedAxes.fuse_labels(c1::U1, c2::U1) = U1(c1.n + c2.n)
-Base.isless(c1::U1, c2::U1) = isless(c1.n, c2.n)
-
 const elts = (Float32, Float64, Complex{Float32}, Complex{Float64})
 @testset "BlockSparseArraysGradedAxesExt (eltype=$elt)" for elt in elts
   @testset "map" begin
@@ -66,8 +60,7 @@ const elts = (Float32, Float64, Complex{Float32}, Complex{Float64})
       @test blocksize(b) == (2, 2, 2, 2)
       @test blocklengths.(axes(b)) == ([2, 2], [2, 2], [2, 2], [2, 2])
       @test nstored(b) == 256
-      # TODO: Fix this for `BlockedArray`.
-      @test_broken block_nstored(b) == 16
+      @test block_nstored(b) == 16
       for i in 1:ndims(a)
         @test axes(b, i) isa BlockedOneTo{Int}
       end

diff --git a/...sors/src/lib/BlockSparseArrays/src/blocksparsearrayinterface/blocksparsearrayinterface.jl b/...sors/src/lib/BlockSparseArrays/src/blocksparsearrayinterface/blocksparsearrayinterface.jl
@@ -305,5 +305,4 @@ function blocksparse_blocks(
 end
 
 using BlockArrays: BlocksView
-# TODO: Is this correct in general?
-SparseArrayInterface.nstored(a::BlocksView) = 1
+SparseArrayInterface.nstored(a::BlocksView) = length(a)
diff --git a/NDTensors/src/lib/BlockSparseArrays/test/test_basics.jl b/NDTensors/src/lib/BlockSparseArrays/test/test_basics.jl
@@ -15,7 +15,7 @@ using BlockArrays:
   blocksizes,
   mortar
 using Compat: @compat
-using LinearAlgebra: Adjoint, mul!
+using LinearAlgebra: Adjoint, mul!, norm
 using NDTensors.BlockSparseArrays:
   @view!,
   BlockSparseArray,
@@ -94,6 +94,9 @@ include("TestBlockSparseArraysUtils.jl")
         iszero(a[I])
       end
     end
+
+    a[3, 3] = NaN
+    @test isnan(norm(a))
   end
   @testset "Tensor algebra" begin
     a = BlockSparseArray{elt}(undef, ([2, 3], [3, 4]))

diff --git a/NDTensors/src/lib/SparseArrayInterface/src/sparsearrayinterface/map.jl b/NDTensors/src/lib/SparseArrayInterface/src/sparsearrayinterface/map.jl
@@ -115,6 +115,6 @@ end
 function sparse_mapreduce(f, op, a::AbstractArray; init=reduce_init(f, op, a), kwargs...)
   output = mapreduce(f, op, sparse_storage(a); init, kwargs...)
   f_notstored = apply_notstored(f, a)
-  @assert op(output, eltype(output)(f_notstored)) == output
+  @assert isequal(op(output, eltype(output)(f_notstored)), output)
   return output
 end