Merge branch 'release/19.21.0.20220429'

takuya-takeuchi · Apr 29, 2022 · 295d1fa · 295d1fa
1 parent a03d925
commit 295d1fa
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 21 deletions.
diff --git a/examples/ASP.NET/FaceDetection.Client/FaceDetection.Client.csproj b/examples/ASP.NET/FaceDetection.Client/FaceDetection.Client.csproj
@@ -15,7 +15,7 @@
     <PackageReference Include="JsonSubTypes" Version="1.8.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Polly" Version="7.2.1" />
-    <PackageReference Include="RestSharp" Version="106.11.7" />
+    <PackageReference Include="RestSharp" Version="106.12.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="System.Drawing.Common" Version="5.0.1" />
   </ItemGroup>

diff --git a/examples/ASP.NET/FaceDetection.Server/FaceDetection.Server.csproj b/examples/ASP.NET/FaceDetection.Server/FaceDetection.Server.csproj
@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="DlibDotNet" Version="19.21.0.20201122" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.18" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.10" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
     <PackageReference Include="System.Drawing.Common" Version="5.0.1" />

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.21.0.20220130</version>
+    <version>19.21.0.20220429</version>
     <title>DlibDotNet</title>
     <authors>Takuya Takeuchi</authors>
     <owners>Takuya Takeuchi</owners>

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.21.0.20220130</version>
+    <version>19.21.0.20220429</version>
     <title>DlibDotNet for CUDA 10.0</title>
     <authors>Takuya Takeuchi</authors>
     <owners>Takuya Takeuchi</owners>

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.21.0.20220130</version>
+    <version>19.21.0.20220429</version>
     <title>DlibDotNet for CUDA 10.1</title>
     <authors>Takuya Takeuchi</authors>
     <owners>Takuya Takeuchi</owners>

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.21.0.20220130</version>
+    <version>19.21.0.20220429</version>
     <title>DlibDotNet for CUDA 10.2</title>
     <authors>Takuya Takeuchi</authors>
     <owners>Takuya Takeuchi</owners>

diff --git a/nuget/nuspec/DlibDotNet.CUDA-110.nuspec b/nuget/nuspec/DlibDotNet.CUDA-110.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>DlibDotNet.CUDA110</id>
-    <version>19.21.0.20220130</version>
+    <version>19.21.0.20220429</version>
     <title>DlibDotNet for CUDA 11.0</title>
     <authors>Takuya Takeuchi</authors>
     <owners>Takuya Takeuchi</owners>

diff --git a/nuget/nuspec/DlibDotNet.CUDA-111.nuspec b/nuget/nuspec/DlibDotNet.CUDA-111.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>DlibDotNet.CUDA111</id>
-    <version>19.21.0.20220130</version>
+    <version>19.21.0.20220429</version>
     <title>DlibDotNet for CUDA 11.1</title>
     <authors>Takuya Takeuchi</authors>
     <owners>Takuya Takeuchi</owners>

diff --git a/nuget/nuspec/DlibDotNet.CUDA-112.nuspec b/nuget/nuspec/DlibDotNet.CUDA-112.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>DlibDotNet.CUDA112</id>
-    <version>19.21.0.20220130</version>
+    <version>19.21.0.20220429</version>
     <title>DlibDotNet for CUDA 11.2</title>
     <authors>Takuya Takeuchi</authors>
     <owners>Takuya Takeuchi</owners>

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.21.0.20220130</version>
+    <version>19.21.0.20220429</version>
     <title>DlibDotNet for CUDA 9.2</title>
     <authors>Takuya Takeuchi</authors>
     <owners>Takuya Takeuchi</owners>

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.21.0.20220130</version>
+    <version>19.21.0.20220429</version>
     <title>DlibDotNet for MKL</title>
     <authors>Takuya Takeuchi</authors>
     <owners>Takuya Takeuchi</owners>

diff --git a/src/DlibDotNet.Native.Dnn/CMakeLists.txt b/src/DlibDotNet.Native.Dnn/CMakeLists.txt
@@ -25,7 +25,7 @@ message("-------------------------------------------------------")
 set(VERSION_MAJOR 19)
 set(VERSION_MINOR 21)
 set(VERSION_PATCH 0)
