Merge branch 'master' into development

ThinkingTransistor · Apr 28, 2017 · 15d16e1 · 15d16e1
2 parents 60f3d85 + b7a17d4
commit 15d16e1
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -18,8 +18,7 @@ Short overview about why anyone would use this, how it came to be (even shorter)
 The recommended way to use the latest version of Sigma is adding the NuGet package to your project. 
 You can either include the core framework (command line only) [![Nuget (PreRelease)](https://img.shields.io/nuget/vpre/Sigma.Core.svg?style=flat-square)](https://www.nuget.org/packages/Sigma.Core) or the WPF visualiser (only works on Windows) which also references the core framework [![Nuget (PreRelease WPF)](https://img.shields.io/nuget/vpre/Sigma.Core.Monitors.WPF.svg?style=flat-square)](https://www.nuget.org/packages/Sigma.Core.Monitors.WPF). 
 
-In both cases, you can use any project with a main (ConsoleApplication) but you have to change the project settings to x64 (since **Sigma only supports 64bit mode**) and change the target framework to **.NET 4.6** before installing the NuGet packages.
-
+In both cases, you can use any project with a main (e.g. ConsoleApplication) but you have to change the project settings to x64 (since **Sigma only supports 64bit mode**) and change the target framework to **.NET 4.6** before installing the NuGet packages.
 
 ### From source
 
@@ -53,7 +52,13 @@ Contribution guidelines, issue tracking, versioning (?), style requirements, als
 
 ## Acknowledgements 
 
-Special thanks to xyz
+The completion of this project would not have been possible without the assistance and support of many generous people. We cannot express enough thanks and gratefully acknowledge their contributions. In particular, we would like to express our deep gratitude and appreciation to the following: 
+
+- Prof. Dr. Patrick van der Smagt, thank you. Thank you for your continued support and never-ending assistance. Thank you for your heartfelt encouragement and inspirational enthusiasm. Thank you for helping us out at midnight on a Saturday evening---we deeply appreciate your time, kindness, and efforts as our advisor. 
+
+-	To our family, friends, and loved ones, we thank you for your support and gratefully acknowledge your assistance in making this project become a reality. 
+
+*We thank you.*
 
 ## Used libraries
 

diff --git a/ROADMAP.md b/ROADMAP.md
@@ -14,6 +14,8 @@ The never ending list of nice-to-have things by project. These lists are not mea
   * Custom code can be stored within the environment / trainer files 
 * Improved preprocessor pipeline with extra step before extraction
   * Use extra step to detect values for preprocessing (e.g. for auto-normalisation)
+* Network training
+  * Implement a trainer that can be controlled via a custom network protocol and functions as a wrapper for all trainers
 
 ## Sigma.Core.Monitors General
 
@@ -34,3 +36,4 @@ The never ending list of nice-to-have things by project. These lists are not mea
 ## Sigma.Core.Monitors.WPF
 
 * Language change within the GUI without having to restart _everything_
+* Drastically improved chart performance
diff --git a/Sigma.Core.Monitors.WPF/Sigma.Core.Monitors.WPF.nuspec b/Sigma.Core.Monitors.WPF/Sigma.Core.Monitors.WPF.nuspec
@@ -16,7 +16,7 @@
 		<tags>machine-learning neural-network artificial-intelligence artificial-neural-networks framework</tags>
 
 		<dependencies>
-			<dependency id="Sigma.Core" version="0.2" />
+			<dependency id="Sigma.Core" version="0.3" />
 			<dependency id="Dragablz" version="0.0.3.186" />
 			<dependency id="LiveCharts.Wpf" version="0.9.3.5" />
 			<dependency id="MahApps.Metro.Resources" version="0.6.1" />

diff --git a/Sigma.Samples/01-IRIS/02-IRIS.csproj b/Sigma.Samples/01-IRIS/02-IRIS.csproj
@@ -8,11 +8,12 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>_01_IRIS</RootNamespace>
     <AssemblyName>01-IRIS</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -88,7 +89,10 @@
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="Sigma.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\Sigma.Core.0.2.3-alpha\lib\net452\Sigma.Core.dll</HintPath>
+      <HintPath>..\packages\Sigma.Core.0.3.0\lib\net452\Sigma.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Sigma.Core.Monitors.WPF, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\Sigma.Core.Monitors.WPF.0.3.0\lib\net46\Sigma.Core.Monitors.WPF.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -135,13 +139,13 @@
     </Page>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Sigma.Core.0.2.3-alpha\build\Sigma.Core.targets" Condition="Exists('..\packages\Sigma.Core.0.2.3-alpha\build\Sigma.Core.targets')" />
+  <Import Project="..\packages\Sigma.Core.0.3.0\build\Sigma.Core.targets" Condition="Exists('..\packages\Sigma.Core.0.3.0\build\Sigma.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Sigma.Core.0.2.3-alpha\build\Sigma.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Sigma.Core.0.2.3-alpha\build\Sigma.Core.targets'))" />
-    <Error Condition="!Exists('..\packages\Sigma.Core.Monitors.WPF.0.2.3-alpha\build\Sigma.Core.Monitors.WPF.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Sigma.Core.Monitors.WPF.0.2.3-alpha\build\Sigma.Core.Monitors.WPF.targets'))" />
+    <Error Condition="!Exists('..\packages\Sigma.Core.0.3.0\build\Sigma.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Sigma.Core.0.3.0\build\Sigma.Core.targets'))" />
+    <Error Condition="!Exists('..\packages\Sigma.Core.Monitors.WPF.0.3.0\build\Sigma.Core.Monitors.WPF.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Sigma.Core.Monitors.WPF.0.3.0\build\Sigma.Core.Monitors.WPF.targets'))" />
   </Target>
-  <Import Project="..\packages\Sigma.Core.Monitors.WPF.0.2.3-alpha\build\Sigma.Core.Monitors.WPF.targets" Condition="Exists('..\packages\Sigma.Core.Monitors.WPF.0.2.3-alpha\build\Sigma.Core.Monitors.WPF.targets')" />
+  <Import Project="..\packages\Sigma.Core.Monitors.WPF.0.3.0\build\Sigma.Core.Monitors.WPF.targets" Condition="Exists('..\packages\Sigma.Core.Monitors.WPF.0.3.0\build\Sigma.Core.Monitors.WPF.targets')" />
 </Project>
diff --git a/Sigma.Samples/01-IRIS/App.config b/Sigma.Samples/01-IRIS/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -17,6 +17,14 @@
         <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="LiveCharts.Wpf" publicKeyToken="3b585c2a5f1a92c1" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.9.5.0" newVersion="0.9.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="LiveCharts" publicKeyToken="c5935629d38af058" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.9.5.0" newVersion="0.9.5.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>
diff --git a/Sigma.Samples/01-IRIS/Program.cs b/Sigma.Samples/01-IRIS/Program.cs
@@ -10,11 +10,13 @@
 using Sigma.Core.Layers.Cost;
 using Sigma.Core.Layers.External;
 using Sigma.Core.Layers.Feedforward;
+using Sigma.Core.Monitors.WPF;
 using Sigma.Core.Training;
 using Sigma.Core.Training.Hooks.Reporters;
 using Sigma.Core.Training.Initialisers;
 using Sigma.Core.Training.Operators.Backends.NativeCpu;
 using Sigma.Core.Training.Optimisers;
+using Sigma.Core.Training.Optimisers.Gradient;
 using Sigma.Core.Utils;
 
 namespace _01_IRIS

diff --git a/Sigma.Samples/01-IRIS/packages.config b/Sigma.Samples/01-IRIS/packages.config
@@ -7,12 +7,12 @@
   <package id="MahApps.Metro" version="1.5.0-alpha017" targetFramework="net452" />
   <package id="MahApps.Metro.Resources" version="0.6.1.0" targetFramework="net452" />
   <package id="ManagedCuda-75-x64" version="7.5.7" targetFramework="net452" />
-  <package id="ManagedCuda-80" version="8.0.13" targetFramework="net452" />
-  <package id="ManagedCuda-CUBLAS" version="8.0.13" targetFramework="net452" />
+  <package id="ManagedCuda-80" version="8.0.13" targetFramework="net452" requireReinstallation="true" />
+  <package id="ManagedCuda-CUBLAS" version="8.0.13" targetFramework="net452" requireReinstallation="true" />
   <package id="MaterialDesignColors" version="1.1.3" targetFramework="net452" />
   <package id="MaterialDesignThemes" version="2.3.0.823" targetFramework="net452" />
   <package id="MaterialDesignThemes.MahApps" version="0.0.10" targetFramework="net452" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net452" />
-  <package id="Sigma.Core" version="0.2.3-alpha" targetFramework="net452" />
-  <package id="Sigma.Core.Monitors.WPF" version="0.2.3-alpha" targetFramework="net452" />
+  <package id="Sigma.Core" version="0.3.0" targetFramework="net462" />
+  <package id="Sigma.Core.Monitors.WPF" version="0.3.0" targetFramework="net462" />
 </packages>
diff --git a/Sigma.Samples/01-MNIST/01-MNIST.csproj b/Sigma.Samples/01-MNIST/01-MNIST.csproj
@@ -8,11 +8,12 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>_01_MNIST</RootNamespace>
     <AssemblyName>01-MNIST</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -108,7 +109,10 @@
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="Sigma.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\Sigma.Core.0.2.3-alpha\lib\net452\Sigma.Core.dll</HintPath>
+      <HintPath>..\packages\Sigma.Core.0.3.0\lib\net452\Sigma.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Sigma.Core.Monitors.WPF, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\Sigma.Core.Monitors.WPF.0.3.0\lib\net46\Sigma.Core.Monitors.WPF.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -155,13 +159,13 @@
     </Page>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Sigma.Core.0.2.3-alpha\build\Sigma.Core.targets" Condition="Exists('..\packages\Sigma.Core.0.2.3-alpha\build\Sigma.Core.targets')" />
+  <Import Project="..\packages\Sigma.Core.0.3.0\build\Sigma.Core.targets" Condition="Exists('..\packages\Sigma.Core.0.3.0\build\Sigma.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Sigma.Core.0.2.3-alpha\build\Sigma.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Sigma.Core.0.2.3-alpha\build\Sigma.Core.targets'))" />
-    <Error Condition="!Exists('..\packages\Sigma.Core.Monitors.WPF.0.2.3-alpha\build\Sigma.Core.Monitors.WPF.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Sigma.Core.Monitors.WPF.0.2.3-alpha\build\Sigma.Core.Monitors.WPF.targets'))" />
+    <Error Condition="!Exists('..\packages\Sigma.Core.0.3.0\build\Sigma.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Sigma.Core.0.3.0\build\Sigma.Core.targets'))" />
+    <Error Condition="!Exists('..\packages\Sigma.Core.Monitors.WPF.0.3.0\build\Sigma.Core.Monitors.WPF.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Sigma.Core.Monitors.WPF.0.3.0\build\Sigma.Core.Monitors.WPF.targets'))" />
   </Target>
-  <Import Project="..\packages\Sigma.Core.Monitors.WPF.0.2.3-alpha\build\Sigma.Core.Monitors.WPF.targets" Condition="Exists('..\packages\Sigma.Core.Monitors.WPF.0.2.3-alpha\build\Sigma.Core.Monitors.WPF.targets')" />
+  <Import Project="..\packages\Sigma.Core.Monitors.WPF.0.3.0\build\Sigma.Core.Monitors.WPF.targets" Condition="Exists('..\packages\Sigma.Core.Monitors.WPF.0.3.0\build\Sigma.Core.Monitors.WPF.targets')" />
 </Project>
diff --git a/Sigma.Samples/01-MNIST/App.config b/Sigma.Samples/01-MNIST/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -17,6 +17,14 @@
         <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="LiveCharts.Wpf" publicKeyToken="3b585c2a5f1a92c1" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.9.5.0" newVersion="0.9.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="LiveCharts" publicKeyToken="c5935629d38af058" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.9.5.0" newVersion="0.9.5.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>
diff --git a/Sigma.Samples/01-MNIST/packages.config b/Sigma.Samples/01-MNIST/packages.config
@@ -7,12 +7,12 @@
   <package id="MahApps.Metro" version="1.5.0-alpha017" targetFramework="net452" />
   <package id="MahApps.Metro.Resources" version="0.6.1.0" targetFramework="net452" />
   <package id="ManagedCuda-75-x64" version="7.5.7" targetFramework="net452" />
-  <package id="ManagedCuda-80" version="8.0.13" targetFramework="net452" />
-  <package id="ManagedCuda-CUBLAS" version="8.0.13" targetFramework="net452" />
+  <package id="ManagedCuda-80" version="8.0.13" targetFramework="net452" requireReinstallation="true" />
+  <package id="ManagedCuda-CUBLAS" version="8.0.13" targetFramework="net452" requireReinstallation="true" />
   <package id="MaterialDesignColors" version="1.1.3" targetFramework="net452" />
   <package id="MaterialDesignThemes" version="2.3.0.823" targetFramework="net452" />
   <package id="MaterialDesignThemes.MahApps" version="0.0.10" targetFramework="net452" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net452" />
-  <package id="Sigma.Core" version="0.2.3-alpha" targetFramework="net452" />
-  <package id="Sigma.Core.Monitors.WPF" version="0.2.3-alpha" targetFramework="net452" />
+  <package id="Sigma.Core" version="0.3.0" targetFramework="net452" />
+  <package id="Sigma.Core.Monitors.WPF" version="0.3.0" targetFramework="net462" />
 </packages>