Add graph to function test.

Oceania2018 · Oceania2018 · commit a8838982e80c · 2020-09-19T07:11:15.000-05:00
diff --git a/test/TensorFlowNET.UnitTest/Keras/LayersTest.cs b/test/TensorFlowNET.UnitTest/Keras/LayersTest.cs
@@ -30,17 +30,23 @@ public void Sequential()
         public void Embedding()
         {
             var model = tf.keras.Sequential();
-            var layer = tf.keras.layers.Embedding(1000, 64, input_length: 10);
+            var layer = tf.keras.layers.Embedding(7, 2, input_length: 4);
             model.add(layer);
             // the model will take as input an integer matrix of size (batch,
             // input_length).
             // the largest integer (i.e. word index) in the input should be no larger
             // than 999 (vocabulary size).
             // now model.output_shape == (None, 10, 64), where None is the batch
             // dimension.
-            var input_array = np.random.randint(1000, size: (32, 10));
+            var input_array = np.array(new int[,]
+            {
+                { 1, 2, 3, 4 },
+                { 2, 3, 4, 5 },
+                { 3, 4, 5, 6 }
+            });
             model.compile("rmsprop", "mse");
             var output_array = model.predict(input_array);
+            Assert.AreEqual((32, 10, 64), output_array.TensorShape);
         }
 
         /// <summary>
diff --git a/test/TensorFlowNET.UnitTest/ManagedAPI/ActivationFunctionTest.cs b/test/TensorFlowNET.UnitTest/ManagedAPI/ActivationFunctionTest.cs
diff --git a/test/TensorFlowNET.UnitTest/ManagedAPI/BitwiseApiTest.cs b/test/TensorFlowNET.UnitTest/ManagedAPI/BitwiseApiTest.cs
@@ -3,7 +3,7 @@
 using Tensorflow;
 using static Tensorflow.Binding;
 
