Upgrade to NamedGraphs v0.5, Datagraphs v0.2 (#159)

Author: mtfishman

Project.toml

@@ -1,7 +1,7 @@
 name = "ITensorNetworks"
 uuid = "2919e153-833c-4bdc-8836-1ea460a35fc7"
 authors = ["Matthew Fishman <mfishman@flatironinstitute.org> and contributors"]
-version = "0.8.2"
+version = "0.9.0"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
@@ -46,19 +46,19 @@ ITensorNetworksEinExprsExt = "EinExprs"
 AbstractTrees = "0.4.4"
 Combinatorics = "1"
 Compat = "3, 4"
-DataGraphs = "0.1.13"
+DataGraphs = "0.2.2"
 DataStructures = "0.18"
 Dictionaries = "0.4"
 Distributions = "0.25.86"
 DocStringExtensions = "0.8, 0.9"
 EinExprs = "0.6.4"
 Graphs = "1.8"
 GraphsFlows = "0.1.1"
-ITensors = "0.3.58"
+ITensors = "0.3.58, 0.4"
 IsApprox = "0.1"
 IterTools = "1.4.0"
 KrylovKit = "0.6, 0.7"
-NamedGraphs = "0.1.23"
+NamedGraphs = "0.5.1"
 NDTensors = "0.2, 0.3"
 Observers = "0.2"
 PackageExtensionCompat = "1"

README.md

@@ -32,15 +32,13 @@ julia> ] add ITensorNetworks
 Here are is an example of making a tensor network on a chain graph (a tensor train or matrix product state):
 
 ```julia
-julia> using Graphs: neighbors
+julia> using Graphs: neighbors, path_graph
 
-julia> using ITensorNetworks: ITensorNetwork, siteinds
+julia> using ITensorNetworks: ITensorNetwork
 
-julia> using NamedGraphs: named_grid, subgraph
-
-julia> tn = ITensorNetwork(named_grid(4); link_space=2)
+julia> tn = ITensorNetwork(path_graph(4); link_space=2)
 ITensorNetworks.ITensorNetwork{Int64} with 4 vertices:
-4-element Vector{Int64}:
+4-element Dictionaries.Indices{Int64}
  1
  2
  3
@@ -89,9 +87,13 @@ julia> neighbors(tn, 4)
 and here is a similar example for making a tensor network on a grid (a tensor product state or project entangled pair state (PEPS)):
 
 ```julia
+julia> using NamedGraphs.GraphsExtensions: subgraph
+
+julia> using NamedGraphs.NamedGraphGenerators: named_grid
+
 julia> tn = ITensorNetwork(named_grid((2, 2)); link_space=2)
 ITensorNetworks.ITensorNetwork{Tuple{Int64, Int64}} with 4 vertices:
-4-element Vector{Tuple{Int64, Int64}}:
+4-element Dictionaries.Indices{Tuple{Int64, Int64}}
  (1, 1)
  (2, 1)
  (1, 2)
@@ -126,7 +128,7 @@ julia> neighbors(tn, (1, 2))
 
 julia> tn_1 = subgraph(v -> v[1] == 1, tn)
 ITensorNetworks.ITensorNetwork{Tuple{Int64, Int64}} with 2 vertices:
-2-element Vector{Tuple{Int64, Int64}}:
+2-element Dictionaries.Indices{Tuple{Int64, Int64}}
  (1, 1)
  (1, 2)
 
@@ -140,7 +142,7 @@ with vertex data:
 
 julia> tn_2 = subgraph(v -> v[1] == 2, tn)
 ITensorNetworks.ITensorNetwork{Tuple{Int64, Int64}} with 2 vertices:
-2-element Vector{Tuple{Int64, Int64}}:
+2-element Dictionaries.Indices{Tuple{Int64, Int64}}
  (2, 1)
  (2, 2)
 
