diff --git a/Project.toml b/Project.toml index eef88d1..79ae9d2 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "TensorAlgebra" uuid = "68bd88dc-f39d-4e12-b2ca-f046b68fcc6a" authors = ["ITensor developers and contributors"] -version = "0.3.15" +version = "0.3.16" [deps] ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" @@ -15,7 +15,7 @@ TypeParameterAccessors = "7e5a90cf-f82e-492e-a09b-e3e26432c138" [compat] ArrayLayouts = "1.10.4" -BlockArrays = "1.5.0" +BlockArrays = "1.7.2" EllipsisNotation = "1.8.0" LinearAlgebra = "1.10" MatrixAlgebraKit = "0.2, 0.3" diff --git a/test/test_blockarrays_contract.jl b/test/test_blockarrays_contract.jl index 7502441..224a102 100644 --- a/test/test_blockarrays_contract.jl +++ b/test/test_blockarrays_contract.jl @@ -25,8 +25,7 @@ const elts = (Float32, Float64, Complex{Float32}, Complex{Float64}) @testset "BlockedArray" begin # matrix matrix - @test_broken a_dest, dimnames_dest = contract(a1, (1, -1, 2, -2), a2, (2, -3, 1, -4)) - #= + a_dest, dimnames_dest = contract(a1, (1, -1, 2, -2), a2, (2, -3, 1, -4)) a_dest_dense, dimnames_dest_dense = contract( a1_dense, (1, -1, 2, -2), a2_dense, (2, -3, 1, -4) ) @@ -34,49 +33,38 @@ const elts = (Float32, Float64, Complex{Float32}, Complex{Float64}) @test size(a_dest) == size(a_dest_dense) @test a_dest isa BlockedArray{elt} @test a_dest ≈ a_dest_dense - =# # matrix vector - @test_broken a_dest, dimnames_dest = contract(a1, (2, -1, -2, 1), a3, (1, 2)) - #= + a_dest, dimnames_dest = contract(a1, (2, -1, -2, 1), a3, (1, 2)) a_dest_dense, dimnames_dest_dense = contract(a1_dense, (2, -1, -2, 1), a3_dense, (1, 2)) @test dimnames_dest == dimnames_dest_dense @test size(a_dest) == size(a_dest_dense) @test a_dest isa BlockedArray{elt} @test a_dest ≈ a_dest_dense - =# # vector matrix - @test_broken a_dest, dimnames_dest = contract(a3, (1, 2), a1, (2, -1, -2, 1)) - #= + a_dest, dimnames_dest = contract(a3, (1, 2), a1, (2, -1, -2, 1)) a_dest_dense, dimnames_dest_dense = contract(a3_dense, (1, 2), a1_dense, (2, -1, -2, 1)) @test dimnames_dest == dimnames_dest_dense @test size(a_dest) == size(a_dest_dense) @test a_dest isa BlockedArray{elt} @test a_dest ≈ a_dest_dense - =# # vector vector - # worse than broken: infinite recursion - @test_broken false - #= a_dest, dimnames_dest = contract(a3, (1, 2), a3, (2, 1)) a_dest_dense, dimnames_dest_dense = contract(a3_dense, (1, 2), a3_dense, (2, 1)) @test dimnames_dest == dimnames_dest_dense @test size(a_dest) == size(a_dest_dense) @test a_dest isa BlockedArray{elt,0} @test a_dest ≈ a_dest_dense - =# # outer product - @test_broken a_dest, dimnames_dest = contract(a3, (1, 2), a3, (3, 4)) - #= + a_dest, dimnames_dest = contract(a3, (1, 2), a3, (3, 4)) a_dest_dense, dimnames_dest_dense = contract(a3_dense, (1, 2), a3_dense, (3, 4)) @test dimnames_dest == dimnames_dest_dense @test size(a_dest) == size(a_dest_dense) @test a_dest isa BlockedArray{elt} @test a_dest ≈ a_dest_dense - =# end @testset "BlockArray" begin