Merge branch 'dev' into feature_images-loading

Author: Sergio0694

Samples/DigitsCudaTest/Program.cs

@@ -7,6 +7,7 @@
 using NeuralNetworkNET.APIs;
 using NeuralNetworkNET.APIs.Enums;
 using NeuralNetworkNET.APIs.Interfaces;
+using NeuralNetworkNET.APIs.Interfaces.Data;
 using NeuralNetworkNET.APIs.Results;
 using NeuralNetworkNET.APIs.Structs;
 using NeuralNetworkNET.Helpers;
@@ -16,42 +17,37 @@
 
 namespace DigitsCudaTest
 {
-    class Program
+    public class Program
     {
-        static async Task Main()
+        public static async Task Main()
         {
-            // Parse the dataset and create the network
-            (var training, var test) = DataParser.LoadDatasets();
+            // Create the network
             INeuralNetwork network = NetworkManager.NewSequential(TensorInfo.Image<Alpha8>(28, 28),
-                CuDnnNetworkLayers.Convolutional(ConvolutionInfo.Default, (5, 5), 20, ActivationFunctionType.LeakyReLU),
                 CuDnnNetworkLayers.Convolutional(ConvolutionInfo.Default, (5, 5), 20, ActivationFunctionType.Identity),
                 CuDnnNetworkLayers.Pooling(PoolingInfo.Default, ActivationFunctionType.LeakyReLU),
-                CuDnnNetworkLayers.Convolutional(ConvolutionInfo.Default, (3, 3), 40, ActivationFunctionType.LeakyReLU),
                 CuDnnNetworkLayers.Convolutional(ConvolutionInfo.Default, (3, 3), 40, ActivationFunctionType.Identity),
                 CuDnnNetworkLayers.Pooling(PoolingInfo.Default, ActivationFunctionType.LeakyReLU),
                 CuDnnNetworkLayers.FullyConnected(125, ActivationFunctionType.LeCunTanh),
                 CuDnnNetworkLayers.FullyConnected(64, ActivationFunctionType.LeCunTanh),
                 CuDnnNetworkLayers.Softmax(10));
 
-            // Setup and start the training
+            // Prepare the dataset
+            (var training, var test) = DataParser.LoadDatasets();
+            ITrainingDataset trainingData = DatasetLoader.Training(training, 400); // Batches of 400 samples
+            ITestDataset testData = DatasetLoader.Test(test, new Progress<TrainingProgressEventArgs>(p =>
+            {
+                Printf($"Epoch {p.Iteration}, cost: {p.Result.Cost}, accuracy: {p.Result.Accuracy}");
+            }));
+
+            // Setup and network training
             CancellationTokenSource cts = new CancellationTokenSource();
             Console.CancelKeyPress += (s, e) => cts.Cancel();
             TrainingSessionResult result = await NetworkManager.TrainNetworkAsync(network, 
-                DatasetLoader.Training(training, 400), 
+                trainingData, 
                 TrainingAlgorithms.Adadelta(),
                 20, 0.5f,
-                new Progress<BatchProgress>(p =>
-                {
-                    Console.SetCursorPosition(0, Console.CursorTop);
-                    int n = (int)(p.Percentage * 32 / 100);
-                    char[] c = new char[32];
-                    for (int i = 0; i < 32; i++) c[i] = i <= n ? '=' : ' ';
-                    Console.Write($"[{new String(c)}] ");
-                }),
-                testDataset: DatasetLoader.Test(test, new Progress<TrainingProgressEventArgs>(p =>
-                {
-                    Printf($"Epoch {p.Iteration}, cost: {p.Result.Cost}, accuracy: {p.Result.Accuracy}");
-                })), token: cts.Token);
+                new Progress<BatchProgress>(TrackBatchProgress),
+                testDataset: testData, token: cts.Token);
 
             // Save the training reports
             String
@@ -76,5 +72,15 @@ private static void Printf(String text)
             Console.ForegroundColor = ConsoleColor.White;
             Console.Write($"{text}\n");
         }
+
+        // Training monitor
+        private static void TrackBatchProgress(BatchProgress progress)
+        {
+            Console.SetCursorPosition(0, Console.CursorTop);
+            int n = (int)(progress.Percentage * 32 / 100); // 32 is the number of progress '=' characters to display
+            char[] c = new char[32];
+            for (int i = 0; i < 32; i++) c[i] = i <= n ? '=' : ' ';
+            Console.Write($"[{new String(c)}] ");
+        }
     }
 }

