remove global static Graph instance.

Oceania2018 · Oceania2018 · commit c4a585c320c2 · 2019-06-03T23:19:22.000-05:00
diff --git a/src/TensorFlowNET.Core/Graphs/DefaultGraphStack.cs b/src/TensorFlowNET.Core/Graphs/DefaultGraphStack.cs
@@ -0,0 +1,40 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Tensorflow
+{
+    public class DefaultGraphStack
+    {
+        List<StackModel> stack = new List<StackModel>();
+
+        public void set_controller(Graph @default)
+        {
+            if (!stack.Exists(x => x.Graph == @default))
+                stack.Add(new StackModel { Graph = @default, IsDefault = true });
+
+            foreach (var s in stack)
+                s.IsDefault = s.Graph == @default;
+        }
+
+        public Graph get_controller()
+        {
+            if (stack.Count == 0)
+                stack.Add(new StackModel { Graph = tf.Graph(), IsDefault = true });
+
+            return stack.First(x => x.IsDefault).Graph;
+        }
+
+        public void reset()
+        {
+            stack.Clear();
+        }
+    }
+
+    public class StackModel
+    {
+        public Graph Graph { get; set; }
+        public bool IsDefault { get; set; }
+    }
+}
diff --git a/src/TensorFlowNET.Core/Graphs/Graph.cs b/src/TensorFlowNET.Core/Graphs/Graph.cs
@@ -87,7 +87,7 @@ public partial class Graph : IPython, IDisposable
         private Dictionary<string, object> _collections = new Dictionary<string, object>();
 
         public bool building_function;
-
+        
         public Graph()
         {
             _handle = c_api.TF_NewGraph();
@@ -113,7 +113,14 @@ public ITensorOrOperation as_graph_element(object obj, bool allow_tensor = true,
             return _as_graph_element_locked(obj, allow_tensor, allow_operation);
         }
 
-        public Graph as_default() => ops.set_default_graph(this);
+        /// <summary>
+        /// Returns a context manager that makes this `Graph` the default graph.
+        /// </summary>
+        /// <returns></returns>
+        public Graph as_default()
+        {
+            return ops.set_default_graph(this);
+        }
 
         private Tensor _as_graph_element(object obj)
         {
diff --git a/src/TensorFlowNET.Core/Layers/Layer.cs b/src/TensorFlowNET.Core/Layers/Layer.cs
@@ -172,13 +172,12 @@ private void _set_scope(VariableScope scope = null)
                 }
                 else
                 {
-                    with(tf.variable_scope(scope, default_name: _base_name),
-                        captured_scope =>
-                        {
-                            _scope = captured_scope;
-                        });
+                    with(tf.variable_scope(scope, default_name: _base_name), captured_scope =>
+                    {
+                        // convert variable_scope to VariableScope
+                        _scope = captured_scope;
+                    });
                 }
-
             }
         }
     }
diff --git a/src/TensorFlowNET.Core/Variables/variable_scope.py.cs b/src/TensorFlowNET.Core/Variables/variable_scope.py.cs
@@ -26,6 +26,7 @@ public class variable_scope : IPython
         private bool? _reuse;
         bool _in_graph_mode;
         protected Graph _graph;