@@ -159,13 +161,13 @@ Networks can also be merged/unioned:
 ```julia
 julia> using ITensors: prime
 
-julia> using ITensorNetworks: ⊗, contract, contraction_sequence
+julia> using ITensorNetworks: ⊗, contract, contraction_sequence, siteinds
 
 julia> using ITensorUnicodePlots: @visualize
 
 julia> s = siteinds("S=1/2", named_grid(3))
 ITensorNetworks.IndsNetwork{Int64, ITensors.Index} with 3 vertices:
-3-element Vector{Int64}:
+3-element Dictionaries.Indices{Int64}
  1
  2
  3
@@ -185,7 +187,7 @@ and edge data:
 
 julia> tn1 = ITensorNetwork(s; link_space=2)
 ITensorNetworks.ITensorNetwork{Int64} with 3 vertices:
-3-element Vector{Int64}:
+3-element Dictionaries.Indices{Int64}
  1
  2
  3
@@ -202,7 +204,7 @@ with vertex data:
 
 julia> tn2 = ITensorNetwork(s; link_space=2)
 ITensorNetworks.ITensorNetwork{Int64} with 3 vertices:
-3-element Vector{Int64}:
+3-element Dictionaries.Indices{Int64}
  1
  2
  3
@@ -293,8 +295,8 @@ julia> @visualize Z;
 
 julia> contraction_sequence(Z)
 2-element Vector{Vector}:
- NamedGraphs.Key{Tuple{Int64, Int64}}[Key((1, 1)), Key((1, 2))]
- Any[Key((2, 1)), Any[Key((2, 2)), NamedGraphs.Key{Tuple{Int64, Int64}}[Key((3, 1)), Key((3, 2))]]]
+ NamedGraphs.Keys.Key{Tuple{Int64, Int64}}[Key((1, 1)), Key((1, 2))]
+ Any[Key((2, 1)), Any[Key((2, 2)), NamedGraphs.Keys.Key{Tuple{Int64, Int64}}[Key((3, 1)), Key((3, 2))]]]
 
 julia> Z̃ = contract(Z, (1, 1) => (2, 1));
 
@@ -303,20 +305,20 @@ julia> @visualize Z̃;
     ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
     ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
     ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
-    ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀Z̃(2, 1)⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
-    ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀(2)'⠤⠤⠔⠒⠒⠉⠉⠀⠀⢱⠀⠈⠉⠑⠒⠢⠤⢄⣀2⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
-    ⠀⠀⠀⠀⠀⠀⠀⣀⣀⠤⠤⠔⠒⠊⠉⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⡆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠒⠒⠤⠤⢄⣀⡀⠀⠀⠀⠀⠀ 
-    ⠀Z̃(3, 1)⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢱⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀Z̃(1, 2)⠀⠀ 
-    ⠀⠀⠀⠀⠀⢸⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⡆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⠔⠁⠀⠀⠀⠀⠀⠀⠀ 
-    ⠀⠀⠀⠀⠀⠀⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀2⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⠔⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
-    ⠀⠀⠀⠀⠀⠀⢸⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡇⠀⠀⠀⠀⠀⠀⠀⡠2⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
-    ⠀⠀⠀⠀⠀⠀⠀⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⠀⠀⠀⠀⠀⡠⠊⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
-    ⠀⠀⠀⠀⠀⠀⠀2⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡇⠀⢀⠤⠊⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
-    ⠀⠀⠀⠀⠀⠀⠀⠀⢇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀Z̃(2, 2)⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
-    ⠀⠀⠀⠀⠀⠀⠀⠀⠸⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⡠⠤⠒⠊⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
-    ⠀⠀⠀⠀⠀⠀⠀⠀⠀⢇⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⠤2⠒⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
-    ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠸⡀⠀⣀⡠⠤⠒⠊⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
-    ⠀⠀⠀⠀⠀⠀Z̃(3, 2)⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
+    ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀Z̃(3, 1)⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
+    ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⠔⠁⠀⠀⠀⠉⠉⠑⠒⠒⠢⠤⠤⣀⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
+    ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⠔⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈2⠉⠑⠒⠒⠤⠤⠤⣀⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
+    ⠀⠀⠀⠀⠀⠀⠀⠀⠀(2)'⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀Z̃(3, 2)⠀⠀ 
+    ⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⠔⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⠤⠊⠀⠀⠀⠀⠀⠀⠀ 
+    ⠀⠀⠀⠀⠀⠀⠀⢀⠔⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡠⠒⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
+    ⠀⠀⠀⠀⠀⢀⠔⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀2⠊⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
+    ⠀Z̃(2, 1)⠤⠤⣀⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡠⠊⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
+    ⠀⠀⠀⠀⠀⢣⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠑⠒2⠢⠤⠤⣀⣀⡀⠀⠀⠀⠀⠀⠀⠀⣀⠔⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
+    ⠀⠀⠀⠀⠀⢸⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉Z̃(2, 2)⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
+    ⠀⠀⠀⠀⠀2⡄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⠤⠤⠒⠊⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
+    ⠀⠀⠀⠀⠀⠀⡇⠀⠀⠀⠀⠀⠀⠀⠀⣀⡠⠤2⠒⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
+    ⠀⠀⠀⠀⠀⠀⢱⠀⢀⣀⠤⠔⠒⠊⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
+    ⠀⠀Z̃(1, 2)⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
     ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
     ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
     ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
@@ -328,7 +330,7 @@ julia> @visualize Z̃;
 
 
 
-This file was generated with [weave.jl](https://github.com/JunoLab/Weave.jl) with the following commands:
+This file was generated with [Weave.jl](https://github.com/JunoLab/Weave.jl) with the following commands:
 
 ```julia
 using ITensorNetworks: ITensorNetworks

examples/README.jl

@@ -32,10 +32,9 @@ Random.seed!(ITensors.index_id_rng(), 1234);
 #' Here are is an example of making a tensor network on a chain graph (a tensor train or matrix product state):
 #+ term=true
 