Samples/DigitsTest/Program.cs

@@ -3,6 +3,7 @@
 using MnistDatasetToolkit;
 using NeuralNetworkNET.APIs;
 using NeuralNetworkNET.APIs.Interfaces;
+using NeuralNetworkNET.APIs.Interfaces.Data;
 using NeuralNetworkNET.APIs.Results;
 using NeuralNetworkNET.APIs.Structs;
 using NeuralNetworkNET.Networks.Activations;
@@ -11,32 +12,32 @@
 
 namespace DigitsTest
 {
-    class Program
+    public class Program
     {
-        static async Task Main()
+        public static async Task Main()
         {
-            (var training, var test) = DataParser.LoadDatasets();
+            // Create the network
             INeuralNetwork network = NetworkManager.NewSequential(TensorInfo.Image<Alpha8>(28, 28),
                 NetworkLayers.Convolutional((5, 5), 20, ActivationFunctionType.Identity),
                 NetworkLayers.Pooling(ActivationFunctionType.LeakyReLU),
                 NetworkLayers.FullyConnected(100, ActivationFunctionType.LeCunTanh),
                 NetworkLayers.Softmax(10));
+
+            // Prepare the dataset
+            (var training, var test) = DataParser.LoadDatasets();
+            ITrainingDataset trainingData = DatasetLoader.Training(training, 100); // Batches of 100 samples
+            ITestDataset testData = DatasetLoader.Test(test, new Progress<TrainingProgressEventArgs>(p =>
+            {
+                Printf($"Epoch {p.Iteration}, cost: {p.Result.Cost}, accuracy: {p.Result.Accuracy}");
+            }));
+
+            // Train the network
             TrainingSessionResult result = await NetworkManager.TrainNetworkAsync(network,
-                DatasetLoader.Training(training, 100), 
-                TrainingAlgorithms.Adadelta(), 
+                trainingData,
+                TrainingAlgorithms.Adadelta(),
                 60, 0.5f,
-                new Progress<BatchProgress>(p =>
-                {
-                    Console.SetCursorPosition(0, Console.CursorTop);
-                    int n = (int)(p.Percentage * 32 / 100);
-                    char[] c = new char[32];
-                    for (int i = 0; i < 32; i++) c[i] = i <= n ? '=' : ' ';
-                    Console.Write($"[{new String(c)}] ");
-                }),
-                testDataset: DatasetLoader.Test(test, new Progress<TrainingProgressEventArgs>(p =>
-                {
-                    Printf($"Epoch {p.Iteration}, cost: {p.Result.Cost}, accuracy: {p.Result.Accuracy}");
-                })));
+                new Progress<BatchProgress>(TrackBatchProgress),
+                testDataset: testData);
             Printf($"Stop reason: {result.StopReason}, elapsed time: {result.TrainingTime}");
             Console.ReadKey();
         }
@@ -49,5 +50,15 @@ private static void Printf(String text)
             Console.ForegroundColor = ConsoleColor.White;
             Console.Write($"{text}\n");
         }
+
+        // Training monitor
+        private static void TrackBatchProgress(BatchProgress progress)
+        {
+            Console.SetCursorPosition(0, Console.CursorTop);
+            int n = (int)(progress.Percentage * 32 / 100); // 32 is the number of progress '=' characters to display
+            char[] c = new char[32];
+            for (int i = 0; i < 32; i++) c[i] = i <= n ? '=' : ' ';
+            Console.Write($"[{new String(c)}] ");
+        }
     }
 }