clean code.

Oceania2018 · Oceania2018 · commit ebfb3275cfc8 · 2021-12-25T09:42:19.000-06:00
diff --git a/src/TensorFlowNET.Core/Binding.Util.cs b/src/TensorFlowNET.Core/Binding.Util.cs
@@ -203,49 +203,21 @@ public static IEnumerable<T> reversed<T>(IList<T> values)
                 yield return values[i];
         }
 
-        [DebuggerStepThrough]
-        public static void tf_with(ITensorFlowObject py, Action<ITensorFlowObject> action)
-        {
-            try
-            {
-                py.__enter__();
-                action(py);
-            }
-            finally
-            {
-                py.__exit__();
-                py.Dispose();
-            }
-        }
-
         [DebuggerStepThrough]
         public static void tf_with<T>(T py, Action<T> action) where T : ITensorFlowObject
         {
-            try
-            {
-                py.__enter__();
-                action(py);
-            }
-            finally
-            {
-                py.__exit__();
-                py.Dispose();
-            }
+            py.__enter__();
+            action(py);
+            py.__exit__();
         }
 
         [DebuggerStepThrough]
         public static TOut tf_with<TIn, TOut>(TIn py, Func<TIn, TOut> action) where TIn : ITensorFlowObject
         {
-            try
-            {
-                py.__enter__();
-                return action(py);
-            }
-            finally
-            {
-                py.__exit__();
-                py.Dispose();
-            }
+            py.__enter__();
+            var result = action(py);
+            py.__exit__();
+            return result;
         }
 
         public static float time()
diff --git a/src/TensorFlowNET.Core/Framework/random_seed.cs b/src/TensorFlowNET.Core/Framework/random_seed.cs
@@ -60,21 +60,22 @@ public static (Tensor, Tensor) get_seed_tensor(int? op_seed = null)
             var (seed, seed2) = get_seed(op_seed);
             Tensor _seed, _seed2;
             if (seed is null)
-                _seed = constant_op.constant(0, dtype: TF_DataType.TF_INT64, name: "seed");
+                _seed = constant_op.constant(0L, name: "seed");
             else
-                _seed = constant_op.constant(seed.Value, dtype: TF_DataType.TF_INT64, name: "seed");
+                _seed = constant_op.constant((long)seed.Value, name: "seed");
 
             if (seed2 is null)
-                _seed2 = constant_op.constant(0, dtype: TF_DataType.TF_INT64, name: "seed2");
+                _seed2 = constant_op.constant(0L, name: "seed2");
             else
             {
                 _seed2 = tf_with(ops.name_scope("seed2"), scope =>
                 {
-                    _seed2 = constant_op.constant(seed2.Value, dtype: TF_DataType.TF_INT64);
+                    _seed2 = constant_op.constant((long)seed2.Value);
                     return array_ops.where_v2(
                       math_ops.logical_and(
-                          math_ops.equal(_seed, 0l), math_ops.equal(_seed2, 0l)),
-                      constant_op.constant(2^31 - 1, dtype: dtypes.int64),
+                          math_ops.equal(_seed, 0L), 
+                          math_ops.equal(_seed2, 0L)),
+                      constant_op.constant(2^31L - 1),
                       _seed2,
                       name: scope);
                 });
