Skip to content

Commit 12a89e4

Browse files
cbovarcbovar
authored
Merge pull request #86 from cbovar/v0.4.5
V0.4.5
2 parents bec52e1 + ad50e35 commit 12a89e4

6 files changed

Lines changed: 55 additions & 26 deletions

File tree

‎src/ConvNetSharp.Core/ConvNetSharp.Core.Nuget.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,33 @@
55
</PropertyGroup>
66

77
<PropertyGroup>
8-
<Version>0.4.4-alpha</Version>
9-
<FileVersion>0.4.4.0</FileVersion>
8+
<Version>0.4.5-alpha</Version>
9+
<FileVersion>0.4.5.0</FileVersion>
1010
<Authors>Cedric Bovar</Authors>
1111
<Description>Deep learning in C#</Description>
1212
<Copyright>Copyright (c) 2017</Copyright>
1313
</PropertyGroup>
1414

1515
<PropertyGroup>
1616
<PackageId>Cognitio.ConvNetSharp.Core</PackageId>
17-
<PackageVersion>0.4.4-alpha</PackageVersion>
17+
<PackageVersion>0.4.5-alpha</PackageVersion>
1818
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
1919
<PackageTags>Deep Learning Convolution</PackageTags>
2020
<PackageLicenseUrl>https://github.com/cbovar/ConvNetSharp/blob/master/LICENSE</PackageLicenseUrl>
2121
<PackageProjectUrl>https://github.com/cbovar/ConvNetSharp</PackageProjectUrl>
2222
<AssemblyName>ConvNetSharp.Core</AssemblyName>
2323
<RootNamespace>ConvNetSharp.Core</RootNamespace>
24-
<PackageReleaseNotes>https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.4</PackageReleaseNotes>
24+
<PackageReleaseNotes>https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.5</PackageReleaseNotes>
2525
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
26-
<AssemblyVersion>0.4.4.0</AssemblyVersion>
26+
<AssemblyVersion>0.4.5.0</AssemblyVersion>
2727
</PropertyGroup>
2828

2929
<ItemGroup>
3030
<Compile Remove="Properties\AssemblyInfo.cs" />
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="Cognitio.ConvNetSharp.Volume" Version="0.4.4-alpha" />
34+
<PackageReference Include="Cognitio.ConvNetSharp.Volume" Version="0.4.5-alpha" />
3535
<PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
3636
</ItemGroup>
3737

‎src/ConvNetSharp.Flow/ConvNetSharp.Flow.Nuget.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,35 @@
55
</PropertyGroup>
66

77
<PropertyGroup>
8-
<Version>0.4.4-alpha</Version>
9-
<FileVersion>0.4.4.0</FileVersion>
8+
<Version>0.4.5-alpha</Version>
9+
<FileVersion>0.4.5.0</FileVersion>
1010
<Authors>Cedric Bovar</Authors>
1111
<Description>Deep learning in C#</Description>
1212
<Copyright>Copyright (c) 2017</Copyright>
1313
</PropertyGroup>
1414

1515
<PropertyGroup>
1616
<PackageId>Cognitio.ConvNetSharp.Flow</PackageId>
17-
<PackageVersion>0.4.4-alpha</PackageVersion>
17+
<PackageVersion>0.4.5-alpha</PackageVersion>
1818
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
1919
<PackageTags>Deep Learning Convolution</PackageTags>
2020
<PackageLicenseUrl>https://github.com/cbovar/ConvNetSharp/blob/master/LICENSE</PackageLicenseUrl>
2121
<PackageProjectUrl>https://github.com/cbovar/ConvNetSharp</PackageProjectUrl>
2222
<AssemblyName>ConvNetSharp.Flow</AssemblyName>
2323
<RootNamespace>ConvNetSharp.Flow</RootNamespace>
24-
<PackageReleaseNotes>https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.4</PackageReleaseNotes>
24+
<PackageReleaseNotes>https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.5</PackageReleaseNotes>
2525
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
2626
<Product>ConvNetSharp.Flow</Product>
27-
<AssemblyVersion>0.4.4.0</AssemblyVersion>
27+
<AssemblyVersion>0.4.5.0</AssemblyVersion>
2828
</PropertyGroup>
2929