-using Graphs: neighbors
-using ITensorNetworks: ITensorNetwork, siteinds
-using NamedGraphs: named_grid, subgraph
-tn = ITensorNetwork(named_grid(4); link_space=2)
+using Graphs: neighbors, path_graph
+using ITensorNetworks: ITensorNetwork
+tn = ITensorNetwork(path_graph(4); link_space=2)
 tn[1]
 tn[2]
 neighbors(tn, 1)
@@ -46,6 +45,8 @@ neighbors(tn, 4)
 #' and here is a similar example for making a tensor network on a grid (a tensor product state or project entangled pair state (PEPS)):
 #+ term=true
 
+using NamedGraphs.GraphsExtensions: subgraph
+using NamedGraphs.NamedGraphGenerators: named_grid
 tn = ITensorNetwork(named_grid((2, 2)); link_space=2)
 tn[1, 1]
 neighbors(tn, (1, 1))
@@ -57,7 +58,7 @@ tn_2 = subgraph(v -> v[1] == 2, tn)
 #+ term=true
 
 using ITensors: prime
-using ITensorNetworks: ⊗, contract, contraction_sequence
+using ITensorNetworks: ⊗, contract, contraction_sequence, siteinds
 using ITensorUnicodePlots: @visualize
 s = siteinds("S=1/2", named_grid(3))
 tn1 = ITensorNetwork(s; link_space=2)
@@ -72,7 +73,7 @@ Z̃ = contract(Z, (1, 1) => (2, 1));
 
 #' ## Generating this README
 
-#' This file was generated with [weave.jl](https://github.com/JunoLab/Weave.jl) with the following commands:
+#' This file was generated with [Weave.jl](https://github.com/JunoLab/Weave.jl) with the following commands:
 #+ eval=false
 
 using ITensorNetworks: ITensorNetworks

src/Graphs/abstractdatagraph.jl

@@ -1,11 +1,9 @@
 module ITensorNetworks
-include("usings.jl")
-include("Graphs/abstractgraph.jl")
-include("Graphs/abstractdatagraph.jl")
+include("lib/BaseExtensions/src/BaseExtensions.jl")
+include("lib/ITensorsExtensions/src/ITensorsExtensions.jl")
 include("observers.jl")
 include("visualize.jl")
 include("graphs.jl")
-include("itensors.jl")
 include("abstractindsnetwork.jl")
 include("indextags.jl")
 include("indsnetwork.jl")
@@ -15,16 +13,15 @@ include("abstractitensornetwork.jl")
 include("contraction_sequences.jl")
 include("tebd.jl")
 include("itensornetwork.jl")
-include("mincut.jl")
-include("contract_deltas.jl")
-include("approx_itensornetwork/utils.jl")
-include("approx_itensornetwork/density_matrix.jl")
-include("approx_itensornetwork/ttn_svd.jl")
-include("approx_itensornetwork/approx_itensornetwork.jl")
-include("approx_itensornetwork/partition.jl")
-include("approx_itensornetwork/binary_tree_partition.jl")
+include("contract_approx/mincut.jl")
+include("contract_approx/contract_deltas.jl")
+include("contract_approx/utils.jl")
+include("contract_approx/density_matrix.jl")
+include("contract_approx/ttn_svd.jl")
+include("contract_approx/contract_approx.jl")
+include("contract_approx/partition.jl")
+include("contract_approx/binary_tree_partition.jl")
 include("contract.jl")
-include("utility.jl")
 include("specialitensornetworks.jl")
 include("boundarymps.jl")
 include("partitioneditensornetwork.jl")
@@ -36,14 +33,13 @@ include("caches/beliefpropagationcache.jl")
 include("contraction_tree_to_graph.jl")
 include("gauging.jl")
 include("utils.jl")
-include("ITensorsExtensions/ITensorsExtensions.jl")
 include("solvers/local_solvers/eigsolve.jl")
 include("solvers/local_solvers/exponentiate.jl")
 include("solvers/local_solvers/dmrg_x.jl")
 include("solvers/local_solvers/contract.jl")
 include("solvers/local_solvers/linsolve.jl")
 include("treetensornetworks/abstracttreetensornetwork.jl")
-include("treetensornetworks/ttn.jl")
+include("treetensornetworks/treetensornetwork.jl")
 include("treetensornetworks/opsum_to_ttn.jl")
 include("treetensornetworks/projttns/abstractprojttn.jl")
 include("treetensornetworks/projttns/projttn.jl")
@@ -66,8 +62,8 @@ include("inner.jl")
 include("expect.jl")
 include("environment.jl")
 include("exports.jl")
-include("ModelHamiltonians/ModelHamiltonians.jl")
-include("ModelNetworks/ModelNetworks.jl")
+include("lib/ModelHamiltonians/src/ModelHamiltonians.jl")
+include("lib/ModelNetworks/src/ModelNetworks.jl")
 
 using PackageExtensionCompat: @require_extensions
 using Requires: @require