vs2015

Author: cbovar

clean_bin_obj.bat

@@ -14,6 +14,8 @@ rd /s /q .\Examples\MinimalExample\bin
 rd /s /q .\Examples\MnistDemo\bin
 rd /s /q .\Examples\MnistDemo.GPU\bin
 rd /s /q .\src\ConvNetSharp.Utils\bin
+rd /s /q .\Examples\MnistDemo.Flow.GPU\bin
+rd /s /q .\Examples\FlowDemo\bin
 
 rd /s /q .\src\ConvNetSharp.Core\obj
 rd /s /q .\src\ConvNetSharp.Core.Tests\obj
@@ -30,4 +32,6 @@ rd /s /q .\Examples\FluentMnistDemo\obj
 rd /s /q .\Examples\MinimalExample\obj
 rd /s /q .\Examples\MnistDemo\obj
 rd /s /q .\Examples\MnistDemo.GPU\obj
-rd /s /q .\src\ConvNetSharp.Utils\obj
+rd /s /q .\src\ConvNetSharp.Utils\obj
+rd /s /q .\Examples\MnistDemo.Flow.GPU\obj
+rd /s /q .\Examples\FlowDemo\obj

src/ConvNetSharp.Core/ConvNetSharp.Core.2015.csproj

@@ -32,7 +32,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -99,5 +99,8 @@
       <Name>ConvNetSharp.Volume.2015</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

src/ConvNetSharp.Core/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
+</packages>

src/ConvNetSharp.Flow.Tests/ConvNetSharp.Flow.Tests.2015.csproj

@@ -30,17 +30,18 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
+    <Reference Include="Castle.Core, Version=4.1.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Castle.Core.4.1.0\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.VisualStudio.UnitTesting.11.0.50727.1\lib\net45\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.7.25.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Moq.4.7.25\lib\net45\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.7.63.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Moq.4.7.63\lib\net45\Moq.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>

src/ConvNetSharp.Flow.Tests/app.config

@@ -8,4 +8,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>

src/ConvNetSharp.Flow.Tests/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Castle.Core" version="4.1.1" targetFramework="net462" />
-  <package id="Microsoft.VisualStudio.UnitTesting" version="11.0.50727.1" targetFramework="net462" requireReinstallation="true" />
+  <package id="Microsoft.VisualStudio.UnitTesting" version="11.0.50727.1" targetFramework="net462" />
   <package id="Moq" version="4.7.63" targetFramework="net462" />
 </packages>

src/ConvNetSharp.Flow/Layers/ConvLayer.cs

@@ -25,7 +25,7 @@ public ConvLayer(int width, int height, int filterCount)
 
         public T BiasPref
         {
-            get => this._biasPref;
+            get { return this._biasPref; }
             set
             {
                 this._biasPref = value;
@@ -39,7 +39,7 @@ public T BiasPref
 
         public int Stride
         {
-            get => this._stride;
+            get { return this._stride; }
             set
             {
                 this._stride = value;
@@ -52,7 +52,7 @@ public int Stride
 
         public int Pad
         {
-            get => this._pad;
+            get { return this._pad; }
             set
             {
                 this._pad = value;

src/ConvNetSharp.Flow/Layers/FullyConnLayer.cs

@@ -19,7 +19,7 @@ public FullyConnLayer(int neuronCount)
 
         public T BiasPref
         {
-            get => this._biasPref;
+            get { return this._biasPref; }
             set
             {
                 this._biasPref = value;

src/ConvNetSharp.Volume.GPU/ConvNetSharp.Volume.GPU.2015.csproj

@@ -79,11 +79,14 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Double\Kernels\div.cu" />
+    <EmbeddedResource Include="Double\Kernels\exp.cu" />
+    <EmbeddedResource Include="Double\Kernels\log.cu" />
     <None Include="packages.config" />
+    <EmbeddedResource Include="Single\Kernels\div.cu" />
+    <EmbeddedResource Include="Single\Kernels\exp.cu" />
+    <EmbeddedResource Include="Single\Kernels\log.cu" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Double\Kernels\" />
-    <Folder Include="Single\Kernels\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>