3030
<ItemGroup>
3131
<Compile Remove="Properties\AssemblyInfo.cs" />
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="Cognitio.ConvNetSharp.Core" Version="0.4.4-alpha" />
36-
<PackageReference Include="Cognitio.ConvNetSharp.Volume" Version="0.4.4-alpha" />
35+
<PackageReference Include="Cognitio.ConvNetSharp.Core" Version="0.4.5-alpha" />
36+
<PackageReference Include="Cognitio.ConvNetSharp.Volume" Version="0.4.5-alpha" />
3737
</ItemGroup>
3838

3939
<ItemGroup>

‎src/ConvNetSharp.Volume.GPU/ConvNetSharp.Volume.GPU.Nuget.csproj‎

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
</PropertyGroup>
66

77
<PropertyGroup>
8-
<Version>0.4.4-alpha</Version>
9-
<FileVersion>0.4.4.0</FileVersion>
8+
<Version>0.4.5-alpha</Version>
9+
<FileVersion>0.4.5.0</FileVersion>
1010
<Authors>Cedric Bovar</Authors>
1111
<Description>Deep learning in C#</Description>
1212
<Copyright>Copyright (c) 2017</Copyright>
1313
</PropertyGroup>
1414

1515
<PropertyGroup>
1616
<PackageId>Cognitio.ConvNetSharp.Volume.GPU</PackageId>
17-
<PackageVersion>0.4.4-alpha</PackageVersion>
17+
<PackageVersion>0.4.5-alpha</PackageVersion>
1818
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
1919
<PackageTags>Deep Learning Convolution</PackageTags>
2020
<PackageLicenseUrl>https://github.com/cbovar/ConvNetSharp/blob/master/LICENSE</PackageLicenseUrl>
2121
<PackageProjectUrl>https://github.com/cbovar/ConvNetSharp</PackageProjectUrl>
2222
<AssemblyName>ConvNetSharp.Volume.GPU</AssemblyName>
2323
<RootNamespace>ConvNetSharp.Volume.GPU</RootNamespace>
24-
<AssemblyVersion>0.4.4.0</AssemblyVersion>
25-
<PackageReleaseNotes>https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.4</PackageReleaseNotes>
24+
<AssemblyVersion>0.4.5.0</AssemblyVersion>
25+
<PackageReleaseNotes>https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.5</PackageReleaseNotes>
2626
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
2727
</PropertyGroup>
2828

@@ -38,12 +38,38 @@
3838
<Compile Remove="Properties\AssemblyInfo.cs" />
3939
</ItemGroup>
4040

41+
<ItemGroup>
42+
<None Remove="Double\Kernels\div.cu" />
43+
<None Remove="Double\Kernels\exp.cu" />
44+
<None Remove="Double\Kernels\leakyrelu.cu" />
45+
<None Remove="Double\Kernels\leakyrelu_gradient.cu" />
46+
<None Remove="Double\Kernels\log.cu" />
47+
<None Remove="Single\Kernels\div.cu" />
48+
<None Remove="Single\Kernels\exp.cu" />
49+
<None Remove="Single\Kernels\leakyrelu.cu" />
50+
<None Remove="Single\Kernels\leakyrelu_gradient.cu" />
51+
<None Remove="Single\Kernels\log.cu" />
52+
</ItemGroup>
53+
54+
<ItemGroup>
55+
<EmbeddedResource Include="Double\Kernels\div.cu" />
56+
<EmbeddedResource Include="Double\Kernels\exp.cu" />
57+
<EmbeddedResource Include="Double\Kernels\leakyrelu.cu" />
58+
<EmbeddedResource Include="Double\Kernels\leakyrelu_gradient.cu" />
59+
<EmbeddedResource Include="Double\Kernels\log.cu" />
60+
<EmbeddedResource Include="Single\Kernels\div.cu" />
61+
<EmbeddedResource Include="Single\Kernels\exp.cu" />
62+
<EmbeddedResource Include="Single\Kernels\leakyrelu.cu" />
63+
<EmbeddedResource Include="Single\Kernels\leakyrelu_gradient.cu" />
64+
<EmbeddedResource Include="Single\Kernels\log.cu" />
65+
</ItemGroup>
66+
4167
<ItemGroup>
4268
<Folder Include="Properties\" />
4369
</ItemGroup>
4470

