Skip to content

[NDTensors] UniformDiagBlockSparse norm #1622

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Feb 21, 2025
Merged

[NDTensors] UniformDiagBlockSparse norm #1622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11e5543
[NDTensors] Fix `norm` for UniformDiag
mtfishman Feb 21, 2025
d897f44
Tweak design
mtfishman Feb 21, 2025
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
2 changes: 1 addition & 1 deletion NDTensors/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "NDTensors"
uuid = "23ae76d9-e61a-49c4-8f12-3f1a16adf9cf"
authors = ["Matthew Fishman <[email protected]>"]
version = "0.4.2"
version = "0.4.3"

[deps]
Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"
Expand Down
10 changes: 8 additions & 2 deletions NDTensors/src/blocksparse/diagblocksparse.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using LinearAlgebra: LinearAlgebra
using TypeParameterAccessors: similartype

export DiagBlockSparse, DiagBlockSparseTensor
Expand Down Expand Up @@ -582,8 +583,13 @@ function _contract!!(
return R
end

# TODO: Improve this with FillArrays.jl
norm(S::UniformDiagBlockSparseTensor) = sqrt(mindim(S) * abs2(data(S)))
function LinearAlgebra.norm(D::UniformDiagBlockSparseTensor)
normD² = zero(eltype(D))
for b in nzblocks(D)
normD² += norm(D[b])^2
end
return √(abs(normD²))
end

function contraction_output(
T1::TensorT1, labelsT1, T2::TensorT2, labelsT2, labelsR
Expand Down
13 changes: 13 additions & 0 deletions NDTensors/test/test_diagblocksparse.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@eval module $(gensym())
using Dictionaries: Dictionary
using GPUArraysCore: @allowscalar
using LinearAlgebra: norm
using NDTensors:
NDTensors,
Block,
Expand Down Expand Up @@ -87,6 +88,18 @@ using .NDTensorsTestUtils: devices_list
contract(dense(A), (-1, -2), dense(t), (-1, -2))[]
end

@testset "UniformDiagBlockSparse norm" begin
elt = Float64
storage = DiagBlockSparse(one(elt), Dictionary([Block(1, 1), Block(2, 2)], [0, 2]))
tensor = Tensor(storage, ([2, 2], [2, 2]))
@test norm(tensor) ≈ norm(dense(tensor))

elt = Float64
storage = DiagBlockSparse(one(elt), Dictionary([Block(1, 1)], [0]))
tensor = Tensor(storage, ([2], [1, 1]))
@test norm(tensor) ≈ norm(dense(tensor))
end

@testset "DiagBlockSparse denseblocks" begin
elt = Float64
blockoffsets_a = Dictionary([Block(1, 1), Block(2, 2)], [0, 2])
Expand Down
Loading