Merge branch 'release/19.18.0.20200525'

takuya-takeuchi · May 26, 2020 · 8866b7f · 8866b7f
2 parents bcb400d + 3d93423
commit 8866b7f
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 22 deletions.
diff --git a/nuget/TestPackage.ps1 b/nuget/TestPackage.ps1
@@ -193,11 +193,11 @@ $tmp101.Add("$env:CUDA_PATH_V10_1\bin\curand64_10.dll")
 $tmp101.Add("$env:CUDA_PATH_V10_1\bin\cusolver64_10.dll")
 
 # For DlibDotNet.CUDA102
-$tmp101 = New-Object 'System.Collections.Generic.List[string]'
-$tmp101.Add("$env:CUDA_PATH_V10_2\bin\cublas64_10.dll")
-$tmp101.Add("$env:CUDA_PATH_V10_2\bin\cudnn64_7.dll")
-$tmp101.Add("$env:CUDA_PATH_V10_2\bin\curand64_10.dll")
-$tmp101.Add("$env:CUDA_PATH_V10_2\bin\cusolver64_10.dll")
+$tmp102 = New-Object 'System.Collections.Generic.List[string]'
+$tmp102.Add("$env:CUDA_PATH_V10_2\bin\cublas64_10.dll")
+$tmp102.Add("$env:CUDA_PATH_V10_2\bin\cudnn64_7.dll")
+$tmp102.Add("$env:CUDA_PATH_V10_2\bin\curand64_10.dll")
+$tmp102.Add("$env:CUDA_PATH_V10_2\bin\cusolver64_10.dll")
 
 # For mkl
 $tmpmkl = New-Object 'System.Collections.Generic.List[string]'
