fix set_shape.

Oceania2018 · Oceania2018 · commit b5f357a47fb9 · 2021-07-11T22:20:36.000-05:00
diff --git a/src/TensorFlowNET.Core/Tensors/Tensor.cs b/src/TensorFlowNET.Core/Tensors/Tensor.cs
@@ -155,8 +155,7 @@ public int[] _shape_tuple()
         /// </summary>
         public virtual void set_shape(TensorShape shape)
         {
-            // this.shape = shape.rank >= 0 ? shape.dims : null;
-            throw new NotImplementedException("");
+            this.shape = shape.rank >= 0 ? shape : null;
         }
 
         /// <summary>
diff --git a/test/TensorFlowNET.Graph.UnitTest/GradientTest/GradientTest.cs b/test/TensorFlowNET.Graph.UnitTest/GradientTest/GradientTest.cs
@@ -14,8 +14,6 @@ public class GradientTest : GraphModeTestBase
         [TestMethod]
         public void BroadcastToGrad()
         {
-            var graph = tf.Graph().as_default();
-
             var x = tf.constant(2, dtype: dtypes.float32);
             var y = tf.broadcast_to(x, (2, 4, 3));
             var grad = tf.gradients(y, x);
@@ -30,8 +28,6 @@ public void BroadcastToGrad()
         [TestMethod]
         public void CumsumGrad()
         {
-            var graph = tf.Graph().as_default();
-
             var x = tf.constant(2, dtype: dtypes.float32);
             var y = tf.broadcast_to(x, (2, 4, 3));
             var z = tf.cumsum(y, axis: 1);
@@ -47,7 +43,6 @@ public void CumsumGrad()
         [TestMethod, Ignore]
         public void testGradients()
         {
-            var g = tf.Graph().as_default();
             var inp = tf.constant(1.0, shape: new[] { 32, 100 }, name: "in");
             var w = tf.constant(1.0, shape: new[] { 100, 10 }, name: "w");
             var b = tf.Variable(1.0, shape: new[] { 10 }, name: "b");
diff --git a/test/TensorFlowNET.Graph.UnitTest/GraphModeTestBase.cs b/test/TensorFlowNET.Graph.UnitTest/GraphModeTestBase.cs
@@ -1,14 +1,23 @@
 ﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Tensorflow;
 using static Tensorflow.Binding;
 
 namespace TensorFlowNET.UnitTest
 {
     public class GraphModeTestBase : PythonTest
     {
+        protected Graph graph;
         [TestInitialize]
         public void TestInit()
         {
             tf.compat.v1.disable_eager_execution();
+            graph = tf.Graph().as_default();
+        }
+
+        [TestCleanup]
+        public void TestClean()
+        {
+            graph.Exit();
         }
     }
 }
diff --git a/test/TensorFlowNET.Graph.UnitTest/NameScopeTest.cs b/test/TensorFlowNET.Graph.UnitTest/NameScopeTest.cs
@@ -38,7 +38,7 @@ public void NestedNameScope()
                 Assert.AreEqual("scope1/Const_1:0", const3.name);
             });
 
-            g.Dispose();
+            g.Exit();
 
             Assert.AreEqual("", g._name_stack);
         }
@@ -70,7 +70,7 @@ public void NestedNameScope_Using()
                 Assert.AreEqual("scope1/Const_1:0", const3.name);
             };
 
-            g.Dispose();
+            g.Exit();
 
             Assert.AreEqual("", g._name_stack);
         }

Original file line number	Diff line number	Diff line change
`@@ -155,8 +155,7 @@ public int[] _shape_tuple()`
`155`	`155`	`/// </summary>`
`156`	`156`	`public virtual void set_shape(TensorShape shape)`
`157`	`157`	`{`
`158`		`- // this.shape = shape.rank >= 0 ? shape.dims : null;`
`159`		`- throw new NotImplementedException("");`
	`158`	`+ this.shape = shape.rank >= 0 ? shape : null;`
`160`	`159`	`}`
`161`	`160`
`162`	`161`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,23 @@`
`1`	`1`	`using Microsoft.VisualStudio.TestTools.UnitTesting;`
	`2`	`+using Tensorflow;`
`2`	`3`	`using static Tensorflow.Binding;`
`3`	`4`
`4`	`5`	`namespace TensorFlowNET.UnitTest`
`5`	`6`	`{`
`6`	`7`	`public class GraphModeTestBase : PythonTest`
`7`	`8`	`{`
	`9`	`+ protected Graph graph;`
`8`	`10`	`[TestInitialize]`
`9`	`11`	`public void TestInit()`
`10`	`12`	`{`
`11`	`13`	`tf.compat.v1.disable_eager_execution();`
	`14`	`+ graph = tf.Graph().as_default();`
	`15`	`+ }`
	`16`	`+`
	`17`	`+ [TestCleanup]`
	`18`	`+ public void TestClean()`
	`19`	`+ {`
	`20`	`+ graph.Exit();`
`12`	`21`	`}`
`13`	`22`	`}`
`14`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public void NestedNameScope()`
`38`	`38`	`Assert.AreEqual("scope1/Const_1:0", const3.name);`
`39`	`39`	`});`
`40`	`40`
`41`		`- g.Dispose();`
	`41`	`+ g.Exit();`
`42`	`42`
`43`	`43`	`Assert.AreEqual("", g._name_stack);`
`44`	`44`	`}`
`@@ -70,7 +70,7 @@ public void NestedNameScope_Using()`
`70`	`70`	`Assert.AreEqual("scope1/Const_1:0", const3.name);`
`71`	`71`	`};`
`72`	`72`
`73`		`- g.Dispose();`
	`73`	`+ g.Exit();`
`74`	`74`
`75`	`75`	`Assert.AreEqual("", g._name_stack);`
`76`	`76`	`}`