Skip to content

Commit 5873db1

Browse files
authored
fix Blockarray test (#81)
1 parent a239a9c commit 5873db1

File tree

2 files changed

+6
-18
lines changed

2 files changed

+6
-18
lines changed

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "TensorAlgebra"
22
uuid = "68bd88dc-f39d-4e12-b2ca-f046b68fcc6a"
33
authors = ["ITensor developers <[email protected]> and contributors"]
4-
version = "0.3.15"
4+
version = "0.3.16"
55

66
[deps]
77
ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
@@ -15,7 +15,7 @@ TypeParameterAccessors = "7e5a90cf-f82e-492e-a09b-e3e26432c138"
1515

1616
[compat]
1717
ArrayLayouts = "1.10.4"
18-
BlockArrays = "1.5.0"
18+
BlockArrays = "1.7.2"
1919
EllipsisNotation = "1.8.0"
2020
LinearAlgebra = "1.10"
2121
MatrixAlgebraKit = "0.2, 0.3"

test/test_blockarrays_contract.jl

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,58 +25,46 @@ const elts = (Float32, Float64, Complex{Float32}, Complex{Float64})
2525

2626
@testset "BlockedArray" begin
2727
# matrix matrix
28-
@test_broken a_dest, dimnames_dest = contract(a1, (1, -1, 2, -2), a2, (2, -3, 1, -4))
29-
#=
28+
a_dest, dimnames_dest = contract(a1, (1, -1, 2, -2), a2, (2, -3, 1, -4))
3029
a_dest_dense, dimnames_dest_dense = contract(
3130
a1_dense, (1, -1, 2, -2), a2_dense, (2, -3, 1, -4)
3231
)
3332
@test dimnames_dest == dimnames_dest_dense
3433
@test size(a_dest) == size(a_dest_dense)
3534
@test a_dest isa BlockedArray{elt}
3635
@test a_dest a_dest_dense
37-
=#
3836

3937
# matrix vector
40-
@test_broken a_dest, dimnames_dest = contract(a1, (2, -1, -2, 1), a3, (1, 2))
41-
#=
38+
a_dest, dimnames_dest = contract(a1, (2, -1, -2, 1), a3, (1, 2))
4239
a_dest_dense, dimnames_dest_dense = contract(a1_dense, (2, -1, -2, 1), a3_dense, (1, 2))
4340
@test dimnames_dest == dimnames_dest_dense
4441
@test size(a_dest) == size(a_dest_dense)
4542
@test a_dest isa BlockedArray{elt}
4643
@test a_dest a_dest_dense
47-
=#
4844

4945
# vector matrix
50-
@test_broken a_dest, dimnames_dest = contract(a3, (1, 2), a1, (2, -1, -2, 1))
51-
#=
46+
a_dest, dimnames_dest = contract(a3, (1, 2), a1, (2, -1, -2, 1))
5247
a_dest_dense, dimnames_dest_dense = contract(a3_dense, (1, 2), a1_dense, (2, -1, -2, 1))
5348
@test dimnames_dest == dimnames_dest_dense
5449
@test size(a_dest) == size(a_dest_dense)
5550
@test a_dest isa BlockedArray{elt}
5651
@test a_dest a_dest_dense
57-
=#
5852

5953
# vector vector
60-
# worse than broken: infinite recursion
61-
@test_broken false
62-
#=
6354
a_dest, dimnames_dest = contract(a3, (1, 2), a3, (2, 1))
6455
a_dest_dense, dimnames_dest_dense = contract(a3_dense, (1, 2), a3_dense, (2, 1))
6556
@test dimnames_dest == dimnames_dest_dense
6657
@test size(a_dest) == size(a_dest_dense)
6758
@test a_dest isa BlockedArray{elt,0}
6859
@test a_dest a_dest_dense
69-
=#
7060

7161
# outer product
72-
@test_broken a_dest, dimnames_dest = contract(a3, (1, 2), a3, (3, 4))
73-
#=
62+
a_dest, dimnames_dest = contract(a3, (1, 2), a3, (3, 4))
7463
a_dest_dense, dimnames_dest_dense = contract(a3_dense, (1, 2), a3_dense, (3, 4))
7564
@test dimnames_dest == dimnames_dest_dense
7665
@test size(a_dest) == size(a_dest_dense)
7766
@test a_dest isa BlockedArray{elt}
7867
@test a_dest a_dest_dense
79-
=#
8068
end
8169

8270
@testset "BlockArray" begin

0 commit comments

Comments
 (0)