Small touchups

migueldeicaza · migueldeicaza · commit 7ceaae8ceb63 · 2017-02-11T21:53:40.000-05:00
diff --git a/Examples/ExampleInceptionInference/Program.cs b/Examples/ExampleInceptionInference/Program.cs
@@ -96,9 +96,9 @@ public static void Main (string [] args)
 					// accepts batches of image data as input.
 					var tensor = CreateTensorFromImageFile (file);
 
-					var output = session.Run (inputs: new [] { graph ["input"] [0] },
-								  inputValues: new [] { tensor },
-								  outputs: new [] { graph ["output"] [0] });
+					var runner = session.GetRunner ();
+					runner.AddInput (graph ["input"] [0], tensor).Fetch (graph ["output"] [0]);
+					var output = runner.Run ();
 					// output[0].Value() is a vector containing probabilities of
 					// labels for each image in the "batch". The batch size was 1.
 					// Find the most probably label index.
diff --git a/Examples/FExampleInceptionInference/Program.fs b/Examples/FExampleInceptionInference/Program.fs
@@ -91,7 +91,15 @@ let main argv =
         let tensor = createTensorFromImageFile file
 
         // Run the session
-        let sessionOutput = session.Run (inputs = [| graph.["input"].[0] |], inputValues= [| tensor |], outputs = [| graph.["output"].[0] |])   
+        let runner = session.GetRunner ();
+        runner.AddInput (graph.["input"].[0], tensor)
+        runner.Fetch (graph.["output"].[0]);
+        let sessionOutput = runner.Run ();
+
+        //
+        // Other style of invoking the runner:
+        // let sessionOutput = session.Run (inputs = [| graph.["input"].[0] |], inputValues= [| tensor |], outputs = [| graph.["output"].[0] |])   
+        //
         let resultTensor = sessionOutput.[0]
 
         // The GetValue method returns an 'object' type, we need to cast this
diff --git a/OpGenerator/OpGenerator.cs b/OpGenerator/OpGenerator.cs
@@ -397,7 +397,7 @@ MemoryStream GetOpsList ()
 	void Run ()
 	{
 		
-		output = File.CreateText ("../../../TensorFlowSharp/Operations.cs");
+		output = File.CreateText ("../../../TensorFlowSharp/Operations.g.cs");
 	     	var operations = Serializer.Deserialize<List<OpDef>> (GetOpsList ());
 		p ("using System;\n");
 
diff --git a/SampleTest/SampleTest.cs b/SampleTest/SampleTest.cs
@@ -289,7 +289,7 @@ public void Dispose ()
 		void ExpectMeta (TFOperation op, string name, int expectedListSize, TFAttributeType expectedType, int expectedTotalSize)
 		{
 			var meta = op.GetAttributeMetadata (name);
-			Assert (meta.IsList == (expectedListSize >= 0 ? 1 : 0));
+			Assert (meta.IsList == (expectedListSize >= 0 ? true : false));
 			Assert (expectedListSize == meta.ListSize);
 			Assert (expectedTotalSize == expectedTotalSize);
 			Assert (expectedType == meta.Type);
diff --git a/TensorFlowSharp/Operations.g.cs b/TensorFlowSharp/Operations.g.cs
diff --git a/TensorFlowSharp/TensorFlowSharp.csproj b/TensorFlowSharp/TensorFlowSharp.csproj
@@ -35,7 +35,7 @@
   <ItemGroup>
     <Compile Include="Tensorflow.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Operations.cs" />
+    <Compile Include="Operations.g.cs" />
     <Compile Include="OperationsExtras.cs" />
     <Compile Include="Buffer.cs" />
     <Compile Include="Tensor.cs" />

Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ MemoryStream GetOpsList ()`
`397`	`397`	`void Run ()`
`398`	`398`	`{`
`399`	`399`
`400`		`- output = File.CreateText ("../../../TensorFlowSharp/Operations.cs");`
	`400`	`+ output = File.CreateText ("../../../TensorFlowSharp/Operations.g.cs");`
`401`	`401`	`var operations = Serializer.Deserialize<List<OpDef>> (GetOpsList ());`
`402`	`402`	`p ("using System;\n");`
`403`	`403`
Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ public void Dispose ()`
`289`	`289`	`void ExpectMeta (TFOperation op, string name, int expectedListSize, TFAttributeType expectedType, int expectedTotalSize)`
`290`	`290`	`{`
`291`	`291`	`var meta = op.GetAttributeMetadata (name);`
`292`		`- Assert (meta.IsList == (expectedListSize >= 0 ? 1 : 0));`
	`292`	`+ Assert (meta.IsList == (expectedListSize >= 0 ? true : false));`
`293`	`293`	`Assert (expectedListSize == meta.ListSize);`
`294`	`294`	`Assert (expectedTotalSize == expectedTotalSize);`
`295`	`295`	`Assert (expectedType == meta.Type);`