-namespace TensorFlowNET.UnitTest.TF_API
+namespace TensorFlowNET.UnitTest.ManagedAPI
 {
     [TestClass]
     public class BitwiseApiTest : TFNetApiTest
diff --git a/test/TensorFlowNET.UnitTest/ManagedAPI/ConstantTest.cs b/test/TensorFlowNET.UnitTest/ManagedAPI/ConstantTest.cs
diff --git a/test/TensorFlowNET.UnitTest/ManagedAPI/GradientTest.cs b/test/TensorFlowNET.UnitTest/ManagedAPI/GradientTest.cs
@@ -5,7 +5,7 @@
 using Tensorflow;
 using static Tensorflow.Binding;
 
-namespace TensorFlowNET.UnitTest.TF_API
+namespace TensorFlowNET.UnitTest.ManagedAPI
 {
     [TestClass]
     public class GradientTest
diff --git a/test/TensorFlowNET.UnitTest/ManagedAPI/LinalgTest.cs b/test/TensorFlowNET.UnitTest/ManagedAPI/LinalgTest.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using static Tensorflow.Binding;
 
-namespace TensorFlowNET.UnitTest.TF_API
+namespace TensorFlowNET.UnitTest.ManagedAPI
 {
     [TestClass]
     public class LinalgTest
diff --git a/test/TensorFlowNET.UnitTest/ManagedAPI/MathApiTest.cs b/test/TensorFlowNET.UnitTest/ManagedAPI/MathApiTest.cs
@@ -6,7 +6,7 @@
 using Tensorflow;
 using static Tensorflow.Binding;
 
-namespace TensorFlowNET.UnitTest.TF_API
+namespace TensorFlowNET.UnitTest.ManagedAPI
 {
     [TestClass]
     public class MathApiTest : TFNetApiTest
diff --git a/test/TensorFlowNET.UnitTest/ManagedAPI/StringsApiTest.cs b/test/TensorFlowNET.UnitTest/ManagedAPI/StringsApiTest.cs
@@ -5,7 +5,7 @@
 using Tensorflow;
 using static Tensorflow.Binding;
 
-namespace TensorFlowNET.UnitTest.TF_API
+namespace TensorFlowNET.UnitTest.ManagedAPI
 {
     [TestClass]
     public class StringsApiTest
diff --git a/test/TensorFlowNET.UnitTest/ManagedAPI/TFNetApiTest.cs b/test/TensorFlowNET.UnitTest/ManagedAPI/TFNetApiTest.cs
diff --git a/test/TensorFlowNET.UnitTest/ManagedAPI/TensorOperate.cs b/test/TensorFlowNET.UnitTest/ManagedAPI/TensorOperate.cs
@@ -5,7 +5,7 @@
 using Tensorflow;
 using static Tensorflow.Binding;
 
-namespace TensorFlowNET.UnitTest.TF_API
+namespace TensorFlowNET.UnitTest.ManagedAPI
 {
     [TestClass]
     public class TensorOperate
diff --git a/test/TensorFlowNET.UnitTest/ManagedAPI/ZeroFractionTest.cs b/test/TensorFlowNET.UnitTest/ManagedAPI/ZeroFractionTest.cs
diff --git a/test/TensorFlowNET.UnitTest/ManagedAPI/nn_test.py b/test/TensorFlowNET.UnitTest/ManagedAPI/nn_test.py
diff --git a/test/TensorFlowNET.UnitTest/NativeAPI/CApiFunctionTest.cs b/test/TensorFlowNET.UnitTest/NativeAPI/CApiFunctionTest.cs
@@ -0,0 +1,142 @@
+﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using Tensorflow;
+using Tensorflow.Functions;
+using static TensorFlowNET.UnitTest.c_test_util;
+
+namespace TensorFlowNET.UnitTest.NativeAPI
+{
+    /// <summary>
+    /// tensorflow\c\c_api_function_test.cc
+    /// `class CApiColocationTest`
+    /// </summary>
+    [TestClass]
+    public class CApiFunctionTest : CApiTest, IDisposable
+    {
+        Graph func_graph_;
+        Graph host_graph_;
+        string func_name_ = "MyFunc";
+        string func_node_name_ = "MyFunc_0";
+        Status s_;
+        IntPtr func_;
+
+        [TestInitialize]
+        public void Initialize()
+        {
+            func_graph_ = new Graph();
+            host_graph_ = new Graph();
+            s_ = new Status();
+        }
+
+        [TestMethod]
+        public void OneOp_ZeroInputs_OneOutput()
+        {
+            var c = ScalarConst(10, func_graph_, s_, "scalar10");
+            // Define
+            Define(-1, new Operation[0], new Operation[0], new[] { c }, new string[0]);
+
+            // Use, run, and verify
+            var func_op = Use(new Operation[0]);
+            Run(new KeyValuePair<Operation, Tensor>[0], func_op, 10);
+            VerifyFDef(new[] { "scalar10_0" });
+        }
+
+        void Define(int num_opers, Operation[] opers,
+            Operation[] inputs, Operation[] outputs,
+            string[] output_names, bool expect_failure = false)
+            => DefineT(num_opers, opers,
+                inputs.Select(x => new TF_Output(x, 0)).ToArray(),
+                outputs.Select(x => new TF_Output(x, 0)).ToArray(),
+                output_names, expect_failure);
+
+        void DefineT(int num_opers, Operation[] opers, 
+            TF_Output[] inputs, TF_Output[] outputs,
+            string[] output_names, bool expect_failure = false)
+        {
+            IntPtr output_names_ptr = IntPtr.Zero;
+
+            func_ = c_api.TF_GraphToFunction(func_graph_, func_name_, false,
+                num_opers, num_opers == -1 ? new IntPtr[0] : opers.Select(x => (IntPtr)x).ToArray(),
+                inputs.Length, inputs.ToArray(),
+                outputs.Length, outputs.ToArray(),
+                output_names_ptr, IntPtr.Zero, null, s_.Handle);
+
+            // delete output_names_ptr
+
+            if (expect_failure)
+            {
+                ASSERT_EQ(IntPtr.Zero, func_);
+                return;
+            }
+
+            ASSERT_EQ(TF_OK, s_.Code, s_.Message);
+            ASSERT_EQ(func_name_, c_api.StringPiece(c_api.TF_FunctionName(func_)));
+            c_api.TF_GraphCopyFunction(host_graph_, func_, IntPtr.Zero, s_.Handle);
+            ASSERT_EQ(TF_OK, s_.Code, s_.Message);
+        }
+
+        Operation Use(Operation[] inputs)
+            => UseT(inputs.Select(x => new TF_Output(x, 0)).ToArray());
+
+        Operation UseT(TF_Output[] inputs)
+            => UseHelper(inputs);
+
+        Operation UseHelper(TF_Output[] inputs)
+        {
+            var desc = TF_NewOperation(host_graph_, func_name_, func_node_name_);
+            foreach (var input in inputs)
+                TF_AddInput(desc, input);
+            c_api.TF_SetDevice(desc, "/cpu:0");
+            var op = TF_FinishOperation(desc, s_);
+            ASSERT_EQ(TF_OK, s_.Code, s_.Message);
+            ASSERT_NE(op, IntPtr.Zero);
+
+            return op;
+        }
+
+        void Run(KeyValuePair<Operation, Tensor>[] inputs, Operation output, int expected_result)
+            => Run(inputs, new[] { new TF_Output(output, 0) }, new[] { expected_result });
+
+        unsafe void Run(KeyValuePair<Operation, Tensor>[] inputs, TF_Output[] outputs, int[] expected_results)
+        {
+            var csession = new CSession(host_graph_, s_);
+            ASSERT_EQ(TF_OK, s_.Code, s_.Message);
+
+            csession.SetInputs(inputs);
+            csession.SetOutputs(outputs);
+            csession.Run(s_);
+            ASSERT_EQ(TF_OK, s_.Code, s_.Message);
+
+            for (int i = 0; i < expected_results.Length; ++i)
+            {
+                var output = csession.output_tensor(i);
+                ASSERT_NE(output, IntPtr.Zero);
+                EXPECT_EQ(TF_DataType.TF_INT32, c_api.TF_TensorType(output));
+                EXPECT_EQ(0, c_api.TF_NumDims(output));
+                ASSERT_EQ(sizeof(int), (int)c_api.TF_TensorByteSize(output));
+                var output_contents = c_api.TF_TensorData(output);
+                EXPECT_EQ(expected_results[i], *(int*)output_contents.ToPointer());
+            }
+        }
+
+        void VerifyFDef(string[] nodes)
+        {
+            var fdef = GetFunctionDef(func_);
+            EXPECT_NE(fdef, IntPtr.Zero);
+            VerifyFDefNodes(fdef, nodes);
+        }
+
+        void VerifyFDefNodes(FunctionDef fdef, string[] nodes)
+        {
+            ASSERT_EQ(nodes.Length, fdef.NodeDef.Count);
+        }
+
+        public void Dispose()
+        {
+            
+        }
+    }
+}
diff --git a/test/TensorFlowNET.UnitTest/NativeAPI/CApiTest.cs b/test/TensorFlowNET.UnitTest/NativeAPI/CApiTest.cs
@@ -35,6 +35,9 @@ protected void EXPECT_GE(int expected, int actual, string msg = "")
         protected void ASSERT_EQ(object expected, object actual, string msg = "")
             => Assert.AreEqual(expected, actual, msg);
 
+        protected void ASSERT_NE(object expected, object actual, string msg = "")
+            => Assert.AreNotEqual(expected, actual, msg);
+
         protected void ASSERT_TRUE(bool condition, string msg = "")
             => Assert.IsTrue(condition, msg);
 
diff --git a/test/TensorFlowNET.UnitTest/NativeAPI/CSession.cs b/test/TensorFlowNET.UnitTest/NativeAPI/CSession.cs
@@ -41,6 +41,17 @@ public void SetInputs(Dictionary<Operation, Tensor> inputs)
             }
         }
 
+        public void SetInputs(KeyValuePair<Operation, Tensor>[] inputs)
+        {
+            DeleteInputValues();
+            inputs_.Clear();
+            foreach (var input in inputs)
+            {
+                inputs_.Add(new TF_Output(input.Key, 0));
+                input_values_.Add(input.Value);
+            }
+        }
+
         private void DeleteInputValues()
         {
             //clearing is enough as they will be disposed by the GC unless they are referenced else-where.
diff --git a/test/TensorFlowNET.UnitTest/NativeAPI/c_test_util.cs b/test/TensorFlowNET.UnitTest/NativeAPI/c_test_util.cs
@@ -1,4 +1,5 @@
-﻿using System.Diagnostics.CodeAnalysis;
+﻿using System;
+using System.Diagnostics.CodeAnalysis;
 using Tensorflow;
 using Tensorflow.Util;
 using Buffer = Tensorflow.Buffer;
@@ -60,6 +61,16 @@ public static GraphDef GetGraphDef(Graph graph)
             }
         }
 
+        public static FunctionDef GetFunctionDef(IntPtr func)
+        {
+            using var s = new Status();
+            using var buffer = new Buffer();
+            c_api.TF_FunctionToFunctionDef(func, buffer.Handle, s.Handle);
+            s.Check(true);
+            var func_def = FunctionDef.Parser.ParseFrom(buffer.ToArray());
+            return func_def;
+        }
+
         public static bool IsAddN(NodeDef node_def, int n)
         {
             if (node_def.Op != "AddN" || node_def.Name != "add" ||

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using Tensorflow;`
`4`	`4`	`using static Tensorflow.Binding;`
`5`	`5`
`6`		`-namespace TensorFlowNET.UnitTest.TF_API`
	`6`	`+namespace TensorFlowNET.UnitTest.ManagedAPI`
`7`	`7`	`{`
`8`	`8`	`[TestClass]`
`9`	`9`	`public class BitwiseApiTest : TFNetApiTest`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using Tensorflow;`
`6`	`6`	`using static Tensorflow.Binding;`
`7`	`7`
`8`		`-namespace TensorFlowNET.UnitTest.TF_API`
	`8`	`+namespace TensorFlowNET.UnitTest.ManagedAPI`
`9`	`9`	`{`
`10`	`10`	`[TestClass]`
`11`	`11`	`public class GradientTest`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using System.Text;`
`5`	`5`	`using static Tensorflow.Binding;`
`6`	`6`
`7`		`-namespace TensorFlowNET.UnitTest.TF_API`
	`7`	`+namespace TensorFlowNET.UnitTest.ManagedAPI`
`8`	`8`	`{`
`9`	`9`	`[TestClass]`
`10`	`10`	`public class LinalgTest`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`using Tensorflow;`
`7`	`7`	`using static Tensorflow.Binding;`
`8`	`8`
`9`		`-namespace TensorFlowNET.UnitTest.TF_API`
	`9`	`+namespace TensorFlowNET.UnitTest.ManagedAPI`
`10`	`10`	`{`
`11`	`11`	`[TestClass]`
`12`	`12`	`public class MathApiTest : TFNetApiTest`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,17 @@ public void SetInputs(Dictionary<Operation, Tensor> inputs)`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ public void SetInputs(KeyValuePair<Operation, Tensor>[] inputs)`
	`45`	`+ {`
	`46`	`+ DeleteInputValues();`
	`47`	`+ inputs_.Clear();`
	`48`	`+ foreach (var input in inputs)`
	`49`	`+ {`
	`50`	`+ inputs_.Add(new TF_Output(input.Key, 0));`
	`51`	`+ input_values_.Add(input.Value);`
	`52`	`+ }`
	`53`	`+ }`
	`54`	`+`
`44`	`55`	`private void DeleteInputValues()`
`45`	`56`	`{`
`46`	`57`	`//clearing is enough as they will be disposed by the GC unless they are referenced else-where.`