Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
name = "GradedArrays"
uuid = "bc96ca6e-b7c8-4bb6-888e-c93f838762c2"
authors = ["ITensor developers <[email protected]> and contributors"]
version = "0.4.19"
version = "0.4.20"

[deps]
ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
BlockSparseArrays = "2c9a651f-6452-4ace-a6ac-809f4280fbb4"
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
Expand All @@ -23,6 +24,7 @@ TensorAlgebra = "68bd88dc-f39d-4e12-b2ca-f046b68fcc6a"
GradedArraysTensorAlgebraExt = "TensorAlgebra"

[compat]
ArrayLayouts = "1"
BlockArrays = "1.6"
BlockSparseArrays = "0.8, 0.9.3"
Compat = "4.16"
Expand Down
9 changes: 9 additions & 0 deletions src/gradedarray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ using BlockSparseArrays:
sparsemortar
using LinearAlgebra: Adjoint
using TypeParameterAccessors: similartype, unwrap_array_type
using ArrayLayouts: ArrayLayouts

const GradedArray{T,N,A<:AbstractArray{T,N},Blocks<:AbstractArray{A,N},Axes<:Tuple{AbstractGradedUnitRange{<:Integer},Vararg{AbstractGradedUnitRange{<:Integer}}}} = BlockSparseArray{
T,N,A,Blocks,Axes
Expand Down Expand Up @@ -236,3 +237,11 @@ function Base.showarg(io::IO, a::GradedArray, toplevel::Bool)
print(io, concretetype_to_string_truncated(typeof(a); param_truncation_length=40))
return nothing
end

const AnyGradedMatrix{T} = Union{GradedMatrix{T},Adjoint{T,<:GradedMatrix{T}}}

function ArrayLayouts._check_mul_axes(A::AnyGradedMatrix, B::AnyGradedMatrix)
axA = axes(A, 2)
axB = axes(B, 1)
return space_isequal(dual(axA), axB) || ArrayLayouts.throw_mul_axes_err(axA, axB)
end
24 changes: 14 additions & 10 deletions test/test_factorizations.jl
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,13 @@ end
a = zeros(elt, r1, dual(r2))
a[Block(1, 2)] = randn(elt, blocksizes(a)[1, 2])
@test flux(a) == U1(-1)
q, r = left_polar(a)
@test q * r a
@test Array(q'q) I
@test_broken flux(q) == trivial(flux(a))
@test_broken flux(r) == flux(a)

# tests broken for nonzero flux
# q, r = left_polar(a)
# @test q * r ≈ a
# @test Array(q'q) ≈ I
# @test_broken flux(q) == trivial(flux(a))
# @test_broken flux(r) == flux(a)
end

@testset "lq_compact, right_orth (eltype=$elt)" for elt in elts
Expand Down Expand Up @@ -273,9 +275,11 @@ end
a = zeros(elt, r1, dual(r2))
a[Block(1, 2)] = randn(elt, blocksizes(a)[1, 2])
@test flux(a) == U1(-1)
l, q = right_polar(a)
@test l * q a
@test Array(q * q') I
@test_broken flux(l) == flux(a)
@test_broken flux(q) == trivial(flux(a))

# tests broken for nonzero flux
# l, q = right_polar(a)
# @test l * q ≈ a
# @test Array(q * q') ≈ I
# @test_broken flux(l) == flux(a)
# @test_broken flux(q) == trivial(flux(a))
end
8 changes: 3 additions & 5 deletions test/test_gradedarray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ using GradedArrays:
using SparseArraysBase: storedlength
using LinearAlgebra: adjoint
using Random: randn!
using Test: @test, @testset
using Test: @test, @testset, @test_throws

function randn_blockdiagonal(elt::Type, axes::Tuple)
a = BlockSparseArray{elt}(undef, axes)
Expand Down Expand Up @@ -387,12 +387,10 @@ const elts = (Float32, Float64, Complex{Float32}, Complex{Float64})
a2[Block(2, 1)] = randn(elt, size(@view(a2[Block(2, 1)])))
@test Array(a1 * a2) Array(a1) * Array(a2)
@test Array(a1' * a2') Array(a1') * Array(a2')

a2 = BlockSparseArray{elt}(undef, r, dual(r))
a2[Block(1, 2)] = randn(elt, size(@view(a2[Block(1, 2)])))
a2[Block(2, 1)] = randn(elt, size(@view(a2[Block(2, 1)])))
@test Array(a1' * a2) Array(a1') * Array(a2)
@test Array(a1 * a2') Array(a1) * Array(a2')

@test_throws DimensionMismatch a1 * permutedims(a2, (2, 1))
end
@testset "Construct from dense" begin
r = gradedrange([U1(0) => 2, U1(1) => 3])
Expand Down
Loading