Merge pull request #86 from cbovar/v0.4.5

V0.4.5
cbovar · Feb 25, 2018 · 12a89e4 · 12a89e4
2 parents bec52e1 + ad50e35
commit 12a89e4
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 26 deletions.
diff --git a/src/ConvNetSharp.Core/ConvNetSharp.Core.Nuget.csproj b/src/ConvNetSharp.Core/ConvNetSharp.Core.Nuget.csproj
@@ -5,33 +5,33 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>0.4.4-alpha</Version>
-    <FileVersion>0.4.4.0</FileVersion>
+    <Version>0.4.5-alpha</Version>
+    <FileVersion>0.4.5.0</FileVersion>
     <Authors>Cedric Bovar</Authors>
     <Description>Deep learning in C#</Description>
     <Copyright>Copyright (c) 2017</Copyright>
   </PropertyGroup>
 
   <PropertyGroup>
     <PackageId>Cognitio.ConvNetSharp.Core</PackageId>
-    <PackageVersion>0.4.4-alpha</PackageVersion>
+    <PackageVersion>0.4.5-alpha</PackageVersion>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageTags>Deep Learning Convolution</PackageTags>
     <PackageLicenseUrl>https://github.com/cbovar/ConvNetSharp/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/cbovar/ConvNetSharp</PackageProjectUrl>
     <AssemblyName>ConvNetSharp.Core</AssemblyName>
     <RootNamespace>ConvNetSharp.Core</RootNamespace>
-    <PackageReleaseNotes>https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.4</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.5</PackageReleaseNotes>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <AssemblyVersion>0.4.4.0</AssemblyVersion>
+    <AssemblyVersion>0.4.5.0</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Remove="Properties\AssemblyInfo.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cognitio.ConvNetSharp.Volume" Version="0.4.4-alpha" />
+    <PackageReference Include="Cognitio.ConvNetSharp.Volume" Version="0.4.5-alpha" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
   </ItemGroup>
 

diff --git a/src/ConvNetSharp.Flow/ConvNetSharp.Flow.Nuget.csproj b/src/ConvNetSharp.Flow/ConvNetSharp.Flow.Nuget.csproj
@@ -5,35 +5,35 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>0.4.4-alpha</Version>
-    <FileVersion>0.4.4.0</FileVersion>
+    <Version>0.4.5-alpha</Version>
+    <FileVersion>0.4.5.0</FileVersion>
     <Authors>Cedric Bovar</Authors>
     <Description>Deep learning in C#</Description>
     <Copyright>Copyright (c) 2017</Copyright>
   </PropertyGroup>
 
   <PropertyGroup>
     <PackageId>Cognitio.ConvNetSharp.Flow</PackageId>
-    <PackageVersion>0.4.4-alpha</PackageVersion>
+    <PackageVersion>0.4.5-alpha</PackageVersion>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageTags>Deep Learning Convolution</PackageTags>
     <PackageLicenseUrl>https://github.com/cbovar/ConvNetSharp/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/cbovar/ConvNetSharp</PackageProjectUrl>
     <AssemblyName>ConvNetSharp.Flow</AssemblyName>
     <RootNamespace>ConvNetSharp.Flow</RootNamespace>
-    <PackageReleaseNotes>https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.4</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.5</PackageReleaseNotes>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Product>ConvNetSharp.Flow</Product>
-    <AssemblyVersion>0.4.4.0</AssemblyVersion>
+    <AssemblyVersion>0.4.5.0</AssemblyVersion>
   </PropertyGroup>  
 
   <ItemGroup>
     <Compile Remove="Properties\AssemblyInfo.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cognitio.ConvNetSharp.Core" Version="0.4.4-alpha" />
-    <PackageReference Include="Cognitio.ConvNetSharp.Volume" Version="0.4.4-alpha" />
+    <PackageReference Include="Cognitio.ConvNetSharp.Core" Version="0.4.5-alpha" />
+    <PackageReference Include="Cognitio.ConvNetSharp.Volume" Version="0.4.5-alpha" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ConvNetSharp.Volume.GPU/ConvNetSharp.Volume.GPU.Nuget.csproj b/src/ConvNetSharp.Volume.GPU/ConvNetSharp.Volume.GPU.Nuget.csproj
@@ -5,24 +5,24 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>0.4.4-alpha</Version>
-    <FileVersion>0.4.4.0</FileVersion>
+    <Version>0.4.5-alpha</Version>
+    <FileVersion>0.4.5.0</FileVersion>
     <Authors>Cedric Bovar</Authors>
     <Description>Deep learning in C#</Description>
     <Copyright>Copyright (c) 2017</Copyright>
   </PropertyGroup>
 
   <PropertyGroup>
     <PackageId>Cognitio.ConvNetSharp.Volume.GPU</PackageId>
