Skip to content

Commit 1e27c21

Browse files
committed
Merge main
2 parents 05731d4 + 8a2abce commit 1e27c21

File tree

11 files changed

+37
-45
lines changed

11 files changed

+37
-45
lines changed

NDTensors/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "NDTensors"
22
uuid = "23ae76d9-e61a-49c4-8f12-3f1a16adf9cf"
33
authors = ["Matthew Fishman <[email protected]>"]
4-
version = "0.3.46"
4+
version = "0.3.47"
55

66
[deps]
77
Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"

NDTensors/test/ITensors/TestITensorDMRG/Project.toml

Lines changed: 0 additions & 6 deletions
This file was deleted.

NDTensors/test/ITensors/TestITensorDMRG/TestITensorDMRG.jl

Lines changed: 0 additions & 20 deletions
This file was deleted.

NDTensors/test/Project.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Dictionaries = "85a47980-9c8c-11e8-2b9f-f7ca1fa99fb4"
77
EllipsisNotation = "da5c29d0-fa7d-589e-88eb-ea29b0a81949"
88
FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
99
GPUArraysCore = "46192b85-c4d5-4398-a991-12ede77f4527"
10-
ITensors = "9136182c-28ba-11e9-034c-db9fb085ebd5"
1110
JLArrays = "27aeb0d3-9eb9-45fb-866b-73c2ecf80fcb"
1211
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1312
MappedArrays = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900"

NDTensors/test/ext/runtests.jl

Lines changed: 0 additions & 12 deletions
This file was deleted.

NDTensors/test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ using SafeTestsets: @safetestset
77
filenames = filter(readdir(@__DIR__)) do file
88
return startswith("test_")(file) && endswith(".jl")(file)
99
end
10-
for dir in ["lib", "ext"]
10+
for dir in ["lib"]
1111
push!(filenames, joinpath(dir, "runtests.jl"))
1212
end
1313
@testset "Test $(@__DIR__)/$filename" for filename in filenames

NDTensors/test/test_combiner.jl

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,40 @@
11
@eval module $(gensym())
2-
using NDTensors
3-
using Test: @testset, @test, @test_throws
42
using GPUArraysCore: @allowscalar
3+
using NDTensors:
4+
NDTensors,
5+
Block,
6+
BlockOffsets,
7+
BlockSparse,
8+
BlockSparseTensor,
9+
Combiner,
10+
Dense,
11+
DenseTensor,
12+
contract,
13+
dim,
14+
dims,
15+
tensor
516
include("NDTensorsTestUtils/NDTensorsTestUtils.jl")
617
using .NDTensorsTestUtils: devices_list, is_supported_eltype
18+
using Test: @testset, @test, @test_throws
719

820
# Testing generic block indices
9-
using ITensors: QN, Index
21+
struct Index{Space}
22+
space::Space
23+
end
24+
NDTensors.dim(i::Index) = sum(b -> last(b), i.space)
25+
NDTensors.nblocks(i::Index) = length(i.space)
26+
NDTensors.blockdim(i::Index, block::Integer) = last(i.space[block])
27+
function NDTensors.outer(i1::Index, i2::Index)
28+
return Index(vec(
29+
map(Iterators.product(i1.space, i2.space)) do (b1, b2)
30+
return first(b1) + first(b2) => last(b1) * last(b2)
31+
end,
32+
))
33+
end
34+
NDTensors.permuteblocks(i::Index, perm::Vector{Int}) = Index(i.space[perm])
35+
36+
struct QN end
37+
Base.:+(q1::QN, q2::QN) = QN()
1038

1139
@testset "CombinerTensor basic functionality" begin
1240
@testset "test device: $dev, eltype: $elt" for dev in devices_list(copy(ARGS)),

test/Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ITensors = "9136182c-28ba-11e9-034c-db9fb085ebd5"
99
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
1010
KrylovKit = "0b1a1467-8014-51b9-945f-bf0ae24f4b77"
1111
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
12+
MappedArrays = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900"
1213
NDTensors = "23ae76d9-e61a-49c4-8f12-3f1a16adf9cf"
1314
OptimKit = "77e91f04-9b3b-57a6-a776-40b61faaebe0"
1415
PackageCompiler = "9b87118b-4619-50d2-8e1e-99f35a4d4d9d"
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[deps]
22
ITensors = "9136182c-28ba-11e9-034c-db9fb085ebd5"
3+
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
34
MappedArrays = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900"
4-
NDTensors = "23ae76d9-e61a-49c4-8f12-3f1a16adf9cf"
5+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

0 commit comments

Comments
 (0)