diff --git a/src/TensorFlowNET.Core/Graphs/NullContextmanager.cs b/src/TensorFlowNET.Core/Graphs/NullContextmanager.cs
diff --git a/src/TensorFlowNET.Core/Sessions/Session.cs b/src/TensorFlowNET.Core/Sessions/Session.cs
@@ -21,7 +21,7 @@ limitations under the License.
 
 namespace Tensorflow
 {
-    public class Session : BaseSession, ITensorFlowObject
+    public class Session : BaseSession
     {
         public Session(string target = "", Graph g = null) : base(target, g, null)
         { }
diff --git a/src/TensorFlowNET.Core/Tensorflow.Binding.csproj b/src/TensorFlowNET.Core/Tensorflow.Binding.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <AssemblyName>TensorFlow.NET</AssemblyName>
+    <AssemblyName>Tensorflow.Binding</AssemblyName>
     <RootNamespace>Tensorflow</RootNamespace>
     <TargetTensorFlow>2.2.0</TargetTensorFlow>
     <Version>0.70.0</Version>
diff --git a/src/TensorFlowNET.Core/ops._DefaultStack.cs b/src/TensorFlowNET.Core/ops._DefaultStack.cs
diff --git a/src/TensorFlowNET.Core/ops.name_scope.cs b/src/TensorFlowNET.Core/ops.name_scope.cs
@@ -99,15 +99,16 @@ public void __enter__()
             [DebuggerStepThrough]
             public void Dispose()
             {
-                if (tf.Context.executing_eagerly())
-                    tf.Context.ScopeName = old_scope_name;
-                else
-                    get_default_graph()._name_stack = old_scope_name;
+
             }
 
             [DebuggerStepThrough]
             public void __exit__()
             {
+                if (tf.Context.executing_eagerly())
+                    tf.Context.ScopeName = old_scope_name;
+                else
+                    get_default_graph()._name_stack = old_scope_name;
             }
 
             [DebuggerNonUserCode]
diff --git a/src/TensorFlowNET.Keras/Engine/Layer.Apply.cs b/src/TensorFlowNET.Keras/Engine/Layer.Apply.cs
@@ -33,18 +33,20 @@ public Tensors Apply(Tensors inputs, Tensor state = null, bool training = false)
             else
                 nameScope = _name_scope();
 
-            tf_with(ops.name_scope(nameScope), scope =>
-            {
-                if (!built)
-                    MaybeBuild(inputs);
+            var scope = ops.name_scope(nameScope);
+            scope.__enter__();
+
+            if (!built)
+                MaybeBuild(inputs);
+
+            outputs = Call(inputs, state: state, training: training);
 
-                outputs = Call(inputs, state: state, training: training);
+            // memory leak
+            // _set_connectivity_metadata_(inputs, outputs);
+            _handle_activity_regularization(inputs, outputs);
+            _set_mask_metadata(inputs, outputs, null);
 
-                // memory leak
-                // _set_connectivity_metadata_(inputs, outputs);
-                _handle_activity_regularization(inputs, outputs);
-                _set_mask_metadata(inputs, outputs, null);
-            });
+            scope.__exit__();
 
             return outputs;
         }
diff --git a/src/TensorFlowNET.Keras/Engine/Layer.FunctionalConstructionCall.cs b/src/TensorFlowNET.Keras/Engine/Layer.FunctionalConstructionCall.cs
@@ -26,26 +26,27 @@ Tensors FunctionalConstructionCall(Tensors inputs)
             var graph = keras.backend.get_graph();
             graph.as_default();
 
-            tf_with(ops.name_scope(_name_scope()), scope =>
-            {
-                MaybeBuild(inputs);
-
-                // Wrapping `call` function in autograph to allow for dynamic control
-                // flow and control dependencies in call. We are limiting this to
-                // subclassed layers as autograph is strictly needed only for
-                // subclassed layers and models.
-                // tf_convert will respect the value of autograph setting in the
-                // enclosing tf.function, if any.
-                if (!dynamic)
-                    throw new NotImplementedException("");
-
-                outputs = Call(inputs);
+            var scope = ops.name_scope(_name_scope());
+            scope.__enter__();
+
+            MaybeBuild(inputs);
+
+            // Wrapping `call` function in autograph to allow for dynamic control
+            // flow and control dependencies in call. We are limiting this to
+            // subclassed layers as autograph is strictly needed only for
+            // subclassed layers and models.
+            // tf_convert will respect the value of autograph setting in the
+            // enclosing tf.function, if any.
+            if (!dynamic)
+                throw new NotImplementedException("");
+
+            outputs = Call(inputs);
                 
-                _set_connectivity_metadata_(inputs, outputs);
-                _handle_activity_regularization(inputs, outputs);
-                _set_mask_metadata(inputs, outputs, null);
-            });
+            _set_connectivity_metadata_(inputs, outputs);
+            _handle_activity_regularization(inputs, outputs);
+            _set_mask_metadata(inputs, outputs, null);
 
+            scope.__exit__();
             graph.Exit();
 
             return outputs;
diff --git a/src/TensorFlowNET.Keras/Tensorflow.Keras.csproj b/src/TensorFlowNET.Keras/Tensorflow.Keras.csproj
@@ -60,7 +60,7 @@ Keras is an API designed for human beings, not machines. Keras follows best prac
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HDF5-CSharp" Version="1.12.4" />
+    <PackageReference Include="HDF5-CSharp" Version="1.12.5" />
     <PackageReference Include="MethodBoundaryAspect.Fody" Version="2.0.144" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="SharpZipLib" Version="1.3.3" />
diff --git a/test/TensorFlowNET.Graph.UnitTest/PythonTest.cs b/test/TensorFlowNET.Graph.UnitTest/PythonTest.cs
@@ -252,35 +252,10 @@ public Session session(Graph graph = null, object config = null, bool use_gpu =
             //else 
             //{
             s = self._create_session(graph, config, force_gpu);
-            self._constrain_devices_and_set_default(s, use_gpu, force_gpu);
             //}
             return s.as_default();
         }
 
-        private ITensorFlowObject _constrain_devices_and_set_default(Session sess, bool useGpu, bool forceGpu)
-        {
-            //def _constrain_devices_and_set_default(self, sess, use_gpu, force_gpu):
-            //"""Set the session and its graph to global default and constrain devices."""
-            //if context.executing_eagerly():
-            //  yield None
-            //else:
-            //  with sess.graph.as_default(), sess.as_default():
-            //    if force_gpu:
-            //      # Use the name of an actual device if one is detected, or
-            //      # '/device:GPU:0' otherwise
-            //      gpu_name = gpu_device_name()
-            //      if not gpu_name:
-            //            gpu_name = "/device:GPU:0"
-            //      with sess.graph.device(gpu_name):
-            //        yield sess
-            //    elif use_gpu:
-            //      yield sess
-            //    else:
-            //      with sess.graph.device("/device:CPU:0"):
-            //        yield sess
-            return sess;
-        }
-
         // See session() for details.
         private Session _create_session(Graph graph, object cfg, bool forceGpu)
         {
diff --git a/test/TensorFlowNET.UnitTest/Basics/TrainSaverTest.cs b/test/TensorFlowNET.UnitTest/Basics/TrainSaverTest.cs
@@ -42,10 +42,7 @@ public void ImportGraph()
 
         public void ImportSavedModel()
         {
-            tf_with(Session.LoadFromSavedModel("mobilenet"), sess =>
-            {
-
-            });
+            Session.LoadFromSavedModel("mobilenet");
         }
 
         public void ImportGraphDefFromPbFile()
diff --git a/test/TensorFlowNET.UnitTest/PythonTest.cs b/test/TensorFlowNET.UnitTest/PythonTest.cs
@@ -266,35 +266,10 @@ public Session session(Graph graph = null, object config = null, bool use_gpu =
             //else 
             //{
             s = self._create_session(graph, config, force_gpu);
-            self._constrain_devices_and_set_default(s, use_gpu, force_gpu);
             //}
             return s.as_default();
         }
 
-        private ITensorFlowObject _constrain_devices_and_set_default(Session sess, bool useGpu, bool forceGpu)
-        {
-            //def _constrain_devices_and_set_default(self, sess, use_gpu, force_gpu):
-            //"""Set the session and its graph to global default and constrain devices."""
-            //if context.executing_eagerly():
-            //  yield None
-            //else:
-            //  with sess.graph.as_default(), sess.as_default():
-            //    if force_gpu:
-            //      # Use the name of an actual device if one is detected, or
-            //      # '/device:GPU:0' otherwise
-            //      gpu_name = gpu_device_name()
-            //      if not gpu_name:
-            //            gpu_name = "/device:GPU:0"
-            //      with sess.graph.device(gpu_name):
-            //        yield sess
-            //    elif use_gpu:
-            //      yield sess
-            //    else:
-            //      with sess.graph.device("/device:CPU:0"):
-            //        yield sess
-            return sess;
-        }
-
         // See session() for details.
         private Session _create_session(Graph graph, object cfg, bool forceGpu)
         {

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ limitations under the License.`
`21`	`21`
`22`	`22`	`namespace Tensorflow`
`23`	`23`	`{`
`24`		`- public class Session : BaseSession, ITensorFlowObject`
	`24`	`+ public class Session : BaseSession`
`25`	`25`	`{`
`26`	`26`	`public Session(string target = "", Graph g = null) : base(target, g, null)`
`27`	`27`	`{ }`
Original file line number	Diff line number	Diff line change
`@@ -99,15 +99,16 @@ public void __enter__()`
`99`	`99`	`[DebuggerStepThrough]`
`100`	`100`	`public void Dispose()`
`101`	`101`	`{`
`102`		`- if (tf.Context.executing_eagerly())`
`103`		`- tf.Context.ScopeName = old_scope_name;`
`104`		`- else`
`105`		`- get_default_graph()._name_stack = old_scope_name;`
	`102`	`+`
`106`	`103`	`}`
`107`	`104`
`108`	`105`	`[DebuggerStepThrough]`
`109`	`106`	`public void __exit__()`
`110`	`107`	`{`
	`108`	`+ if (tf.Context.executing_eagerly())`
	`109`	`+ tf.Context.ScopeName = old_scope_name;`
	`110`	`+ else`
	`111`	`+ get_default_graph()._name_stack = old_scope_name;`
`111`	`112`	`}`
`112`	`113`
`113`	`114`	`[DebuggerNonUserCode]`