fix scope name for init_scope().

Author: Oceania2018

src/TensorFlowNET.Core/Binding.Util.cs

@@ -166,7 +166,6 @@ public static IEnumerable<int> range(int start, int end)
         }
 
         [DebuggerStepThrough]
-        [DebuggerNonUserCode()] // with "Just My Code" enabled this lets the debugger break at the origin of the exception
         public static void tf_with(ITensorFlowObject py, Action<ITensorFlowObject> action)
         {
             try
@@ -181,8 +180,7 @@ public static void tf_with(ITensorFlowObject py, Action<ITensorFlowObject> actio
             }
         }
 
-        [DebuggerStepThrough]
-        [DebuggerNonUserCode()] // with "Just My Code" enabled this lets the debugger break at the origin of the exception
+        // [DebuggerStepThrough]
         public static void tf_with<T>(T py, Action<T> action) where T : ITensorFlowObject
         {
             try
@@ -198,7 +196,6 @@ public static void tf_with<T>(T py, Action<T> action) where T : ITensorFlowObjec
         }
 
         [DebuggerStepThrough]
-        [DebuggerNonUserCode()] // with "Just My Code" enabled this lets the debugger break at the origin of the exception
         public static TOut tf_with<TIn, TOut>(TIn py, Func<TIn, TOut> action) where TIn : ITensorFlowObject
         {
             try

src/TensorFlowNET.Core/Variables/ResourceVariable.cs

@@ -87,9 +87,9 @@ private void _init_from_args(object initial_value = null,
             if (trainable && !collections.Contains(tf.GraphKeys.TRAINABLE_VARIABLES))
                 collections.Add(tf.GraphKeys.TRAINABLE_VARIABLES);
 
-            _in_graph_mode = !tf.Context.executing_eagerly();
             tf_with(ops.init_scope(), init_scope =>
             {
+                _in_graph_mode = !tf.Context.executing_eagerly();
                 var values = init_from_fn ? new object[0] : new object[] { initial_value };
                 tf_with(ops.name_scope(name, "Variable", values, skip_on_eager: false), scope =>
                 {

src/TensorFlowNET.Core/ops.cs

@@ -296,6 +296,7 @@ public static NameScope init_scope()
                 // outer_device_stack = None
             });
 
+            tf.Context.ScopeName = scope;
             return ops.name_scope(scope);
         }
 

src/TensorFlowNET.Core/ops.name_scope.cs

@@ -48,7 +48,7 @@ public NameScope(string name, string default_name = "", object values = null, bo
                 _skip_on_eager = skip_on_eager;
             }
 
-            // [DebuggerStepThrough]
+            [DebuggerStepThrough]
             public void __enter__()
             {
                 if (tf.Context.executing_eagerly())
@@ -96,7 +96,7 @@ public void __enter__()
                 return (scope_name, old_name);
             }
 
-            [DebuggerHidden]
+            [DebuggerStepThrough]
             public void Dispose()
             {
                 if (tf.Context.executing_eagerly())
@@ -105,7 +105,7 @@ public void Dispose()
                     get_default_graph()._name_stack = old_scope_name;
             }
 
-            [DebuggerNonUserCode]
+            [DebuggerStepThrough]
             public void __exit__()
             {
             }