@@ -220,7 +220,7 @@ $BuildTargets += New-Object PSObject -Property @{PlatformTarget = "x64"; Archite
 $BuildTargets += New-Object PSObject -Property @{PlatformTarget = "x64"; Architecture = 64; Package = "DlibDotNet.CUDA92";  Dependencies = $tmp92    }
 $BuildTargets += New-Object PSObject -Property @{PlatformTarget = "x64"; Architecture = 64; Package = "DlibDotNet.CUDA100"; Dependencies = $tmp100   }
 $BuildTargets += New-Object PSObject -Property @{PlatformTarget = "x64"; Architecture = 64; Package = "DlibDotNet.CUDA101"; Dependencies = $tmp101   }
-$BuildTargets += New-Object PSObject -Property @{PlatformTarget = "x64"; Architecture = 64; Package = "DlibDotNet.CUDA102"; Dependencies = $tmp101   }
+$BuildTargets += New-Object PSObject -Property @{PlatformTarget = "x64"; Architecture = 64; Package = "DlibDotNet.CUDA102"; Dependencies = $tmp102   }
 $BuildTargets += New-Object PSObject -Property @{PlatformTarget = "x64"; Architecture = 64; Package = "DlibDotNet.MKL";     Dependencies = $tmpmkl   }
 $BuildTargets += New-Object PSObject -Property @{PlatformTarget = "x86"; Architecture = 32; Package = "DlibDotNet.MKL";     Dependencies = $tmpmkl86 }
 $BuildTargets += New-Object PSObject -Property @{PlatformTarget = "arm"; Architecture = 32; Package = "DlibDotNet.ARM";     Dependencies = $null     }

diff --git a/nuget/nuspec/DlibDotNet.CPU.nuspec b/nuget/nuspec/DlibDotNet.CPU.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>DlibDotNet</id>
-    <version>19.18.0.20200429</version>
+    <version>19.18.0.20200525</version>
     <title>DlibDotNet</title>
     <authors>Takuya Takeuchi</authors>
     <owners>Takuya Takeuchi</owners>
@@ -14,7 +14,7 @@
 
 Requirements: Visual C++ 2017 Redistributable Package</description>
     <releaseNotes></releaseNotes>
-    <copyright>© Takuya Takeuchi 2017-2019</copyright>
+    <copyright>© Takuya Takeuchi 2017-2020</copyright>
     <tags>dlib .net machinelearning</tags>
     <serviceable>true</serviceable>
   </metadata>

diff --git a/nuget/nuspec/DlibDotNet.CUDA-100.nuspec b/nuget/nuspec/DlibDotNet.CUDA-100.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>DlibDotNet.CUDA100</id>
-    <version>19.18.0.20200429</version>
+    <version>19.18.0.20200525</version>
     <title>DlibDotNet for CUDA 10.0</title>
     <authors>Takuya Takeuchi</authors>
     <owners>Takuya Takeuchi</owners>
@@ -14,7 +14,7 @@
 
 Requirements: Visual C++ 2017 Redistributable Package, cublas64_100.dll, cudnn64_7.dll, curand64_100.dll and cusolver64_100.dll</description>
     <releaseNotes></releaseNotes>
-    <copyright>© Takuya Takeuchi 2017-2019</copyright>
+    <copyright>© Takuya Takeuchi 2017-2020</copyright>
     <tags>dlib .net machinelearning</tags>
     <serviceable>true</serviceable>
   </metadata>

diff --git a/nuget/nuspec/DlibDotNet.CUDA-101.nuspec b/nuget/nuspec/DlibDotNet.CUDA-101.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>DlibDotNet.CUDA101</id>
-    <version>19.18.0.20200429</version>
+    <version>19.18.0.20200525</version>
     <title>DlibDotNet for CUDA 10.1</title>
     <authors>Takuya Takeuchi</authors>
     <owners>Takuya Takeuchi</owners>
@@ -14,7 +14,7 @@
 
 Requirements: Visual C++ 2017 Redistributable Package, cublas64_10.dll, cudnn64_7.dll, curand64_10.dll and cusolver64_10.dll</description>
     <releaseNotes></releaseNotes>
-    <copyright>© Takuya Takeuchi 2017-2019</copyright>
+    <copyright>© Takuya Takeuchi 2017-2020</copyright>
     <tags>dlib .net machinelearning</tags>
     <serviceable>true</serviceable>
   </metadata>

diff --git a/nuget/nuspec/DlibDotNet.CUDA-102.nuspec b/nuget/nuspec/DlibDotNet.CUDA-102.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>DlibDotNet.CUDA102</id>
-    <version>19.18.0.20200429</version>
+    <version>19.18.0.20200525</version>
     <title>DlibDotNet for CUDA 10.2</title>
     <authors>Takuya Takeuchi</authors>
     <owners>Takuya Takeuchi</owners>
@@ -14,7 +14,7 @@
 
 Requirements: Visual C++ 2017 Redistributable Package, cublas64_10.dll, cudnn64_7.dll, curand64_10.dll and cusolver64_10.dll</description>
     <releaseNotes></releaseNotes>
-    <copyright>© Takuya Takeuchi 2017-2019</copyright>
+    <copyright>© Takuya Takeuchi 2017-2020</copyright>
     <tags>dlib .net machinelearning</tags>
     <serviceable>true</serviceable>
   </metadata>

diff --git a/nuget/nuspec/DlibDotNet.CUDA-92.nuspec b/nuget/nuspec/DlibDotNet.CUDA-92.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>DlibDotNet.CUDA92</id>
-    <version>19.18.0.20200429</version>
+    <version>19.18.0.20200525</version>
     <title>DlibDotNet for CUDA 9.2</title>
     <authors>Takuya Takeuchi</authors>
     <owners>Takuya Takeuchi</owners>
@@ -14,7 +14,7 @@
 
 Requirements: Visual C++ 2017 Redistributable Package, cublas64_92.dll, cudnn64_7.dll, curand64_92.dll and cusolver64_92.dll</description>
     <releaseNotes></releaseNotes>
-    <copyright>© Takuya Takeuchi 2017-2019</copyright>
+    <copyright>© Takuya Takeuchi 2017-2020</copyright>
     <tags>dlib .net machinelearning</tags>
     <serviceable>true</serviceable>
   </metadata>

diff --git a/nuget/nuspec/DlibDotNet.MKL.nuspec b/nuget/nuspec/DlibDotNet.MKL.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>DlibDotNet.MKL</id>
-    <version>19.18.0.20200429</version>
+    <version>19.18.0.20200525</version>
     <title>DlibDotNet for MKL</title>
     <authors>Takuya Takeuchi</authors>
     <owners>Takuya Takeuchi</owners>
@@ -15,7 +15,7 @@
 Requirements: Visual C++ 2017 Redistributable Package and Intel MKL 2019 Initial Release
 </description>
     <releaseNotes></releaseNotes>
-    <copyright>© Takuya Takeuchi 2017-2019</copyright>
+    <copyright>© Takuya Takeuchi 2017-2020</copyright>
     <tags>dlib .net machinelearning</tags>
     <serviceable>true</serviceable>
   </metadata>

diff --git a/nuget/nuspec/DlibDotNet.UWP.nuspec b/nuget/nuspec/DlibDotNet.UWP.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>DlibDotNet.UWP</id>
-    <version>19.18.0.20200429</version>
+    <version>19.18.0.20200525</version>
     <title>DlibDotNet for UWP</title>
     <authors>Takuya Takeuchi</authors>
     <owners>Takuya Takeuchi</owners>
@@ -13,7 +13,7 @@
     <description>Dlib wrapper library written in C++ and C# for Windows Universal Application
 </description>
     <releaseNotes></releaseNotes>
-    <copyright>© Takuya Takeuchi 2017-2019</copyright>
+    <copyright>© Takuya Takeuchi 2017-2020</copyright>
     <tags>dlib .net machinelearning</tags>
     <serviceable>true</serviceable>
   </metadata>

diff --git a/src/DlibDotNet.Native.Dnn/CMakeLists.txt b/src/DlibDotNet.Native.Dnn/CMakeLists.txt
@@ -24,7 +24,7 @@ message("-------------------------------------------------------")
 set(VERSION_MAJOR 19)
 set(VERSION_MINOR 18)
 set(VERSION_PATCH 0)
-set(VERSION_DATE 20200429)
+set(VERSION_DATE 20200525)
 
 # Only GCC requires -fPIC
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")

diff --git a/src/DlibDotNet.Native/CMakeLists.txt b/src/DlibDotNet.Native/CMakeLists.txt
@@ -24,7 +24,7 @@ message("-------------------------------------------------------")
 set(VERSION_MAJOR 19)
 set(VERSION_MINOR 18)
 set(VERSION_PATCH 0)
-set(VERSION_DATE 20200429)
+set(VERSION_DATE 20200525)
 
 # libjpeg-dev, libpng-dev 
 set(DLIB_JPEG_SUPPORT True)

diff --git a/src/DlibDotNet.Native/dlib/svm/krls.h b/src/DlibDotNet.Native/dlib/svm/krls.h
@@ -223,6 +223,7 @@ DLLEXPORT int serialize_krls(svm_kernel_type kernel_type,
                              const int templateColumns,
                              void* krls,
                              const char* file_name,
+                             const int32_t file_name_length,
                              std::string** error_message)
 {
     int error = ERR_OK;
@@ -249,6 +250,7 @@ DLLEXPORT int serialize_krls(svm_kernel_type kernel_type,
 }
 
 DLLEXPORT int deserialize_krls(const char* file_name,
+                               const int32_t file_name_length,
                                svm_kernel_type kernel_type,
                                matrix_element_type type,
                                const int templateRows,