Merge branch 'master' of https://github.com/deepakkumar1984/SiaNet

Deepak Battini · Deepak Battini · commit 17d878f40f5f · 2017-11-13T14:44:00.000+10:30
diff --git a/README.md b/README.md
@@ -1,10 +1,16 @@
 ![Build Status](https://travis-ci.org/deepakkumar1984/SiaNet.svg?branch=master)
 [![Join the chat at https://gitter.im/sia-cog/SiaNet](https://badges.gitter.im/sia-cog/SiaNet.svg)](https://gitter.im/sia-cog/SiaNet?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-# A CSharp deep learning wrapper with CNTK backend
+# A C# deep learning wrapper with CNTK backend
 
 Developing a C# wrapper to help developer easily create and train deep neural network models. I am working on enhancing the interface to load data, build model, train and predict.
 
+## Install using NuGet
+GPU and CPU Version: [https://www.nuget.org/packages/SiaNet](https://www.nuget.org/packages/SiaNet)
+
+For better performance on CPU please use CPU only version.
+CPU Only Version: [https://www.nuget.org/packages/SiaNet.CPUOnly/](https://www.nuget.org/packages/SiaNet.CPUOnly/)
+
 ## Load dataset (Housing regression example)
 ```DataFrame frame = new DataFrame();```
 
@@ -56,4 +62,10 @@ Developing a C# wrapper to help developer easily create and train deep neural ne
 
 API Documentation: https://deepakkumar1984.github.io/SiaNet/
 
+## Examples Docs (More to add)
+
+- Housing Regression: [https://github.com/deepakkumar1984/SiaNet/wiki/Example---Housing-Regression-Problem](https://github.com/deepakkumar1984/SiaNet/wiki/Example---Housing-Regression-Problem)
+- MNIST Training: [https://github.com/deepakkumar1984/SiaNet/wiki/Example---MNIST-Training](https://github.com/deepakkumar1984/SiaNet/wiki/Example---MNIST-Training)
+- Image Classification: [https://github.com/deepakkumar1984/SiaNet/wiki/Example---Image-Classification](https://github.com/deepakkumar1984/SiaNet/wiki/Example---Image-Classification)
+- Object Detection: [https://github.com/deepakkumar1984/SiaNet/wiki/Example---Object-Detection](https://github.com/deepakkumar1984/SiaNet/wiki/Example---Object-Detection)
 
diff --git a/Sia.DNN.sln b/Sia.DNN.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.4
+VisualStudioVersion = 15.0.27004.2006
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SiaNet", "SiaNet\SiaNet.csproj", "{FE7BC641-ED87-493E-A8FE-89C2069DDF1D}"
 EndProject
@@ -13,6 +13,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SiaNet.Examples.CPUOnly", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SiaNet.Common", "SiaNet.Common\SiaNet.Common.csproj", "{32ED27D4-AC7A-4011-B399-D2EA42E282C7}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionFiles", "SolutionFiles", "{91DC2A71-69FB-4C64-ABF6-2EFC2390CF4E}"
+	ProjectSection(SolutionItems) = preProject
+		SolutionAssemblyVersionInfo.cs = SolutionAssemblyVersionInfo.cs
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -35,8 +40,8 @@ Global
 		{ECBDDE28-2569-4019-B65E-F9541BF46C07}.Debug|x64.Build.0 = Debug|x64
 		{ECBDDE28-2569-4019-B65E-F9541BF46C07}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ECBDDE28-2569-4019-B65E-F9541BF46C07}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ECBDDE28-2569-4019-B65E-F9541BF46C07}.Release|x64.ActiveCfg = Release|Any CPU
-		{ECBDDE28-2569-4019-B65E-F9541BF46C07}.Release|x64.Build.0 = Release|Any CPU
+		{ECBDDE28-2569-4019-B65E-F9541BF46C07}.Release|x64.ActiveCfg = Release|x64
+		{ECBDDE28-2569-4019-B65E-F9541BF46C07}.Release|x64.Build.0 = Release|x64
 		{67E77F14-101D-433E-A9A0-38CB8C00406C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{67E77F14-101D-433E-A9A0-38CB8C00406C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{67E77F14-101D-433E-A9A0-38CB8C00406C}.Debug|x64.ActiveCfg = Debug|x64
@@ -51,16 +56,16 @@ Global
 		{204D9242-D64B-4BDA-A77A-6B8AFD8A550E}.Debug|x64.Build.0 = Debug|x64
 		{204D9242-D64B-4BDA-A77A-6B8AFD8A550E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{204D9242-D64B-4BDA-A77A-6B8AFD8A550E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{204D9242-D64B-4BDA-A77A-6B8AFD8A550E}.Release|x64.ActiveCfg = Release|Any CPU
-		{204D9242-D64B-4BDA-A77A-6B8AFD8A550E}.Release|x64.Build.0 = Release|Any CPU
+		{204D9242-D64B-4BDA-A77A-6B8AFD8A550E}.Release|x64.ActiveCfg = Release|x64
+		{204D9242-D64B-4BDA-A77A-6B8AFD8A550E}.Release|x64.Build.0 = Release|x64
 		{32ED27D4-AC7A-4011-B399-D2EA42E282C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{32ED27D4-AC7A-4011-B399-D2EA42E282C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{32ED27D4-AC7A-4011-B399-D2EA42E282C7}.Debug|x64.ActiveCfg = Debug|x64
 		{32ED27D4-AC7A-4011-B399-D2EA42E282C7}.Debug|x64.Build.0 = Debug|x64
 		{32ED27D4-AC7A-4011-B399-D2EA42E282C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{32ED27D4-AC7A-4011-B399-D2EA42E282C7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{32ED27D4-AC7A-4011-B399-D2EA42E282C7}.Release|x64.ActiveCfg = Release|Any CPU
-		{32ED27D4-AC7A-4011-B399-D2EA42E282C7}.Release|x64.Build.0 = Release|Any CPU
+		{32ED27D4-AC7A-4011-B399-D2EA42E282C7}.Release|x64.ActiveCfg = Release|x64
+		{32ED27D4-AC7A-4011-B399-D2EA42E282C7}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/SiaNet.CPUOnly/Properties/AssemblyInfo.cs b/SiaNet.CPUOnly/Properties/AssemblyInfo.cs
@@ -6,31 +6,7 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("SiaNet.CPUOnly")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SiaNet.CPUOnly")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("ecbdde28-2569-4019-b65e-f9541bf46c07")]
 
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/SiaNet.CPUOnly/SiaNet.CPUOnly.csproj b/SiaNet.CPUOnly/SiaNet.CPUOnly.csproj
@@ -228,6 +228,9 @@
     <Compile Include="..\SiaNet\Utility.cs">
       <Link>Utility.cs</Link>
     </Compile>
+    <Compile Include="..\SolutionAssemblyVersionInfo.cs">
+      <Link>SolutionAssemblyVersionInfo.cs</Link>
+    </Compile>
     <Compile Include="Model\Layers\ImageDataFrame.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
diff --git a/SiaNet.Common/Logging.cs b/SiaNet.Common/Logging.cs
@@ -25,7 +25,7 @@ public class Logging
         /// <param name="message">The message.</param>
         public static void WriteTrace(string message)
         {
-            OnWriteLog(message);
+            OnWriteLog?.Invoke(message);
         }
 
         /// <summary>
@@ -34,7 +34,7 @@ public static void WriteTrace(string message)
         /// <param name="ex">The ex.</param>
         public static void WriteTrace(Exception ex)
         {
-            OnWriteLog("Exception: " + ex.Message);
+            OnWriteLog?.Invoke("Exception: " + ex.Message);
         }
     }
 }
diff --git a/SiaNet.Common/Properties/AssemblyInfo.cs b/SiaNet.Common/Properties/AssemblyInfo.cs
@@ -6,31 +6,6 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("SiaNet.Common")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SiaNet.Common")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("32ed27d4-ac7a-4011-b399-d2ea42e282c7")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/SiaNet.Common/SiaNet.Common.csproj b/SiaNet.Common/SiaNet.Common.csproj
@@ -67,6 +67,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\SolutionAssemblyVersionInfo.cs">
+      <Link>SolutionAssemblyVersionInfo.cs</Link>
+    </Compile>
     <Compile Include="Downloader.cs" />
     <Compile Include="EnumConstants.cs" />
     <Compile Include="Enumerations.cs" />
diff --git a/SiaNet.Core/SiaNet.Core.csproj b/SiaNet.Core/SiaNet.Core.csproj
diff --git a/SiaNet/Model/ImageDataFrame.cs b/SiaNet/Model/ImageDataFrame.cs
@@ -103,7 +103,7 @@ private bool GetNextFromFrame(int batchSize)
                     }
                 }
             }
-
+             
             CurrentX = Value.CreateBatch(features, byteData.Select(b => (float)b).ToList(), GlobalParameters.Device);
             CurrentY = Value.CreateBatch(features, labelData.Select(b => (float)b).ToList(), GlobalParameters.Device);
 
diff --git a/SiaNet/Properties/AssemblyInfo.cs b/SiaNet/Properties/AssemblyInfo.cs
@@ -5,32 +5,8 @@
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Sia.DNN")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Sia.DNN")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+[assembly: AssemblyTitle("SiaNet")]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("fe7bc641-ed87-493e-a8fe-89c2069ddf1d")]
 
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.1.0")]
-[assembly: AssemblyFileVersion("0.1.1.0")]
diff --git a/SiaNet/SiaNet.csproj b/SiaNet/SiaNet.csproj
@@ -86,6 +86,9 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\SolutionAssemblyVersionInfo.cs">
+      <Link>SolutionAssemblyVersionInfo.cs</Link>
+    </Compile>
     <Compile Include="Application\Cifar10.cs" />
     <Compile Include="Application\FastRCNN.cs" />
     <Compile Include="Application\ImageNet.cs" />
diff --git a/SieNet.Examples.CPUOnly/Program.cs b/SieNet.Examples.CPUOnly/Program.cs
@@ -23,23 +23,23 @@ static void Main(string[] args)
                 GlobalParameters.Device = DeviceDescriptor.CPUDevice;
 
                 //Housing regression example
-                //HousingRegression.LoadData();
-                //HousingRegression.BuildModel();
-                //HousingRegression.Train();
+                HousingRegression.LoadData();
+                HousingRegression.BuildModel();
+                HousingRegression.Train();
 
                 //MNIST Classification example
-                //MNISTClassifier.LoadData();
-                //MNISTClassifier.BuildModel();
-                //MNISTClassifier.Train();
+                MNISTClassifier.LoadData();
+                MNISTClassifier.BuildModel();
+                MNISTClassifier.Train();
 
                 //Cifar - 10 Classification example
-                Cifar10Classification.LoadData();
-                Cifar10Classification.BuildModel();
-                Cifar10Classification.Train();
+                //Cifar10Classification.LoadData();
+                //Cifar10Classification.BuildModel();
+                //Cifar10Classification.Train();
 
                 //Image classification example
-                //Console.WriteLine("ResNet50 Prediction: " + ImageClassification.ImagenetTest(SiaNet.Common.ImageNetModel.ResNet50)[0].Name);
-                //Console.WriteLine("Cifar 10 Prediction: " + ImageClassification.Cifar10Test(SiaNet.Common.Cifar10Model.ResNet110)[0].Name);
+                Console.WriteLine("ResNet50 Prediction: " + ImageClassification.ImagenetTest(SiaNet.Common.ImageNetModel.ResNet50)[0].Name);
+                Console.WriteLine("Cifar 10 Prediction: " + ImageClassification.Cifar10Test(SiaNet.Common.Cifar10Model.ResNet110)[0].Name);
 
                 //Object Detection
                 //ObjectDetection.PascalDetection();
diff --git a/SieNet.Examples/HousingRegression.cs b/SieNet.Examples/HousingRegression.cs
@@ -51,7 +51,7 @@ private static void Model_OnTrainingEnd(Dictionary<string, List<double>> trainin
 
         private static void Model_OnEpochEnd(int epoch, uint samplesSeen, double loss, Dictionary<string, double> metrics)
         {
-            Console.WriteLine(string.Format("Epoch: {0}, Loss: {1}, Accuracy: {2}", epoch, loss, metrics["val_mae"]));
+            Console.WriteLine(string.Format("Epoch: {0}, Loss: {1}, Metrics: {2}", epoch, loss, metrics.First().Value));
         }
     }
 }
diff --git a/SieNet.Examples/Program.cs b/SieNet.Examples/Program.cs
@@ -22,30 +22,30 @@ static void Main(string[] args)
                 if (devices.Count == 0)
                     throw new Exception("No GPU Device found. Please run the CPU examples instead!");
 
-                Logging.OnWriteLog += Logging_OnWriteLog;
+                //Logging.OnWriteLog += Logging_OnWriteLog;
 
                 //Setting global device
                 GlobalParameters.Device = devices[0];
 
 
                 //Housing regression example
-                //HousingRegression.LoadData();
-                //HousingRegression.BuildModel();
-                //HousingRegression.Train();
+                HousingRegression.LoadData();
+                HousingRegression.BuildModel();
+                HousingRegression.Train();
 
                 //MNIST Classification example
-                //MNISTClassifier.LoadData();
-                //MNISTClassifier.BuildModel();
-                //MNISTClassifier.Train();
+                MNISTClassifier.LoadData();
+                MNISTClassifier.BuildModel();
+                MNISTClassifier.Train();
 
                 //Cifar-10 Classification example
-                Cifar10Classification.LoadData();
-                Cifar10Classification.BuildModel();
-                Cifar10Classification.Train();
+                //Cifar10Classification.LoadData();
+                //Cifar10Classification.BuildModel();
+                //Cifar10Classification.Train();
 
                 //Image classification example
-                //Console.WriteLine("ResNet50 Prediction: " + ImageClassification.ImagenetTest(Common.ImageNetModel.ResNet50)[0].Name);
-                //Console.WriteLine("Cifar 10 Prediction: " + ImageClassification.Cifar10Test(Common.Cifar10Model.ResNet110)[0].Name);
+                Console.WriteLine("ResNet50 Prediction: " + ImageClassification.ImagenetTest(Common.ImageNetModel.ResNet50)[0].Name);
+                Console.WriteLine("Cifar 10 Prediction: " + ImageClassification.Cifar10Test(Common.Cifar10Model.ResNet110)[0].Name);
 
 
                 //Object Detection
diff --git a/SolutionAssemblyVersionInfo.cs b/SolutionAssemblyVersionInfo.cs
@@ -0,0 +1,33 @@
+﻿using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyDescription("A C# deep learning wrapper on top of CNTK.")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("siadroid.com")]
+[assembly: AssemblyProduct("SiaNet")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("0.2.2.2")]
+[assembly: AssemblyFileVersion("0.2.2.2")]

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public class Logging`
`25`	`25`	`/// <param name="message">The message.</param>`
`26`	`26`	`public static void WriteTrace(string message)`
`27`	`27`	`{`
`28`		`- OnWriteLog(message);`
	`28`	`+ OnWriteLog?.Invoke(message);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/// <summary>`
`@@ -34,7 +34,7 @@ public static void WriteTrace(string message)`
`34`	`34`	`/// <param name="ex">The ex.</param>`
`35`	`35`	`public static void WriteTrace(Exception ex)`
`36`	`36`	`{`
`37`		`- OnWriteLog("Exception: " + ex.Message);`
	`37`	`+ OnWriteLog?.Invoke("Exception: " + ex.Message);`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ private bool GetNextFromFrame(int batchSize)`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`	`}`
`106`		`-`
	`106`	`+`
`107`	`107`	`CurrentX = Value.CreateBatch(features, byteData.Select(b => (float)b).ToList(), GlobalParameters.Device);`
`108`	`108`	`CurrentY = Value.CreateBatch(features, labelData.Select(b => (float)b).ToList(), GlobalParameters.Device);`
`109`	`109`