-    <PackageVersion>0.4.4-alpha</PackageVersion>
+    <PackageVersion>0.4.5-alpha</PackageVersion>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageTags>Deep Learning Convolution</PackageTags>
     <PackageLicenseUrl>https://github.com/cbovar/ConvNetSharp/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/cbovar/ConvNetSharp</PackageProjectUrl>
     <AssemblyName>ConvNetSharp.Volume.GPU</AssemblyName>
     <RootNamespace>ConvNetSharp.Volume.GPU</RootNamespace>
-    <AssemblyVersion>0.4.4.0</AssemblyVersion>
-    <PackageReleaseNotes>https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.4</PackageReleaseNotes>
+    <AssemblyVersion>0.4.5.0</AssemblyVersion>
+    <PackageReleaseNotes>https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.5</PackageReleaseNotes>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
   </PropertyGroup>
 
@@ -38,12 +38,38 @@
     <Compile Remove="Properties\AssemblyInfo.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Remove="Double\Kernels\div.cu" />
+    <None Remove="Double\Kernels\exp.cu" />
+    <None Remove="Double\Kernels\leakyrelu.cu" />
+    <None Remove="Double\Kernels\leakyrelu_gradient.cu" />
+    <None Remove="Double\Kernels\log.cu" />
+    <None Remove="Single\Kernels\div.cu" />
+    <None Remove="Single\Kernels\exp.cu" />
+    <None Remove="Single\Kernels\leakyrelu.cu" />
+    <None Remove="Single\Kernels\leakyrelu_gradient.cu" />
+    <None Remove="Single\Kernels\log.cu" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Double\Kernels\div.cu" />
+    <EmbeddedResource Include="Double\Kernels\exp.cu" />
+    <EmbeddedResource Include="Double\Kernels\leakyrelu.cu" />
+    <EmbeddedResource Include="Double\Kernels\leakyrelu_gradient.cu" />
+    <EmbeddedResource Include="Double\Kernels\log.cu" />
+    <EmbeddedResource Include="Single\Kernels\div.cu" />
+    <EmbeddedResource Include="Single\Kernels\exp.cu" />
+    <EmbeddedResource Include="Single\Kernels\leakyrelu.cu" />
+    <EmbeddedResource Include="Single\Kernels\leakyrelu_gradient.cu" />
+    <EmbeddedResource Include="Single\Kernels\log.cu" />
+  </ItemGroup>
+
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cognitio.ConvNetSharp.Volume" Version="0.4.4-alpha" />
+    <PackageReference Include="Cognitio.ConvNetSharp.Volume" Version="0.4.5-alpha" />
     <PackageReference Include="ManagedCuda-CudaDNN" Version="8.0.22" />
     <PackageReference Include="ManagedCuda-NVRTC" Version="8.0.22" />
   </ItemGroup>

diff --git a/src/ConvNetSharp.Volume.GPU/GpuContext.cs b/src/ConvNetSharp.Volume.GPU/GpuContext.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Diagnostics;
 using ManagedCuda;
-using ManagedCuda.CudaDNN;
 
 namespace ConvNetSharp.Volume.GPU
 {

diff --git a/src/ConvNetSharp.Volume.GPU/KernelLoader.cs b/src/ConvNetSharp.Volume.GPU/KernelLoader.cs
@@ -3,7 +3,6 @@
 using System.IO;
 using System.Linq;
 using ManagedCuda;
-using ManagedCuda.BasicTypes;
 using ManagedCuda.NVRTC;
 using ManagedCuda.VectorTypes;
 
@@ -27,6 +26,11 @@ private void AddKernel(string name, CudaKernel kernel)
 
         public void LoadKernel(string name, Stream stream)
         {
+            if (stream == null)
+            {
+                throw new ArgumentException($"Couldn't load kernel '{name}'.", nameof(stream));
+            }
+
             using (StreamReader reader = new StreamReader(stream))
             {
                 string result = reader.ReadToEnd();

diff --git a/src/ConvNetSharp.Volume/ConvNetSharp.Volume.csproj b/src/ConvNetSharp.Volume/ConvNetSharp.Volume.csproj
@@ -5,23 +5,23 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>0.4.4-alpha</Version>
-    <FileVersion>0.4.4.0</FileVersion>
+    <Version>0.4.5-alpha</Version>
+    <FileVersion>0.4.5.0</FileVersion>
     <Authors>Cedric Bovar</Authors>
     <Description>Deep learning in C#</Description>
     <Copyright>Copyright (c) 2017</Copyright>
   </PropertyGroup>
 
   <PropertyGroup>
     <PackageId>Cognitio.ConvNetSharp.Volume</PackageId>
-    <PackageVersion>0.4.4-alpha</PackageVersion>
+    <PackageVersion>0.4.5-alpha</PackageVersion>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageTags>Deep Learning Convolution</PackageTags>
     <PackageLicenseUrl>https://github.com/cbovar/ConvNetSharp/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/cbovar/ConvNetSharp</PackageProjectUrl>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <PackageReleaseNotes>https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.4</PackageReleaseNotes>
-    <AssemblyVersion>0.4.4.0</AssemblyVersion>
+    <PackageReleaseNotes>https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.5</PackageReleaseNotes>
+    <AssemblyVersion>0.4.5.0</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>