Make TFOperationDesc API fluent, document Runner API, make Run(TFOperation) clear previous fetches and return a single-value, instead of an array

migueldeicaza · migueldeicaza · commit ba0fb1b1af33 · 2017-05-22T00:30:41.000-04:00
diff --git a/Learn/Datasets/Helper.cs b/Learn/Datasets/Helper.cs
@@ -17,7 +17,5 @@ public static Stream MaybeDownload (string urlBase, string trainDir, string file
 			}
 			return File.OpenRead (target);
 		}
-
-
 	}
 }
diff --git a/SampleTest/SampleTest.cs b/SampleTest/SampleTest.cs
@@ -1,4 +1,4 @@
-&#65279;//
+&#65279;&#65279;//
 // This is just a dumping ground to exercise different capabilities 
 // of the API.  Some idioms might be useful, some not, feel free to
 //
@@ -58,12 +58,12 @@ void BasicConstantOps ()
 
 				// Add two constants
 				var results = s.GetRunner ().Run (g.Add (a, b));
-				var val = results [0].GetValue ();
+				var val = results.GetValue ();
 				Console.WriteLine ("a+b={0}", val);
 
 				// Multiply two constants
 				results = s.GetRunner ().Run (g.Mul (a, b));
-				Console.WriteLine ("a*b={0}", results [0].GetValue ());
+				Console.WriteLine ("a*b={0}", results.GetValue ());
 
 				// TODO: API-wise, perhaps session.Run () can have a simple
 				// overload where we only care about the fetched values, 
@@ -92,13 +92,13 @@ void BasicVariables ()
 				var runner = s.GetRunner ();
 				runner.AddInput (var_a, new TFTensor ((short)3));
 				runner.AddInput (var_b, new TFTensor ((short)2));
-				Console.WriteLine ("a+b={0}", runner.Run (add) [0].GetValue ());
+				Console.WriteLine ("a+b={0}", runner.Run (add).GetValue ());
 
 				runner = s.GetRunner ();
 				runner.AddInput (var_a, new TFTensor ((short)3));
 				runner.AddInput (var_b, new TFTensor ((short)2));
 
-				Console.WriteLine ("a*b={0}", runner.Run (mul) [0].GetValue ());
+				Console.WriteLine ("a*b={0}", runner.Run (mul).GetValue ());
 
 				// TODO
 				// Would be nice to have an API that allows me to pass the values at Run time, easily:
@@ -180,7 +180,7 @@ void BasicMatrix ()
 				var product = g.MatMul (matrix1, matrix2);
 
 
-				var result = s.GetRunner ().Run (product) [0];
+				var result = s.GetRunner ().Run (product);
 				Console.WriteLine ("Tensor ToString=" + result);
 				Console.WriteLine ("Value [0,0]=" + ((double[,])result.GetValue ())[0,0]);
 
@@ -200,6 +200,8 @@ int ArgMax (byte [,] array, int idx)
 			return maxIdx;
 		}	
 
+		// This sample has a bug, I suspect the data loaded is incorrect, because the returned
+		// values in distance is wrong, and so is the prediction computed from it.
 		void NearestNeighbor ()
 		{
 			// Get the Mnist data
@@ -220,15 +222,17 @@ void NearestNeighbor ()
 			using (var g = new TFGraph ()) {
 				var s = new TFSession (g);
 
-				var xtr = g.Placeholder (TFDataType.Float, new TFShape (-1, 784));
-				var xte = g.Placeholder (TFDataType.Float, new TFShape (784));
+
+				TFOutput xtr = g.Placeholder (TFDataType.Float, new TFShape (-1, 784));
+
+				TFOutput xte = g.Placeholder (TFDataType.Float, new TFShape (784));
 
 				// Nearest Neighbor calculation using L1 Distance
 				// Calculate L1 Distance
-				var distance = g.ReduceSum (g.Abs (g.Add (xtr, g.Neg (xte))), axis: g.Const (1));
+				TFOutput distance = g.ReduceSum (g.Abs (g.Add (xtr, g.Neg (xte))), axis: g.Const (1));
 
 				// Prediction: Get min distance index (Nearest neighbor)
-				var pred = g.ArgMin (distance, g.Const (0));
+				TFOutput pred = g.ArgMin (distance, g.Const (0));
 
 				var accuracy = 0f;
 				// Loop over the test data
@@ -237,11 +241,13 @@ void NearestNeighbor ()
 
 					// Get nearest neighbor
 
-					var result = runner.Fetch (pred).AddInput (xtr, Xtr).AddInput (xte, Xte [i].DataFloat).Run ();
+					var result = runner.Fetch (pred).Fetch (distance).AddInput (xtr, Xtr).AddInput (xte, Xte [i].DataFloat).Run ();
+					var r = result [0].GetValue ();
+					var tr = result [1].GetValue ();
 					var nn_index = (int)(long) result [0].GetValue ();
 
 					// Get nearest neighbor class label and compare it to its true label
-					Console.WriteLine ($"Test {i}: Prediction: {nn_index} {ArgMax (Ytr, nn_index)} True class: {ArgMax (Yte, i)}");
+					Console.WriteLine ($"Test {i}: Prediction: {ArgMax (Ytr, nn_index)} True class: {ArgMax (Yte, i)} (nn_index={nn_index})");
 					if (ArgMax (Ytr, nn_index) == ArgMax (Yte, i))
 						accuracy += 1f/ Xte.Length;
 				}
@@ -300,6 +306,8 @@ public static void Main (string [] args)
 
 
 			var t = new MainClass ();
+			t.TestParametersWithIndexes ();
+			t.AddControlInput ();
 			t.TestImportGraphDef ();
 			t.TestSession ();
 			t.TestOperationOutputListSize ();
diff --git a/TensorFlowSharp/TensorFlowSharp.csproj b/TensorFlowSharp/TensorFlowSharp.csproj
@@ -10,7 +10,6 @@
     <AssemblyName>TensorFlowSharp</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <ReleaseVersion>0.2</ReleaseVersion>
-    <PackOnBuild>true</PackOnBuild>
     <PackageId>TensorFlowSharp</PackageId>
     <PackageVersion>0.96</PackageVersion>
     <Authors>Miguel de Icaza</Authors>
diff --git a/TensorFlowSharp/Tensorflow.cs b/TensorFlowSharp/Tensorflow.cs

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,5 @@ public static Stream MaybeDownload (string urlBase, string trainDir, string file`
`17`	`17`	`}`
`18`	`18`	`return File.OpenRead (target);`
`19`	`19`	`}`
`20`		`-`
`21`		`-`
`22`	`20`	`}`
`23`	`21`	`}`