-set(VERSION_DATE 20220130)
+set(VERSION_DATE 20220429)
 
 # 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
@@ -25,7 +25,7 @@ message("-------------------------------------------------------")
 set(VERSION_MAJOR 19)
 set(VERSION_MINOR 21)
 set(VERSION_PATCH 0)
-set(VERSION_DATE 20220130)
+set(VERSION_DATE 20220429)
 
 # libjpeg-dev, libpng-dev 
 set(DLIB_JPEG_SUPPORT True)

diff --git a/src/DlibDotNet.Native/dlib/clustering/chinese_whispers.h b/src/DlibDotNet.Native/dlib/clustering/chinese_whispers.h
@@ -8,20 +8,26 @@
 using namespace dlib;
 using namespace std;
 
-DLLEXPORT unsigned long clustering_chinese_whispers(std::vector<sample_pair*>* edges,
-                                                    std::vector<unsigned long>* labels,
-                                                    const unsigned long num_iterations = 100)
+DLLEXPORT uint64_t clustering_chinese_whispers(std::vector<sample_pair*>* edges,
+                                               std::vector<uint32_t>* labels,
+                                               const uint32_t num_iterations = 100)
 {
     std::vector<sample_pair*>& e = *(static_cast<std::vector<sample_pair*>*>(edges));
     std::vector<sample_pair> edges_tmp;
-    for (int index = 0; index < e.size(); index++)
+    for (auto index = 0; index < e.size(); index++)
     {
         sample_pair& edge = *(static_cast<sample_pair*>(e[index]));
         edges_tmp.push_back(edge);
     }
 
-    std::vector<unsigned long>& l = *(static_cast<std::vector<unsigned long>*>(labels));
-    return dlib::chinese_whispers(edges_tmp, l, num_iterations);
+    // unsigned long is 4byte in windows but 8 byte in SILP64, ILP64, LP64 (UNIX/Linux, macOS/iOS)
+    std::vector<unsigned long> tmp;
+    const auto ret = dlib::chinese_whispers(edges_tmp, tmp, num_iterations);
+
+    for (auto index = 0; index < tmp.size(); index++)
+        labels->push_back(tmp[index]);
+
+    return ret;
 }
 
 #endif
diff --git a/src/DlibDotNet/Clustering/ChineseWhispers.cs b/src/DlibDotNet/Clustering/ChineseWhispers.cs
@@ -21,7 +21,7 @@ public static void ChineseWhispers(IEnumerable<SamplePair> edges, uint iteration
             using (var e = new StdVector<SamplePair>(edges))
             using (var l = new StdVector<uint>())
             {
-                clusters = NativeMethods.clustering_chinese_whispers(e.NativePtr, l.NativePtr, iterations);
+                clusters = (uint)NativeMethods.clustering_chinese_whispers(e.NativePtr, l.NativePtr, iterations);
                 labels = l.ToArray();
             }
         }

diff --git a/src/DlibDotNet/PInvoke/Clustering/ChineseWhispers.cs b/src/DlibDotNet/PInvoke/Clustering/ChineseWhispers.cs
@@ -9,7 +9,7 @@ internal sealed partial class NativeMethods
     {
 
         [DllImport(NativeLibrary, CallingConvention = CallingConvention)]
-        public static extern uint clustering_chinese_whispers(IntPtr edges, IntPtr labels, uint num_iterations);
+        public static extern ulong clustering_chinese_whispers(IntPtr edges, IntPtr labels, uint num_iterations);
 
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ internal sealed partial class NativeMethods @@
         {
             [DllImport(NativeLibrary, CallingConvention = CallingConvention)]
-            public static extern uint clustering_chinese_whispers(IntPtr edges, IntPtr labels, uint num_iterations);
+            public static extern ulong clustering_chinese_whispers(IntPtr edges, IntPtr labels, uint num_iterations);
         }
@@ Expand Down @@