Merge pull request #178 from numericalEFT/computgraph_pchou

add TaylorAD() in Utility and update README

.gitignore

@@ -72,7 +72,7 @@ __pycache__
 *.vscode
 
 # Temporarily unignore vscode settings
-!.vscode/
+.vscode/
 
 *.DS_Store
 *.pb.gz

example/benchmark.jl

@@ -20,7 +20,6 @@ function main()
     MaxLoopNum = 7
     Random.seed!(randseed)
 
-    # FeynGraphs = diagdict_parquet(:vertex4, partition)
     ver4df = Parquet.vertex4(para)
     diags = ver4df.diagram
     IR.optimize!(diags)

example/benchmark_GV.jl

@@ -20,9 +20,7 @@ function main()
     MaxLoopNum = 7
     Random.seed!(randseed)
 
-    # FeynGraphs = diagdict_parquet(:vertex4, partition)
-    # ver4df = Parquet.vertex4(para)
-    diags, extT, responses = GV.eachorder_ver4diag(4)
+    diags = GV.diagsGV_ver4(4)
 
     # diags = ver4df.diagram
     IR.optimize!(diags)

src/FeynmanDiagram.jl

@@ -24,6 +24,7 @@ export labelreset, parity
 
 export AbstractGraph, AbstractOperator
 export Graph, FeynmanGraph, FeynmanProperties
+export plot_tree
 
 export isequiv, drop_topology, is_external, is_internal, diagram_type, orders, vertices, topology
 export external_legs, external_indices, external_operators, external_labels
@@ -39,20 +40,20 @@ include("TaylorSeries/TaylorSeries.jl")
 using .Taylor
 export Taylor
 
-include("utility.jl")
-using .Utility
-export Utility
-export taylorexpansion!
-
 include("frontend/frontends.jl")
 using .FrontEnds
 export FrontEnds
-export LabelProduct
+export LabelProduct, leafstates
 export Filter, Wirreducible, Girreducible, NoBubble, NoHartree, NoFock, Proper, DirectOnly
 using .GV
-export GV, diagdictGV, diagdictGV_ver4, leafstates
+export GV
 using .Parquet
-export Parquet, diagdict_parquet, diagdict_parquet_extraAD
+export Parquet
+
+include("utility.jl")
+using .Utility
+export Utility
+export taylorAD
 
 include("backend/compiler.jl")
 using .Compilers

src/backend/compiler_python.jl

@@ -3,7 +3,7 @@
 """
     function to_pystatic(operator::Type, subgraphs::AbstractVector{<:AbstractGraph}, subgraph_factors::AbstractVector)
 
-Returns the static representation of a computational graph node `g` with operator `operator`, subgraphs `subgraphs`, and subgraph factors `subgraph_factors` in python.
+    Returns the static representation of a computational graph node `g` with operator `operator`, subgraphs `subgraphs`, and subgraph factors `subgraph_factors` in python.
 """
 function to_pystatic(operator::Type, subgraphs::AbstractVector{<:AbstractGraph}, subgraph_factors::AbstractVector)
     error(
@@ -65,11 +65,12 @@ end
 
 """
     function to_python_str(graphs::AbstractVector{<:AbstractGraph})
+
     Compile a list of graphs into a string for a python static function and output a python script which support the mindspore and jax framework.
 
-    # Arguments:
-    - `graphs`  vector of computational graphs
-    - `framework`  the type of the python frameworks, including `:jax` and `mindspore`.
+# Arguments:
+- `graphs`  vector of computational graphs
+- `framework`  the type of the python frameworks, including `:jax` and `mindspore`.
 """
 function to_python_str(graphs::AbstractVector{<:AbstractGraph}, framework::Symbol=:jax)
     if framework == :jax
@@ -121,13 +122,12 @@ function to_python_str(graphs::AbstractVector{<:AbstractGraph}, framework::Symbo
     end
     expr = head * body * tail
 
-    return expr, leafidx, gid_to_leafid
+    return expr, gid_to_leafid
 end
-function compile_python(graphs::AbstractVector{<:AbstractGraph}, framework::Symbol=:jax, filename::String="GraphFunc.py")
-    py_string, leafnum, leafmap = to_python_str(graphs, framework)
-    println("The number of leaves: $leafnum")
+function compile_Python(graphs::AbstractVector{<:AbstractGraph}, framework::Symbol=:jax, filename::String="GraphFunc.py")
+    py_string, leafmap = to_python_str(graphs, framework)
     open(filename, "w") do f
         write(f, py_string)
     end
-    return leafnum, leafmap
+    return leafmap
 end

src/computational_graph/ComputationalGraph.jl

@@ -42,7 +42,7 @@ export haschildren, onechild, isleaf, isbranch, ischain, has_zero_subfactors, el
 
 include("operation.jl")
 include("io.jl")
-# plot_tree
+export plot_tree
 
 include("eval.jl")
 export eval!

src/computational_graph/io.jl

@@ -40,16 +40,15 @@ end
 
 function _stringrep(graph::AbstractGraph, color=true)
     idstr = _idstring(graph)
-    # fstr = short(factor(graph), one(factor(graph)))
+    properties = graph.properties
     wstr = short(weight(graph))
     ostr = short_orders(orders(graph))
     # =$(node.weight*(2π)^(3*node.id.para.innerLoopNum))
 
-    if length(subgraphs(graph)) == 0
-        # return isempty(fstr) ? "$(idstr)$(ostr)=$wstr" : "$(idstr)⋅$(fstr)=$wstr"
-        return "$(idstr)$(ostr)=$wstr"
+    if isleaf(graph)
+        return isnothing(properties) ? "$(idstr)$(ostr)=$wstr" : "$(idstr)$(properties)$(ostr)=$wstr"
     else
-        return "$(idstr)$(ostr)=$wstr=$(operator(graph)) "
+        return isnothing(properties) ? "$(idstr)$(ostr)=$wstr=$(operator(graph)) " : "$(idstr)$(properties)$(ostr)=$wstr=$(operator(graph)) "
     end
 end
 
@@ -59,7 +58,7 @@ end
     Write a text representation of an AbstractGraph `graph` to the output stream `io`.
 """
 function Base.show(io::IO, graph::AbstractGraph; kwargs...)
-    if length(subgraphs(graph)) == 0
+    if isleaf(graph) == 0
         typestr = ""
     else
         typestr = join(["$(id(g))" for g in subgraphs(graph)], ",")