+        bool _building_function;
 
         public variable_scope(string name, 
             string default_name = "",
@@ -70,6 +71,17 @@ public variable_scope(VariableScope scope,
 
         public void __enter__()
         {
+            // If the default graph is building a function, then we should not replace it
+            // with the cached graph.
+            if (ops.get_default_graph().building_function)
+                _building_function = true;
+            else
+                _building_function = false;
+            if (_in_graph_mode && !_building_function)
+            {
+                _graph.as_default();
+            }
+
             _scope = _enter_scope_uncached();
         }
 
diff --git a/src/TensorFlowNET.Core/ops.name_scope.cs b/src/TensorFlowNET.Core/ops.name_scope.cs
@@ -54,12 +54,13 @@ public void __enter__()
             public void Dispose()
             {
                 var g = get_default_graph();
-                // Console.WriteLine($"name_scope: {g._name_stack} -> {old_stack}");
                 g._name_stack = old_stack;
+                // Console.WriteLine($"name_scope: {g._name_stack} -> {old_stack}");
             }
 
             public void __exit__()
             {
+
             }
 
             /// <summary>
diff --git a/src/TensorFlowNET.Core/ops.py.cs b/src/TensorFlowNET.Core/ops.py.cs
@@ -50,7 +50,8 @@ public static object get_collection_ref(string key)
             return get_default_graph().get_collection_ref(key);
         }
 
-        private static Graph default_graph;
+        public static DefaultGraphStack default_graph_stack = new DefaultGraphStack();
+
         /// <summary>
         /// Returns the default graph for the current thread.
         /// 
@@ -68,15 +69,13 @@ public static Graph get_default_graph()
         {
             //TODO: original source indicates there should be a _default_graph_stack!
             //return _default_graph_stack.get_default()
-            if (default_graph == null)
-                default_graph = tf.Graph();
-            return default_graph;
+            return default_graph_stack.get_controller();
         }
         public static Graph set_default_graph(Graph graph)
         {
             //TODO: original source does not have a 'set_default_graph' and indicates there should be a _default_graph_stack!
-            default_graph = graph;
-            return default_graph;
+            default_graph_stack.set_controller(graph);
+            return default_graph_stack.get_controller();
         }
 
         /// <summary>
@@ -96,10 +95,7 @@ public static void reset_default_graph()
             //    throw new InvalidOperationException("Do not use tf.reset_default_graph() to clear " +
             //                                    "nested graphs. If you need a cleared graph, " +
             //                                    "exit the nesting and create a new graph.");
-            //_default_graph_stack.reset();
-            if (default_graph!=null)
-                default_graph.Dispose();
-            default_graph = tf.Graph();
+            default_graph_stack.reset();
         }
 
         public static Graph _get_graph_from_inputs(params Tensor[] op_input_list)
diff --git a/test/TensorFlowNET.Examples/TextProcess/CnnTextClassification.cs b/test/TensorFlowNET.Examples/TextProcess/CnnTextClassification.cs
@@ -195,7 +195,7 @@ public Graph BuildGraph()
             return graph;
         }
 
-        private bool RunWithImportedGraph(Session sess, Graph graph)
+        private bool Train(Session sess, Graph graph)
         {
             var stopwatch = Stopwatch.StartNew();
 
@@ -274,8 +274,7 @@ public bool Train()
         {
             var graph = IsImportingGraph ? ImportGraph() : BuildGraph();
 
-            return with(tf.Session(graph), sess 
-                => RunWithImportedGraph(sess, graph));
+            return with(tf.Session(graph), sess => Train(sess, graph));
         }
 
         public bool Predict()

Original file line number	Diff line number	Diff line change
`@@ -172,13 +172,12 @@ private void _set_scope(VariableScope scope = null)`
`172`	`172`	`}`
`173`	`173`	`else`
`174`	`174`	`{`
`175`		`- with(tf.variable_scope(scope, default_name: _base_name),`
`176`		`- captured_scope =>`
`177`		`- {`
`178`		`- _scope = captured_scope;`
`179`		`- });`
	`175`	`+ with(tf.variable_scope(scope, default_name: _base_name), captured_scope =>`
	`176`	`+ {`
	`177`	`+ // convert variable_scope to VariableScope`
	`178`	`+ _scope = captured_scope;`
	`179`	`+ });`
`180`	`180`	`}`
`181`		`-`
`182`	`181`	`}`
`183`	`182`	`}`
`184`	`183`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,12 +54,13 @@ public void __enter__()`
`54`	`54`	`public void Dispose()`
`55`	`55`	`{`
`56`	`56`	`var g = get_default_graph();`
`57`		`- // Console.WriteLine($"name_scope: {g._name_stack} -> {old_stack}");`
`58`	`57`	`g._name_stack = old_stack;`
	`58`	`+ // Console.WriteLine($"name_scope: {g._name_stack} -> {old_stack}");`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public void __exit__()`
`62`	`62`	`{`
	`63`	`+`
`63`	`64`	`}`
`64`	`65`
`65`	`66`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ public Graph BuildGraph()`
`195`	`195`	`return graph;`
`196`	`196`	`}`
`197`	`197`
`198`		`- private bool RunWithImportedGraph(Session sess, Graph graph)`
	`198`	`+ private bool Train(Session sess, Graph graph)`
`199`	`199`	`{`
`200`	`200`	`var stopwatch = Stopwatch.StartNew();`
`201`	`201`
`@@ -274,8 +274,7 @@ public bool Train()`
`274`	`274`	`{`
`275`	`275`	`var graph = IsImportingGraph ? ImportGraph() : BuildGraph();`
`276`	`276`
`277`		`- return with(tf.Session(graph), sess`
`278`		`- => RunWithImportedGraph(sess, graph));`
	`277`	`+ return with(tf.Session(graph), sess => Train(sess, graph));`
`279`	`278`	`}`
`280`	`279`
`281`	`280`	`public bool Predict()`