diff --git a/.DS_Store b/.DS_Store index 153f55c2..8ff7048f 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Damselfly.ML.FaceONNX/FaceONNXService.cs b/Damselfly.ML.FaceONNX/FaceONNXService.cs index fb649a50..79b5ac4f 100644 --- 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 index 1d5abe19..e52b9fed 100644 --- 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 index 7d072109..d1e3b93c 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -17,6 +17,7 @@ + diff --git a/NuGet.config b/NuGet.config index dca8b86b..1209d094 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,15 +2,11 @@ - - - - diff --git a/localPackages/Emgu.CV.runtime.macos.4.5.1.4349.nupkg b/localPackages/Emgu.CV.runtime.macos.4.5.1.4349.nupkg deleted file mode 100644 index f445c269..00000000 Binary files a/localPackages/Emgu.CV.runtime.macos.4.5.1.4349.nupkg and /dev/null differ diff --git a/localPackages/Emgu.CV.runtime.macos.4.5.3.4721.nupkg b/localPackages/Emgu.CV.runtime.macos.4.5.3.4721.nupkg deleted file mode 100644 index bada61ba..00000000 Binary files a/localPackages/Emgu.CV.runtime.macos.4.5.3.4721.nupkg and /dev/null differ diff --git a/localPackages/Emgu.CV.runtime.macos.4.5.4.4788.nupkg b/localPackages/Emgu.CV.runtime.macos.4.5.4.4788.nupkg deleted file mode 100644 index 496bbc3f..00000000 Binary files a/localPackages/Emgu.CV.runtime.macos.4.5.4.4788.nupkg and /dev/null differ