optimize image dataset loading

Oceania2018 · Oceania2018 · commit 0484aab0f973 · 2019-04-22T21:34:09.000-05:00
diff --git a/test/TensorFlowNET.Examples/LogisticRegression.cs b/test/TensorFlowNET.Examples/LogisticRegression.cs
@@ -1,6 +1,7 @@
 ﻿using NumSharp;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -55,6 +56,8 @@ public bool Run()
             // Initialize the variables (i.e. assign their default value)
             var init = tf.global_variables_initializer();
 
+            var sw = new Stopwatch();
+
             return with(tf.Session(), sess =>
             {
                 // Run the initializer
@@ -63,6 +66,8 @@ public bool Run()
                 // Training cycle
                 foreach (var epoch in range(training_epochs))
                 {
+                    sw.Start();
+
                     var avg_cost = 0.0f;
                     var total_batch = mnist.train.num_examples / batch_size;
                     // Loop over all batches
@@ -79,9 +84,13 @@ public bool Run()
                         avg_cost += c / total_batch;
                     }
 
+                    sw.Stop();
+
                     // Display logs per epoch step
                     if ((epoch + 1) % display_step == 0)
-                        print($"Epoch: {(epoch + 1).ToString("D4")} cost= {avg_cost.ToString("G9")}");
+                        print($"Epoch: {(epoch + 1).ToString("D4")} cost= {avg_cost.ToString("G9")} elapse= {sw.ElapsedMilliseconds}ms");
+
+                    sw.Reset();
                 }
 
                 print("Optimization Finished!");
diff --git a/test/TensorFlowNET.Examples/NeuralNetXor.cs b/test/TensorFlowNET.Examples/NeuralNetXor.cs
@@ -12,7 +12,7 @@ namespace TensorFlowNET.Examples
     /// </summary>
     public class NeuralNetXor : Python, IExample
     {
-        public int Priority => 2;
+        public int Priority => 10;
         public bool Enabled { get; set; } = true;
         public string Name => "NN XOR";
 
diff --git a/test/TensorFlowNET.Examples/Utility/DataSet.cs b/test/TensorFlowNET.Examples/Utility/DataSet.cs
@@ -54,8 +54,8 @@ public DataSet(NDArray images, NDArray labels, TF_DataType dtype, bool reshape)
 
                 // Get the rest examples in this epoch
                 var rest_num_examples = _num_examples - start;
-                var images_rest_part = _images[np.arange(start, _num_examples)];
-                var labels_rest_part = _labels[np.arange(start, _num_examples)];
+                //var images_rest_part = _images[np.arange(start, _num_examples)];
+                //var labels_rest_part = _labels[np.arange(start, _num_examples)];
                 // Shuffle the data
                 if (shuffle)
                 {
diff --git a/test/TensorFlowNET.Examples/Utility/MnistDataSet.cs b/test/TensorFlowNET.Examples/Utility/MnistDataSet.cs
@@ -102,7 +102,7 @@ private static NDArray dense_to_one_hot(NDArray labels_dense, int num_classes)
             for(int row = 0; row < num_labels; row++)
             {
                 var col = labels_dense.Data<byte>(row);
-                labels_one_hot.SetData(1, row, col);
+                labels_one_hot.SetData(1.0, row, col);
             }
 
             return labels_one_hot;

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace TensorFlowNET.Examples`
`12`	`12`	`/// </summary>`
`13`	`13`	`public class NeuralNetXor : Python, IExample`
`14`	`14`	`{`
`15`		`- public int Priority => 2;`
	`15`	`+ public int Priority => 10;`
`16`	`16`	`public bool Enabled { get; set; } = true;`
`17`	`17`	`public string Name => "NN XOR";`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ private static NDArray dense_to_one_hot(NDArray labels_dense, int num_classes)`
`102`	`102`	`for(int row = 0; row < num_labels; row++)`
`103`	`103`	`{`
`104`	`104`	`var col = labels_dense.Data<byte>(row);`
`105`		`- labels_one_hot.SetData(1, row, col);`
	`105`	`+ labels_one_hot.SetData(1.0, row, col);`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`return labels_one_hot;`