From f07451603644bdc1a583d2a6a448e7d69038cd11 Mon Sep 17 00:00:00 2001 From: cbovar Date: Sun, 25 Feb 2018 12:48:16 +0800 Subject: [PATCH 1/8] custom kernels as embedded resources --- .../ConvNetSharp.Volume.GPU.Nuget.csproj | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/ConvNetSharp.Volume.GPU/ConvNetSharp.Volume.GPU.Nuget.csproj b/src/ConvNetSharp.Volume.GPU/ConvNetSharp.Volume.GPU.Nuget.csproj index c171735a..da3ff675 100644 --- a/src/ConvNetSharp.Volume.GPU/ConvNetSharp.Volume.GPU.Nuget.csproj +++ b/src/ConvNetSharp.Volume.GPU/ConvNetSharp.Volume.GPU.Nuget.csproj @@ -38,6 +38,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + From 9e43de515fec9a21984bc9c90987fb26b80f4d1e Mon Sep 17 00:00:00 2001 From: cbovar Date: Sun, 25 Feb 2018 12:57:45 +0800 Subject: [PATCH 2/8] Better exception message when kernel cannot be loaded --- src/ConvNetSharp.Volume.GPU/KernelLoader.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ConvNetSharp.Volume.GPU/KernelLoader.cs b/src/ConvNetSharp.Volume.GPU/KernelLoader.cs index 8a55e206..87ccc0de 100644 --- 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(); From 355043789b789570517d7c4b59fae36253a7e531 Mon Sep 17 00:00:00 2001 From: cbovar Date: Sun, 25 Feb 2018 13:00:38 +0800 Subject: [PATCH 3/8] package 0.4.5 --- src/ConvNetSharp.Volume/ConvNetSharp.Volume.csproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ConvNetSharp.Volume/ConvNetSharp.Volume.csproj b/src/ConvNetSharp.Volume/ConvNetSharp.Volume.csproj index 14dbac89..4974ceb2 100644 --- a/src/ConvNetSharp.Volume/ConvNetSharp.Volume.csproj +++ b/src/ConvNetSharp.Volume/ConvNetSharp.Volume.csproj @@ -5,8 +5,8 @@ - 0.4.4-alpha - 0.4.4.0 + 0.4.5-alpha + 0.4.5.0 Cedric Bovar Deep learning in C# Copyright (c) 2017 @@ -14,14 +14,14 @@ Cognitio.ConvNetSharp.Volume - 0.4.4-alpha + 0.4.5-alpha false Deep Learning Convolution https://github.com/cbovar/ConvNetSharp/blob/master/LICENSE https://github.com/cbovar/ConvNetSharp True - https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.4 - 0.4.4.0 + https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.5 + 0.4.5.0 From 012a51830bd3440ad47e8630fe53690f3cf995f5 Mon Sep 17 00:00:00 2001 From: cbovar Date: Sun, 25 Feb 2018 13:51:07 +0800 Subject: [PATCH 4/8] update references --- src/ConvNetSharp.Core/ConvNetSharp.Core.Nuget.csproj | 2 +- src/ConvNetSharp.Flow/ConvNetSharp.Flow.Nuget.csproj | 2 +- .../ConvNetSharp.Volume.GPU.Nuget.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ConvNetSharp.Core/ConvNetSharp.Core.Nuget.csproj b/src/ConvNetSharp.Core/ConvNetSharp.Core.Nuget.csproj index a013fba8..7d09bdb7 100644 --- a/src/ConvNetSharp.Core/ConvNetSharp.Core.Nuget.csproj +++ b/src/ConvNetSharp.Core/ConvNetSharp.Core.Nuget.csproj @@ -31,7 +31,7 @@ - + diff --git a/src/ConvNetSharp.Flow/ConvNetSharp.Flow.Nuget.csproj b/src/ConvNetSharp.Flow/ConvNetSharp.Flow.Nuget.csproj index e46afde1..47f611de 100644 --- a/src/ConvNetSharp.Flow/ConvNetSharp.Flow.Nuget.csproj +++ b/src/ConvNetSharp.Flow/ConvNetSharp.Flow.Nuget.csproj @@ -33,7 +33,7 @@ - + diff --git a/src/ConvNetSharp.Volume.GPU/ConvNetSharp.Volume.GPU.Nuget.csproj b/src/ConvNetSharp.Volume.GPU/ConvNetSharp.Volume.GPU.Nuget.csproj index da3ff675..e0b59ae3 100644 --- a/src/ConvNetSharp.Volume.GPU/ConvNetSharp.Volume.GPU.Nuget.csproj +++ b/src/ConvNetSharp.Volume.GPU/ConvNetSharp.Volume.GPU.Nuget.csproj @@ -69,7 +69,7 @@ - + From 708ba91ec05cb606661a88a3cd0c3d2f406acdf1 Mon Sep 17 00:00:00 2001 From: cbovar Date: Sun, 25 Feb 2018 13:57:50 +0800 Subject: [PATCH 5/8] v0.4.5 --- src/ConvNetSharp.Core/ConvNetSharp.Core.Nuget.csproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ConvNetSharp.Core/ConvNetSharp.Core.Nuget.csproj b/src/ConvNetSharp.Core/ConvNetSharp.Core.Nuget.csproj index 7d09bdb7..0432a12e 100644 --- a/src/ConvNetSharp.Core/ConvNetSharp.Core.Nuget.csproj +++ b/src/ConvNetSharp.Core/ConvNetSharp.Core.Nuget.csproj @@ -5,8 +5,8 @@ - 0.4.4-alpha - 0.4.4.0 + 0.4.5-alpha + 0.4.5.0 Cedric Bovar Deep learning in C# Copyright (c) 2017 @@ -14,16 +14,16 @@ Cognitio.ConvNetSharp.Core - 0.4.4-alpha + 0.4.5-alpha false Deep Learning Convolution https://github.com/cbovar/ConvNetSharp/blob/master/LICENSE https://github.com/cbovar/ConvNetSharp ConvNetSharp.Core ConvNetSharp.Core - https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.4 + https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.5 True - 0.4.4.0 + 0.4.5.0 From 27e7bf61207c583c086996838a6477edee9940c2 Mon Sep 17 00:00:00 2001 From: cbovar Date: Sun, 25 Feb 2018 14:16:24 +0800 Subject: [PATCH 6/8] update references --- src/ConvNetSharp.Flow/ConvNetSharp.Flow.Nuget.csproj | 2 +- .../ConvNetSharp.Volume.GPU.Nuget.csproj | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ConvNetSharp.Flow/ConvNetSharp.Flow.Nuget.csproj b/src/ConvNetSharp.Flow/ConvNetSharp.Flow.Nuget.csproj index 47f611de..c617dce3 100644 --- a/src/ConvNetSharp.Flow/ConvNetSharp.Flow.Nuget.csproj +++ b/src/ConvNetSharp.Flow/ConvNetSharp.Flow.Nuget.csproj @@ -32,7 +32,7 @@ - + diff --git a/src/ConvNetSharp.Volume.GPU/ConvNetSharp.Volume.GPU.Nuget.csproj b/src/ConvNetSharp.Volume.GPU/ConvNetSharp.Volume.GPU.Nuget.csproj index e0b59ae3..8dd994b8 100644 --- a/src/ConvNetSharp.Volume.GPU/ConvNetSharp.Volume.GPU.Nuget.csproj +++ b/src/ConvNetSharp.Volume.GPU/ConvNetSharp.Volume.GPU.Nuget.csproj @@ -5,8 +5,8 @@ - 0.4.4-alpha - 0.4.4.0 + 0.4.5-alpha + 0.4.5.0 Cedric Bovar Deep learning in C# Copyright (c) 2017 @@ -14,15 +14,15 @@ Cognitio.ConvNetSharp.Volume.GPU - 0.4.4-alpha + 0.4.5-alpha false Deep Learning Convolution https://github.com/cbovar/ConvNetSharp/blob/master/LICENSE https://github.com/cbovar/ConvNetSharp ConvNetSharp.Volume.GPU ConvNetSharp.Volume.GPU - 0.4.4.0 - https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.4 + 0.4.5.0 + https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.5 True From 96ed3995ed4d9d8b54691cb2b771fa958704fea6 Mon Sep 17 00:00:00 2001 From: cbovar Date: Sun, 25 Feb 2018 14:16:37 +0800 Subject: [PATCH 7/8] remove useless import --- src/ConvNetSharp.Volume.GPU/GpuContext.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ConvNetSharp.Volume.GPU/GpuContext.cs b/src/ConvNetSharp.Volume.GPU/GpuContext.cs index 267a198b..b5a84df6 100644 --- 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 { From ad50e35be06acd1aaae25065d77960ab80ac77be Mon Sep 17 00:00:00 2001 From: cbovar Date: Sun, 25 Feb 2018 14:19:15 +0800 Subject: [PATCH 8/8] v0.4.5 --- src/ConvNetSharp.Flow/ConvNetSharp.Flow.Nuget.csproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ConvNetSharp.Flow/ConvNetSharp.Flow.Nuget.csproj b/src/ConvNetSharp.Flow/ConvNetSharp.Flow.Nuget.csproj index c617dce3..640bea8b 100644 --- a/src/ConvNetSharp.Flow/ConvNetSharp.Flow.Nuget.csproj +++ b/src/ConvNetSharp.Flow/ConvNetSharp.Flow.Nuget.csproj @@ -5,8 +5,8 @@ - 0.4.4-alpha - 0.4.4.0 + 0.4.5-alpha + 0.4.5.0 Cedric Bovar Deep learning in C# Copyright (c) 2017 @@ -14,17 +14,17 @@ Cognitio.ConvNetSharp.Flow - 0.4.4-alpha + 0.4.5-alpha false Deep Learning Convolution https://github.com/cbovar/ConvNetSharp/blob/master/LICENSE https://github.com/cbovar/ConvNetSharp ConvNetSharp.Flow ConvNetSharp.Flow - https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.4 + https://github.com/cbovar/ConvNetSharp/releases/tag/v0.4.5 True ConvNetSharp.Flow - 0.4.4.0 + 0.4.5.0