Remove EMGUCV

Webreaper · Mar 7, 2024 · 02238f7 · 02238f7
1 parent 6df6c38
commit 02238f7
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 6 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Damselfly.ML.FaceONNX/FaceONNXService.cs b/Damselfly.ML.FaceONNX/FaceONNXService.cs
@@ -10,6 +10,7 @@
 using FaceONNX;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Microsoft.ML.OnnxRuntime;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
 
@@ -46,7 +47,9 @@ public void StartService()
     {
         try
         {
-            // TODO: Load the faces from the DB and populate the embeddings
+            // TODO Add support for GPU
+            // using var options = useGPU ? SessionOptions.MakeSessionOptionWithCudaProvider(gpuId) : new SessionOptions();
+
             _faceDetector = new FaceDetector();
             _faceLandmarksExtractor = new FaceLandmarksExtractor();
             _faceEmbedder = new FaceEmbedder();

diff --git a/Damselfly.Web.Client/wwwroot/version.js b/Damselfly.Web.Client/wwwroot/version.js
@@ -1 +1 @@
-const CACHE_VERSION='4.1.0-20240307084346'
+const CACHE_VERSION='4.1.0-20240307094413'
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -17,6 +17,7 @@
     <PackageVersion Include="Emgu.CV.runtime.ubuntu.20.04-x64" Version="4.5.1.4349" />
     <PackageVersion Include="Emgu.CV.runtime.windows" Version="4.5.1.4349" />
     <PackageVersion Include="FaceONNX" Version="3.0.1.3" />
+    <PackageVersion Include="FaceONNX.Addons.Gpu" Version="3.0.1.3" />
     <PackageVersion Include="FluentValidation" Version="11.9.0" />
     <PackageVersion Include="font-awesome" Version="4.7.0" />
     <PackageVersion Include="Humanizer" Version="2.14.1" />

diff --git a/NuGet.config b/NuGet.config
@@ -2,15 +2,11 @@
   <packageSources>
     <clear />
     <add key="Nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="Local" value="./localPackages" />
   </packageSources>
 
   <packageSourceMapping>
     <packageSource key="Nuget.org">
       <package pattern="*" />
     </packageSource>
-    <packageSource key="Local">
-      <package pattern="EMGUCV*" />
-    </packageSource>
   </packageSourceMapping>
 </configuration>
diff --git a/localPackages/Emgu.CV.runtime.macos.4.5.1.4349.nupkg b/localPackages/Emgu.CV.runtime.macos.4.5.1.4349.nupkg
diff --git a/localPackages/Emgu.CV.runtime.macos.4.5.3.4721.nupkg b/localPackages/Emgu.CV.runtime.macos.4.5.3.4721.nupkg
diff --git a/localPackages/Emgu.CV.runtime.macos.4.5.4.4788.nupkg b/localPackages/Emgu.CV.runtime.macos.4.5.4.4788.nupkg
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		const CACHE_VERSION='4.1.0-20240307084346'
		const CACHE_VERSION='4.1.0-20240307094413'