Restore tensor unit tests.

Oceania2018 · Oceania2018 · commit b098c66d8d23 · 2020-07-07T16:02:01.000-05:00
diff --git a/test/TensorFlowNET.UnitTest/Basics/SessionTest.cs b/test/TensorFlowNET.UnitTest/Basics/SessionTest.cs
@@ -14,15 +14,14 @@
 
 namespace TensorFlowNET.UnitTest.NativeAPI
 {
-    [Ignore]
     [TestClass]
     public class SessionTest : CApiTest
     {
         /// <summary>
         /// tensorflow\c\c_api_test.cc
         /// `TEST(CAPI, Session)`
         /// </summary>
-        [TestMethod, Ignore]
+        [TestMethod]
         public void Session()
         {
             lock (Locks.ProcessWide)
diff --git a/test/TensorFlowNET.UnitTest/Basics/TensorTest.cs b/test/TensorFlowNET.UnitTest/Basics/TensorTest.cs
@@ -11,7 +11,6 @@
 
 namespace TensorFlowNET.UnitTest.NativeAPI
 {
-    [Ignore]
     [TestClass]
     public class TensorTest : CApiTest
     {
@@ -81,7 +80,7 @@ public void AllocateTensor()
         /// Port from c_api_test.cc
         /// `TEST(CAPI, MaybeMove)`
         /// </summary>
-        [TestMethod]
+        [TestMethod, Ignore]
         public void MaybeMove()
         {
             NDArray nd = np.array(2, 3);
@@ -262,13 +261,17 @@ public void batch_to_space_nd()
             }
         }
 
-        [TestMethod]
+        [TestMethod, Ignore]
         public void boolean_mask()
         {
             var tensor = new[] { 0, 1, 2, 3 };
             var mask = np.array(new[] { true, false, true, false });
             var masked = tf.boolean_mask(tensor, mask);
-            Assert.IsTrue(Enumerable.SequenceEqual(new int[] { 0, 2 }, masked.ToArray<int>()));
+            using (var sess = tf.Session())
+            {
+                var result = sess.run(masked);
+                Assert.IsTrue(Enumerable.SequenceEqual(new int[] { 0, 2 }, masked.ToArray<int>()));
+            }
         }
     }
 }
diff --git a/test/TensorFlowNET.UnitTest/GradientTest/GradientTest.cs b/test/TensorFlowNET.UnitTest/GradientTest/GradientTest.cs
@@ -4,13 +4,13 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using NumSharp;
 using Tensorflow;
+using Tensorflow.UnitTest;
 using static Tensorflow.Binding;
 
 namespace TensorFlowNET.UnitTest.Gradient
 {
-    [Ignore]
     [TestClass]
-    public class GradientTest : PythonTest
+    public class GradientTest : GraphModeTestBase
     {
         [TestMethod]
         public void BroadcastToGrad()
@@ -45,7 +45,6 @@ public void CumsumGrad()
             }
         }
 
-        [Ignore("TODO")]
         [TestMethod]
         public void testGradients()
         {
diff --git a/test/TensorFlowNET.UnitTest/Keras/EmbeddingTest.cs b/test/TensorFlowNET.UnitTest/Keras/EmbeddingTest.cs
@@ -5,16 +5,16 @@
 using Tensorflow.Keras.Engine;
 using Tensorflow.Keras.Layers;
 using NumSharp;
+using Tensorflow.UnitTest;
 
 namespace TensorFlowNET.UnitTest.Keras
 {
     /// <summary>
     /// https://www.tensorflow.org/versions/r1.14/api_docs/python/tf/keras/layers/Embedding
     /// </summary>
     [TestClass]
-    public class EmbeddingTest
+    public class EmbeddingTest : GraphModeTestBase
     {
-        [Ignore]
         [TestMethod]
         public void Embedding()
         {
diff --git a/test/TensorFlowNET.UnitTest/NativeAPI/CApiAttributesTestcs.cs b/test/TensorFlowNET.UnitTest/NativeAPI/CApiAttributesTestcs.cs
@@ -8,7 +8,6 @@ namespace TensorFlowNET.UnitTest.NativeAPI
     /// tensorflow\c\c_api_test.cc
     /// `class CApiAttributesTest`
     /// </summary>
-    [Ignore]
     [TestClass]
     public class CApiAttributesTestcs : CApiTest, IDisposable
     {
diff --git a/test/TensorFlowNET.UnitTest/NativeAPI/CApiColocationTest.cs b/test/TensorFlowNET.UnitTest/NativeAPI/CApiColocationTest.cs
@@ -9,7 +9,6 @@ namespace TensorFlowNET.UnitTest.NativeAPI
     /// tensorflow\c\c_api_test.cc
     /// `class CApiColocationTest`
     /// </summary>
-    [Ignore]
     [TestClass]
     public class CApiColocationTest : CApiTest, IDisposable
     {
diff --git a/test/TensorFlowNET.UnitTest/NativeAPI/CApiGradientsTest.cs b/test/TensorFlowNET.UnitTest/NativeAPI/CApiGradientsTest.cs
@@ -11,7 +11,7 @@ namespace TensorFlowNET.UnitTest.NativeAPI
     /// tensorflow\c\c_api_test.cc
     /// `class CApiGradientsTest`
     /// </summary>
-    [TestClass, Ignore]
+    [TestClass]
     public class CApiGradientsTest : CApiTest, IDisposable
     {
         private Graph graph_ = new Graph();
diff --git a/test/TensorFlowNET.UnitTest/NativeAPI/CApiTest.cs b/test/TensorFlowNET.UnitTest/NativeAPI/CApiTest.cs
@@ -3,11 +3,12 @@
 using Tensorflow;
 using Tensorflow.Device;
 using Tensorflow.Eager;
+using Tensorflow.UnitTest;
 using Buffer = System.Buffer;
 
 namespace TensorFlowNET.UnitTest
 {
-    public class CApiTest
+    public class CApiTest : GraphModeTestBase
     {
         protected static readonly TF_Code TF_OK = TF_Code.TF_OK;
         protected static readonly TF_DataType TF_FLOAT = TF_DataType.TF_FLOAT;
diff --git a/test/TensorFlowNET.UnitTest/TF_API/ZeroFractionTest.cs b/test/TensorFlowNET.UnitTest/TF_API/ZeroFractionTest.cs
@@ -3,11 +3,12 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using NumSharp;
 using Tensorflow;
+using Tensorflow.UnitTest;
 
 namespace TensorFlowNET.UnitTest.nn_test
 {
     [TestClass]
-    public class ZeroFractionTest : PythonTest
+    public class ZeroFractionTest : GraphModeTestBase
     {
         protected double _ZeroFraction(NDArray x)
         {
diff --git a/test/TensorFlowNET.UnitTest/nest_test/NestTest.cs b/test/TensorFlowNET.UnitTest/nest_test/NestTest.cs
@@ -5,6 +5,7 @@
 using Newtonsoft.Json.Linq;
 using NumSharp;
 using Tensorflow;
+using Tensorflow.UnitTest;
 using Tensorflow.Util;
 using static Tensorflow.Binding;
 
@@ -14,7 +15,7 @@ namespace TensorFlowNET.UnitTest.nest_test
     /// excerpt of tensorflow/python/framework/util/nest_test.py
     /// </summary>
     [TestClass]
-    public class NestTest : PythonTest
+    public class NestTest : GraphModeTestBase
     {
         [TestInitialize]
         public void TestInitialize()
diff --git a/test/TensorFlowNET.UnitTest/ops_test/CreateOpFromTfOperationTest.cs b/test/TensorFlowNET.UnitTest/ops_test/CreateOpFromTfOperationTest.cs
@@ -3,6 +3,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Tensorflow;
 using Tensorflow.Operations;
+using Tensorflow.UnitTest;
 using static Tensorflow.Binding;
 
 namespace TensorFlowNET.UnitTest.ops_test
@@ -19,7 +20,7 @@ namespace TensorFlowNET.UnitTest.ops_test
     /// </summary>
     [Ignore]
     [TestClass]
-    public class CreateOpFromTfOperationTest : PythonTest
+    public class CreateOpFromTfOperationTest : GraphModeTestBase
     {
 
         [TestMethod]
diff --git a/test/TensorFlowNET.UnitTest/ops_test/GraphTest.cs b/test/TensorFlowNET.UnitTest/ops_test/GraphTest.cs
@@ -1,14 +1,14 @@
 ﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Tensorflow;
+using Tensorflow.UnitTest;
 
 namespace TensorFlowNET.UnitTest.ops_test
 {
     /// <summary>
     /// excerpt of tensorflow/python/framework/ops_test.py
     /// </summary>
-    [Ignore]
     [TestClass]
-    public class GraphTest : PythonTest
+    public class GraphTest : GraphModeTestBase
     {
 
         [TestInitialize]

Original file line number	Diff line number	Diff line change
`@@ -14,15 +14,14 @@`
`14`	`14`
`15`	`15`	`namespace TensorFlowNET.UnitTest.NativeAPI`
`16`	`16`	`{`
`17`		`- [Ignore]`
`18`	`17`	`[TestClass]`
`19`	`18`	`public class SessionTest : CApiTest`
`20`	`19`	`{`
`21`	`20`	`/// <summary>`
`22`	`21`	`/// tensorflow\c\c_api_test.cc`
`23`	`22`	/// `TEST(CAPI, Session)`
`24`	`23`	`/// </summary>`
`25`		`- [TestMethod, Ignore]`
	`24`	`+ [TestMethod]`
`26`	`25`	`public void Session()`
`27`	`26`	`{`
`28`	`27`	`lock (Locks.ProcessWide)`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`
`12`	`12`	`namespace TensorFlowNET.UnitTest.NativeAPI`
`13`	`13`	`{`
`14`		`- [Ignore]`
`15`	`14`	`[TestClass]`
`16`	`15`	`public class TensorTest : CApiTest`
`17`	`16`	`{`
`@@ -81,7 +80,7 @@ public void AllocateTensor()`
`81`	`80`	`/// Port from c_api_test.cc`
`82`	`81`	/// `TEST(CAPI, MaybeMove)`
`83`	`82`	`/// </summary>`
`84`		`- [TestMethod]`
	`83`	`+ [TestMethod, Ignore]`
`85`	`84`	`public void MaybeMove()`
`86`	`85`	`{`
`87`	`86`	`NDArray nd = np.array(2, 3);`
`@@ -262,13 +261,17 @@ public void batch_to_space_nd()`
`262`	`261`	`}`
`263`	`262`	`}`
`264`	`263`
`265`		`- [TestMethod]`
	`264`	`+ [TestMethod, Ignore]`
`266`	`265`	`public void boolean_mask()`
`267`	`266`	`{`
`268`	`267`	`var tensor = new[] { 0, 1, 2, 3 };`
`269`	`268`	`var mask = np.array(new[] { true, false, true, false });`
`270`	`269`	`var masked = tf.boolean_mask(tensor, mask);`
`271`		`- Assert.IsTrue(Enumerable.SequenceEqual(new int[] { 0, 2 }, masked.ToArray<int>()));`
	`270`	`+ using (var sess = tf.Session())`
	`271`	`+ {`
	`272`	`+ var result = sess.run(masked);`
	`273`	`+ Assert.IsTrue(Enumerable.SequenceEqual(new int[] { 0, 2 }, masked.ToArray<int>()));`
	`274`	`+ }`
`272`	`275`	`}`
`273`	`276`	`}`
`274`	`277`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,13 @@`
`4`	`4`	`using Microsoft.VisualStudio.TestTools.UnitTesting;`
`5`	`5`	`using NumSharp;`
`6`	`6`	`using Tensorflow;`
	`7`	`+using Tensorflow.UnitTest;`
`7`	`8`	`using static Tensorflow.Binding;`
`8`	`9`
`9`	`10`	`namespace TensorFlowNET.UnitTest.Gradient`
`10`	`11`	`{`
`11`		`- [Ignore]`
`12`	`12`	`[TestClass]`
`13`		`- public class GradientTest : PythonTest`
	`13`	`+ public class GradientTest : GraphModeTestBase`
`14`	`14`	`{`
`15`	`15`	`[TestMethod]`
`16`	`16`	`public void BroadcastToGrad()`
`@@ -45,7 +45,6 @@ public void CumsumGrad()`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`- [Ignore("TODO")]`
`49`	`48`	`[TestMethod]`
`50`	`49`	`public void testGradients()`
`51`	`50`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,16 +5,16 @@`
`5`	`5`	`using Tensorflow.Keras.Engine;`
`6`	`6`	`using Tensorflow.Keras.Layers;`
`7`	`7`	`using NumSharp;`
	`8`	`+using Tensorflow.UnitTest;`
`8`	`9`
`9`	`10`	`namespace TensorFlowNET.UnitTest.Keras`
`10`	`11`	`{`
`11`	`12`	`/// <summary>`
`12`	`13`	`/// https://www.tensorflow.org/versions/r1.14/api_docs/python/tf/keras/layers/Embedding`
`13`	`14`	`/// </summary>`
`14`	`15`	`[TestClass]`
`15`		`- public class EmbeddingTest`
	`16`	`+ public class EmbeddingTest : GraphModeTestBase`
`16`	`17`	`{`
`17`		`- [Ignore]`
`18`	`18`	`[TestMethod]`
`19`	`19`	`public void Embedding()`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ namespace TensorFlowNET.UnitTest.NativeAPI`
`8`	`8`	`/// tensorflow\c\c_api_test.cc`
`9`	`9`	/// `class CApiAttributesTest`
`10`	`10`	`/// </summary>`
`11`		`- [Ignore]`
`12`	`11`	`[TestClass]`
`13`	`12`	`public class CApiAttributesTestcs : CApiTest, IDisposable`
`14`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ namespace TensorFlowNET.UnitTest.NativeAPI`
`9`	`9`	`/// tensorflow\c\c_api_test.cc`
`10`	`10`	/// `class CApiColocationTest`
`11`	`11`	`/// </summary>`
`12`		`- [Ignore]`
`13`	`12`	`[TestClass]`
`14`	`13`	`public class CApiColocationTest : CApiTest, IDisposable`
`15`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace TensorFlowNET.UnitTest.NativeAPI`
`11`	`11`	`/// tensorflow\c\c_api_test.cc`
`12`	`12`	/// `class CApiGradientsTest`
`13`	`13`	`/// </summary>`
`14`		`- [TestClass, Ignore]`
	`14`	`+ [TestClass]`
`15`	`15`	`public class CApiGradientsTest : CApiTest, IDisposable`
`16`	`16`	`{`
`17`	`17`	`private Graph graph_ = new Graph();`
Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,12 @@`
`3`	`3`	`using Tensorflow;`
`4`	`4`	`using Tensorflow.Device;`
`5`	`5`	`using Tensorflow.Eager;`
	`6`	`+using Tensorflow.UnitTest;`
`6`	`7`	`using Buffer = System.Buffer;`
`7`	`8`
`8`	`9`	`namespace TensorFlowNET.UnitTest`
`9`	`10`	`{`
`10`		`- public class CApiTest`
	`11`	`+ public class CApiTest : GraphModeTestBase`
`11`	`12`	`{`
`12`	`13`	`protected static readonly TF_Code TF_OK = TF_Code.TF_OK;`
`13`	`14`	`protected static readonly TF_DataType TF_FLOAT = TF_DataType.TF_FLOAT;`