4571
<ItemGroup>
46-
<PackageReference Include="Cognitio.ConvNetSharp.Volume" Version="0.4.4-alpha" />
72+
<PackageReference Include="Cognitio.ConvNetSharp.Volume" Version="0.4.5-alpha" />
4773
<PackageReference Include="ManagedCuda-CudaDNN" Version="8.0.22" />
4874
<PackageReference Include="ManagedCuda-NVRTC" Version="8.0.22" />
4975
</ItemGroup>

‎src/ConvNetSharp.Volume.GPU/GpuContext.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Diagnostics;
33
using ManagedCuda;
4-
using ManagedCuda.CudaDNN;
54

65
namespace ConvNetSharp.Volume.GPU
76
{

‎src/ConvNetSharp.Volume.GPU/KernelLoader.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using System.IO;
44
using System.Linq;
55
using ManagedCuda;
6-
using ManagedCuda.BasicTypes;
76
using ManagedCuda.NVRTC;
87
using ManagedCuda.VectorTypes;
98

@@ -27,6 +26,11 @@ private void AddKernel(string name, CudaKernel kernel)
2726

2827
public void LoadKernel(string name, Stream stream)
2928
{
29+
if (stream == null)
30+
{
31+
throw new ArgumentException($"Couldn't load kernel '{name}'.", nameof(stream));
32+
}
33+
3034
using (StreamReader reader = new StreamReader(stream))
3135
{
3236
string result = reader.ReadToEnd();

‎src/ConvNetSharp.Volume/ConvNetSharp.Volume.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@
55
</PropertyGroup>
66

77
<PropertyGroup>
8-
<Version>0.4.4-alpha</Version>
9-
<FileVersion>0.4.4.0</FileVersion>
8+
<Version>0.4.5-alpha</Version>
9+
<FileVersion>0.4.5.0</FileVersion>
1010
<Authors>Cedric Bovar</Authors>
1111
<Description>Deep learning in C#</Description>
1212
<Copyright>Copyright (c) 2017</Copyright>
1313
</PropertyGroup>
1414

1515
<PropertyGroup>
1616
<PackageId>Cognitio.ConvNetSharp.Volume</PackageId>
17-
<PackageVersion>0.4.4-alpha</PackageVersion>
17+
<PackageVersion>0.4.5-alpha</PackageVersion>
1818
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
1919
<PackageTags>Deep Learning Convolution</PackageTags>
2020
<PackageLicenseUrl>https://github.com/cbovar/ConvNetSharp/blob/master/LICENSE</PackageLicenseUrl>
2121
<PackageProjectUrl>https://github.com/cbovar/ConvNetSharp</PackageProjectUrl>
2222
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
23-
<PackageReleaseNotes>https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.4</PackageReleaseNotes>
24-
<AssemblyVersion>0.4.4.0</AssemblyVersion>
23+
<PackageReleaseNotes>https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.5</PackageReleaseNotes>
24+
<AssemblyVersion>0.4.5.0</AssemblyVersion>
2525
</PropertyGroup>
2626

2727
<ItemGroup>

0 commit comments

Comments
 (0)