MakeUnique name, some more usability fixes

migueldeicaza · migueldeicaza · commit 92d2c778b54f · 2017-02-05T23:26:23.000-05:00
diff --git a/SampleTest/SampleTest.cs b/SampleTest/SampleTest.cs
@@ -236,13 +236,100 @@ public static void p (string p)
 			Console.WriteLine (p);
 		}
 
+		void BasicConstantOps ()
+		{
+			//
+			// Test the manual GetRunner, this could be simpler
+			// we should at some point allow Run (a+b);
+			//
+			// The session implicitly creates the graph, get it.
+			using (var s = new TFSession ()){
+				var g = s.Graph;
+
+				var a = g.Const (2);
+				var b = g.Const (3);
+				Console.WriteLine ("a=2 b=3");
+
+				// Add two constants
+				var results = s.GetRunner ().Run (g.Add (a, b));
+				var val = results [0].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 ());
+
+				// TODO: API-wise, perhaps session.Run () can have a simple
+				// overload where we only care about the fetched values, 
+				// making the above:
+				// s.Run (g.Mul (a, b));
+			}
+		}
+
+		// 
+		// Shows how to use placeholders to pass values
+		//
+		void BasicVariables ()
+		{
+			Console.WriteLine ("Using placerholders");
+			using (var g = new TFGraph ()) {
+				var s = new TFSession (g);
+
+				// We use "shorts" here, so notice the casting to short to get the
+				// tensor with the right data type.
+				var var_a = g.Placeholder (TFDataType.Int16);
+				var var_b = g.Placeholder (TFDataType.Int16);
+
+				var add = g.Add (var_a, var_b);
+				var mul = g.Mul (var_a, var_b);
+
+				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 ());
+
+				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 ());
+
+				// TODO
+				// Would be nice to have an API that allows me to pass the values at Run time, easily:
+				// s.Run (add, { var_a: 3, var_b: 2 })
+				// C# allows something with Dictionary constructors, but you still must provide the type
+				// signature.
+			}
+		}
+
+		void BasicMatrix ()
+		{
+			Console.WriteLine ("Basic matrix");
+			using (var g = new TFGraph ()) {
+				var s = new TFSession (g);
+
+				// 1x2 matrix
+				var matrix1 = g.Const (new double [,] { { 3, 3 } });
+				// 2x1 matrix
+				var matrix2 = g.Const (new double [,] { { 2 }, { 2 } });
+
+				// multiply
+				var product = g.MatMul (matrix1, matrix2);
+
+
+				var result = s.GetRunner ().Run (product) [0];
+				Console.WriteLine ("Tensor ToString=" + result);
+				Console.WriteLine ("Value [0,0]=" + ((double[,])result.GetValue ())[0,0]);
+
+			};
+		}
 
 		public static void Main (string [] args)
 		{
 			Console.WriteLine (Environment.CurrentDirectory);
 			Console.WriteLine ("TensorFlow version: " + TFCore.Version);
 
-			var b = TFCore.GetAllOpList ();
+			//var b = TFCore.GetAllOpList ();
 
 
 			var t = new MainClass ();
@@ -256,8 +343,11 @@ public static void Main (string [] args)
 
 
 			//var n = new Mnist ();
-			//n.ReadDataSets ("/Users/miguel/Downloads", numClasses: numClasses);
+			//n.ReadDataSets ("/Users/miguel/Downloads", numClasses: 10);
 
+			t.BasicConstantOps ();
+			t.BasicVariables ();
+			t.BasicMatrix ();
 		}
 	}
 }
diff --git a/TensorFlowSharp/OperationsExtras.cs b/TensorFlowSharp/OperationsExtras.cs
@@ -3,6 +3,11 @@ namespace TensorFlow
 {
 	public partial class TFGraph
 	{
+		/// <summary>
+		/// Creates a constant from a TFTensor
+		/// </summary>
+		/// <param name="value">Value.</param>
+		/// <param name="operName">Oper name.</param>
 		public TFOutput Const (TFTensor value, string operName = null)
 		{
 			return Const (value, value.TensorType, operName);
diff --git a/TensorFlowSharp/Tensorflow.cs b/TensorFlowSharp/Tensorflow.cs

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,11 @@ namespace TensorFlow`
`3`	`3`	`{`
`4`	`4`	`public partial class TFGraph`
`5`	`5`	`{`
	`6`	`+ /// <summary>`
	`7`	`+ /// Creates a constant from a TFTensor`
	`8`	`+ /// </summary>`
	`9`	`+ /// <param name="value">Value.</param>`
	`10`	`+ /// <param name="operName">Oper name.</param>`
`6`	`11`	`public TFOutput Const (TFTensor value, string operName = null)`
`7`	`12`	`{`
`8`	`13`	`return Const (value, value.TensorType, operName);`