diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..f52f159 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,139 @@ +stages: + - build + - package + - test + +build:win: + stage: build + before_script: + - chcp 65001 + - git submodule update --init --recursive + - "Get-ChildItem env:" + script: + - cd nuget + - git clean -fxd . + - pwsh BuildWindows.ps1 + tags: + - windows + - cuda + artifacts: + paths: + - nuget/artifacts + +build:cent: + stage: build + before_script: + - git submodule update --init --recursive + - export + script: + - cd nuget + - pwsh BuildCentOS7.ps1 + tags: + - linux + - cuda + artifacts: + paths: + - nuget/artifacts + +build:ubuntu: + stage: build + before_script: + - git submodule update --init --recursive + - export + script: + - cd nuget + - pwsh BuildUbuntu16.ps1 + tags: + - linux + - cuda + artifacts: + paths: + - nuget/artifacts + +build:osx: + stage: build + before_script: + - git submodule update --init --recursive + - export + script: + - cd nuget + - pwsh BuildOSX.ps1 + tags: + - osx + artifacts: + paths: + - nuget/artifacts + +package: + stage: package + before_script: + - chcp 65001 + script: + - cd nuget + - pwsh CreateAllPackage.ps1 + tags: + - windows + dependencies: + - build:win + - build:ubuntu + - build:cent + - build:osx + artifacts: + paths: + - nuget/*.nupkg + +test:win: + stage: test + before_script: + - chcp 65001 + script: + - cd nuget + - pwsh TestPackageWindows.ps1 + tags: + - windows + dependencies: + - package + artifacts: + paths: + - nuget/artifacts/test + +test:cent: + stage: test + script: + - cd nuget + - pwsh TestPackageCentOS7.ps1 + tags: + - linux + - cuda + dependencies: + - package + artifacts: + paths: + - nuget/artifacts/test + +test:ubuntu: + stage: test + script: + - cd nuget + - pwsh TestPackageUbuntu16.ps1 + tags: + - linux + - cuda + dependencies: + - package + artifacts: + paths: + - nuget/artifacts/test + +test:osx: + stage: test + script: + - cd nuget + - pwsh TestPackageOSX.ps1 + tags: + - osx + dependencies: + - package + artifacts: + paths: + - nuget/artifacts/test diff --git a/.gitmodules b/.gitmodules index ca43d1a..5bb0c3b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "src/DlibDotNet"] path = src/DlibDotNet - url = https://github.com/takuya-takeuchi/DlibDotNet \ No newline at end of file + url = https://github.com/takuya-takeuchi/DlibDotNet + ignore = dirty \ No newline at end of file diff --git a/ExecuteTest.ps1 b/ExecuteTest.ps1 index e43e1bd..e39e0fb 100644 --- a/ExecuteTest.ps1 +++ b/ExecuteTest.ps1 @@ -1,4 +1,4 @@ -$CodecovVersion = "1.10.0" +$CodecovVersion = "1.12.4" # check Codecov Token $token = $env:CODECOV_TOKEN @@ -19,7 +19,7 @@ dotnet add test\FaceRecognitionDotNet.Tests\FaceRecognitionDotNet.Tests.csproj p Write-Host "Start Test and collect Coverage." -ForegroundColor Green # https://github.com/tonerdo/coverlet/blob/master/Documentation/MSBuildIntegration.md -dotnet test test\FaceRecognitionDotNet.Tests\FaceRecognitionDotNet.Tests.csproj ` +dotnet test test\FaceRecognitionDotNet.Tests\FaceRecognitionDotNet.Tests.csproj -v=normal ` /p:CollectCoverage=true ` /p:CoverletOutputFormat=opencover ` /p:Exclude="[DlibDotNet]*" diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index f536df5..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,373 +0,0 @@ -#!groovy - -def errorMessage - -def getGitUrl() -{ - return "https://github.com/takuya-takeuchi/FaceRecognitionDotNet" -} - -def getGitBranch() -{ - return "develop" -} - -def getSource() -{ - def work - def faceRecognitionDotNet - def gitUrl = getGitUrl() - def gitBranch = getGitBranch() - - if(isUnix()) - { - work = env.WORKSPACE + "/work" - faceRecognitionDotNet = work + "/FaceRecognitionDotNet" - - echo 'work: ' + work - echo 'faceRecognitionDotNet: ' + faceRecognitionDotNet - - if (!fileExists(work)) - { - sh 'mkdir -p ' + work - } - - if (!fileExists(faceRecognitionDotNet)) - { - dir(work) - { - sh "git clone -b ${gitBranch} ${gitUrl}" - } - } - } - else - { - work = env.WORKSPACE + "\\work" - faceRecognitionDotNet = work + "\\FaceRecognitionDotNet" - - echo 'work: ' + work - echo 'faceRecognitionDotNet: ' + faceRecognitionDotNet - - if (!fileExists(work)) - { - bat 'mkdir ' + work - } - - if (!fileExists(faceRecognitionDotNet)) - { - dir(work) - { - bat "git clone -b ${gitBranch} ${gitUrl}" - } - } - } - - return faceRecognitionDotNet -} - -def initialize(root) -{ - def gitBranch = getGitBranch() - - dir(root) - { - if(isUnix()) - { - sh 'git clean -fxd nuget' - sh 'git checkout .' - sh "git checkout ${gitBranch}" - sh "git pull origin ${gitBranch}" - sh './Initialize.sh' - } - else - { - bat 'git clean -fxd nuget' - bat 'git checkout .' - bat "git checkout ${gitBranch}" - bat "git pull origin ${gitBranch}" - bat 'Initialize.bat' - } - } -} - -def preparation() -{ - def faceRecognitionDotNet = getSource() - initialize(faceRecognitionDotNet) -} - -def getNugetDir(faceRecognitionDotNet) -{ - if(isUnix()) - { - return faceRecognitionDotNet + "/nuget" - } - else - { - return faceRecognitionDotNet + "\\nuget" - } -} - -def getDockerDir(faceRecognitionDotNet) -{ - if(isUnix()) - { - return faceRecognitionDotNet + "/src/DlibDotNet/docker" - } - else - { - return faceRecognitionDotNet + "\\src\\DlibDotNet\\docker" - } -} - -def getArtifactsDir(faceRecognitionDotNet) -{ - if(isUnix()) - { - return getNugetDir(faceRecognitionDotNet) + "/artifacts" - } - else - { - return getNugetDir(faceRecognitionDotNet) + "\\artifacts" - } -} - -def buildContainer() -{ - def faceRecognitionDotNet - def buildWorkSpace - - stage("Initialize") - { - faceRecognitionDotNet = getSource() - initialize(faceRecognitionDotNet) - } - - stage('Build DlibDotNet Container') - { - buildWorkSpace = getDockerDir(faceRecognitionDotNet) - dir(buildWorkSpace) - { - if(isUnix()) - { - sh 'pwsh build_devel.ps1' - sh 'pwsh build_runtime.ps1' - } - else - { - bat 'pwsh build_devel.ps1' - bat 'pwsh build_runtime.ps1' - } - } - } -} - -def test(script, stashName) -{ - echo 'script: ' + script - echo 'stashName: ' + stashName - - def faceRecognitionDotNet - def buildWorkSpace - def artifactsSpace - - stage("Initialize") - { - faceRecognitionDotNet = getSource() - initialize(faceRecognitionDotNet) - } - - stage('Test') - { - buildWorkSpace = getNugetDir(faceRecognitionDotNet) - artifactsSpace = getArtifactsDir(faceRecognitionDotNet) - - dir(buildWorkSpace) - { - if(isUnix()) - { - unstash 'nupkg' - sh 'git checkout .' - sh script - } - else - { - unstash 'nupkg' - bat 'git checkout .' - bat script - } - } - } - - stage('Results') - { - dir(buildWorkSpace) - { - stash name: stashName, includes: 'artifacts/test/**/*.trx', excludes: '*.log' - } - } -} - -node('master') -{ - try - { - def props - stage("Preparation") - { - if(isUnix()) - { - def file = env.JENKINS_HOME + '/FaceRecognitionDotNet.json' - props = readJSON file: file - } - else - { - def file = env.JENKINS_HOME + '\\FaceRecognitionDotNet.json' - props = readJSON file: file - } - } - - stage("Build Container") - { - def nodeName = props['build-container']['linux-node'] - node(nodeName) - { - buildContainer() - } - } - - stage("Packaging") - { - def nodeName = props['packaging']['node'] - node(nodeName) - { - echo 'Get source code' - def faceRecognitionDotNet = getSource() - initialize(faceRecognitionDotNet) - - buildWorkSpace = getNugetDir(faceRecognitionDotNet) - artifactsSpace = getArtifactsDir(faceRecognitionDotNet) - - echo 'Create packages' - dir(buildWorkSpace) - { - stage('Build FaceRecognitionDotNet Source') - { - bat 'BuildNuspec.Pre.bat' - } - - stage('Build Native FaceRecognitionDotNet Source') - { - parallel 'CPU': - { - stage('Build FaceRecognitionDotNet.CPU') - { - bat 'BuildNuspec.CPU.bat' - } - }, 'CUDA': { - stage('Build FaceRecognitionDotNet.CUDA') - { - bat 'BuildNuspec.CUDA.bat' - } - }, 'MKL': { - stage('Build FaceRecognitionDotNet.MKL') - { - bat 'BuildNuspec.MKL.bat' - } - }, 'ARM': { - stage('Build FaceRecognitionDotNet.ARM') - { - bat 'BuildNuspec.ARM.bat' - } - } - } - - stash name: 'nupkg', includes: '**/*.nupkg' - } - } - } - - stage("Test") - { - def builders = [:] - - builders['windows'] = - { - def nodeName = props['test']['windows-node'] - node(nodeName) - { - echo 'Test on Windows' - test('pwsh TestPackageWindows.ps1 ' + params.Version, 'test-windows') - } - } - builders['linux'] = - { - def nodeName = props['test']['linux-node'] - node(nodeName) - { - echo 'Test on Linux' - test('pwsh TestPackageUbuntu16.ps1 ' + params.Version, 'test-linux') - } - } - // builders['linux-arm'] = - // { - // def nodeName = props['test']['linux-arm-node'] - // node(nodeName) - // { - // echo 'Test on Linux-ARM' - // withEnv(["PATH+LOCAL=/usr/local/share/dotnet"]) - // { - // test('./TestPackageRaspberryPi.sh ' + params.Version, 'test-linux-arm') - // } - // } - // } - builders['osx'] = - { - def nodeName = props['test']['osx-node'] - node(nodeName) - { - echo 'Test on OSX' - withEnv(["PATH+LOCAL=/usr/local/bin:/usr/local/share/dotnet"]) - { - test('pwsh TestPackageOSX.ps1 ' + params.Version, 'test-osx') - } - } - } - - parallel builders - } - - stage("result") - { - def nodeName = props['packaging']['node'] - node(nodeName) - { - dir(buildWorkSpace) - { - unstash 'nupkg' - unstash 'test-windows' - unstash 'test-linux' - // unstash 'test-linux-arm' - unstash 'test-osx' - - archiveArtifacts artifacts: 'artifacts/test/**/*.*' - archiveArtifacts artifacts: '*.nupkg' - } - } - } - } - catch (err) - { - errorMessage = "${err}" - currentBuild.result = "FAILURE" - - echo errorMessage - } - finally - { - if(currentBuild.result != "FAILURE") - { - currentBuild.result = "SUCCESS" - } - } -} \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt index f39afbc..6baedb6 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018-2020 Takuya Takeuchi +Copyright (c) 2018-2021 Takuya Takeuchi Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index a72898d..8fbb426 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,12 @@ This package supports cross platform, Windows, Linux and MacOSX!! |FaceRecognitionDotNet for CUDA 10.2|Windows|-|✓|-|-|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.CUDA102.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet.CUDA102)| ||Linux|-|✓|-|-|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.CUDA102.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet.CUDA102)| ||OSX|-|-|-|-|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.CUDA102.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet.CUDA102)| +|FaceRecognitionDotNet for CUDA 11.0|Windows|-|✓|-|-|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.CUDA110.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet.CUDA110)| +||Linux|-|✓|-|-|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.CUDA110.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet.CUDA110)| +||OSX|-|-|-|-|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.CUDA110.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet.CUDA110)| +|FaceRecognitionDotNet for CUDA 11.1|Windows|-|✓|-|-|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.CUDA111.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet.CUDA111)| +||Linux|-|✓|-|-|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.CUDA111.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet.CUDA111)| +||OSX|-|-|-|-|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.CUDA111.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet.CUDA111)| |FaceRecognitionDotNet for Intel MKL|Windows|-|✓|-|-|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.MKL.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet.MKL)| ||Linux|-|✓|-|-|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.MKL.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet.MKL)| ||OSX|-|✓|-|-|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.MKL.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet.MKL)| @@ -40,7 +46,7 @@ This package supports cross platform, Windows, Linux and MacOSX!! |face_distance|FaceDistance|| |face_encodings|FaceEncodings|| |face_landmarks|FaceLandmarks|And support **Helen dataset** :warning:| -|face_locations|FaceLocations|| +|face_locations|FaceLocations|And support to get confidence and use custom face detector| |load_image_file|LoadImageFile|| |-|CropFaces|Crop image with specified locations| |-|EyeBlinkDetect|Detect person is blinking or not
Support Large model and **Helen dataset** :warning:| diff --git a/nuget/docker/build/centos/7/Dockerfile b/docker/build/centos/7/Dockerfile similarity index 92% rename from nuget/docker/build/centos/7/Dockerfile rename to docker/build/centos/7/Dockerfile index 8fc4123..049b5cc 100644 --- a/nuget/docker/build/centos/7/Dockerfile +++ b/docker/build/centos/7/Dockerfile @@ -14,7 +14,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364 # Verify that the binary works && gosu nobody true -RUN yum update -y && yum install -y \ +RUN yum update -y --disablerepo=cuda,nvidia-ml && yum install -y \ git \ && yum clean all diff --git a/nuget/docker/build/centos/7/runBuild.sh b/docker/build/centos/7/runBuild.sh similarity index 100% rename from nuget/docker/build/centos/7/runBuild.sh rename to docker/build/centos/7/runBuild.sh diff --git a/nuget/docker/build/ubuntu/16/Dockerfile b/docker/build/ubuntu/16/Dockerfile similarity index 100% rename from nuget/docker/build/ubuntu/16/Dockerfile rename to docker/build/ubuntu/16/Dockerfile diff --git a/nuget/docker/build/ubuntu/16/runBuild.sh b/docker/build/ubuntu/16/runBuild.sh similarity index 100% rename from nuget/docker/build/ubuntu/16/runBuild.sh rename to docker/build/ubuntu/16/runBuild.sh diff --git a/nuget/docker/test/centos/7/Dockerfile b/docker/test/centos/7/Dockerfile similarity index 100% rename from nuget/docker/test/centos/7/Dockerfile rename to docker/test/centos/7/Dockerfile diff --git a/nuget/docker/test/centos/7/runTest.sh b/docker/test/centos/7/runTest.sh similarity index 80% rename from nuget/docker/test/centos/7/runTest.sh rename to docker/test/centos/7/runTest.sh index e82dfc8..b79e619 100644 --- a/nuget/docker/test/centos/7/runTest.sh +++ b/docker/test/centos/7/runTest.sh @@ -19,4 +19,4 @@ NUGETDIR=${FRDNROOT}/nuget cd ${NUGETDIR} -exec /usr/local/bin/gosu NON_ROOT_USER pwsh ./TestPackage.ps1 $PACKAGE $VERSION $OS $OSVERSION \ No newline at end of file +exec /usr/local/bin/gosu $NON_ROOT_USER pwsh ./TestPackage.ps1 $PACKAGE $VERSION $OS $OSVERSION \ No newline at end of file diff --git a/nuget/docker/test/ubuntu/16/Dockerfile b/docker/test/ubuntu/16/Dockerfile similarity index 100% rename from nuget/docker/test/ubuntu/16/Dockerfile rename to docker/test/ubuntu/16/Dockerfile diff --git a/nuget/docker/test/ubuntu/16/runTest.sh b/docker/test/ubuntu/16/runTest.sh similarity index 100% rename from nuget/docker/test/ubuntu/16/runTest.sh rename to docker/test/ubuntu/16/runTest.sh diff --git a/examples/Benchmark/Program.cs b/examples/Benchmark/Program.cs index 904d637..422dacd 100644 --- a/examples/Benchmark/Program.cs +++ b/examples/Benchmark/Program.cs @@ -17,7 +17,9 @@ internal class Program #region Fields - private static FaceRecognition FaceRecognition; + private static FaceRecognition _FaceRecognition; + + private static bool _UseCnn = false; #endregion @@ -31,6 +33,7 @@ private static void Main(string[] args) app.HelpOption("-h|--help"); var modelsOption = app.Option("-m|--model", "model files directory path", CommandOptionType.SingleValue); + var cnnOption = app.Option("-c|--cnn", "use cnn", CommandOptionType.NoValue); app.OnExecute(() => { @@ -47,7 +50,9 @@ private static void Main(string[] args) return -1; } - FaceRecognition = FaceRecognition.Create(directory); + _UseCnn = cnnOption.HasValue(); + + _FaceRecognition = FaceRecognition.Create(directory); var testImages = new[] { @@ -84,7 +89,7 @@ private static void Main(string[] args) #region Helpers - private static Tuple RunTest(string path, Func setup, Action test, int iterationsPerTest = 5, int testsToRun = 10) + private static Tuple RunTest(string path, Func setup, Action test, int iterationsPerTest = 5, int testsToRun = 10, bool useCnn = false) { var image = setup(path); @@ -111,7 +116,8 @@ private static Tuple RunTest(string path, Func set private static Tuple SetupEncodeFace(string path) { var image = FaceRecognition.LoadImageFile(path); - var locations = FaceRecognition.FaceLocations(image).ToArray(); + var model = _UseCnn ? Model.Cnn : Model.Hog; + var locations = _FaceRecognition.FaceLocations(image, model: model).ToArray(); return new Tuple(image, locations); } @@ -123,7 +129,8 @@ private static Image SetupEndToEnd(string path) private static Tuple SetupFaceLandmarks(string path) { var image = FaceRecognition.LoadImageFile(path); - var locations = FaceRecognition.FaceLocations(image).ToArray(); + var model = _UseCnn ? Model.Cnn : Model.Hog; + var locations = _FaceRecognition.FaceLocations(image, model: model).ToArray(); return new Tuple(image, locations); } @@ -134,22 +141,30 @@ private static Image SetupLocateFaces(string path) private static void TestEncodeFace(Tuple tuple) { - var encoding = FaceRecognition.FaceEncodings(tuple.Item1, tuple.Item2).First(); + var model = _UseCnn ? Model.Cnn : Model.Hog; + var encoding = _FaceRecognition.FaceEncodings(tuple.Item1, tuple.Item2, model: model); + foreach (var faceEncoding in encoding) + faceEncoding.Dispose(); } private static void TestEndToEnd(Image image) { - var encoding = FaceRecognition.FaceEncodings(image).First(); + var model = _UseCnn ? Model.Cnn : Model.Hog; + var encoding = _FaceRecognition.FaceEncodings(image, model: model); + foreach (var faceEncoding in encoding) + faceEncoding.Dispose(); } private static void TestFaceLandmarks(Tuple tuple) { - var landmarks = FaceRecognition.FaceLandmark(tuple.Item1, tuple.Item2).First(); + var model = _UseCnn ? Model.Cnn : Model.Hog; + var landmarks = _FaceRecognition.FaceLandmark(tuple.Item1, tuple.Item2, model: model).First(); } private static void TestLocateFaces(Image image) { - var faceLocations = FaceRecognition.FaceLocations(image).ToArray(); + var model = _UseCnn ? Model.Cnn : Model.Hog; + var faceLocations = _FaceRecognition.FaceLocations(image, model: model).ToArray(); } #endregion diff --git a/examples/Benchmark/README.md b/examples/Benchmark/README.md index c28aa70..86c065a 100644 --- a/examples/Benchmark/README.md +++ b/examples/Benchmark/README.md @@ -63,6 +63,7 @@ This program support the following argument and option. |Argument|Description| |:---|:---| |-m\|--model|Directory path includes model files| +|-c\|--cnn|Use Cnn| ## 5. Other diff --git a/examples/BlinkDetection/Program.cs b/examples/BlinkDetection/Program.cs index ff45c2b..b30ec77 100644 --- a/examples/BlinkDetection/Program.cs +++ b/examples/BlinkDetection/Program.cs @@ -1,12 +1,10 @@ using System; -using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; using FaceRecognitionDotNet; using FaceRecognitionDotNet.Extensions; using Microsoft.Extensions.CommandLineUtils; using OpenCvSharp; -using Point = FaceRecognitionDotNet.Point; namespace BlinkDetection { diff --git a/examples/HeadPoseEstimationDemo/Program.cs b/examples/HeadPoseEstimationDemo/Program.cs index 64d6cd3..9929ba3 100644 --- a/examples/HeadPoseEstimationDemo/Program.cs +++ b/examples/HeadPoseEstimationDemo/Program.cs @@ -7,7 +7,6 @@ using FaceRecognitionDotNet.Extensions; using Microsoft.Extensions.CommandLineUtils; using OpenCvSharp; -using Size = OpenCvSharp.Size; namespace HeadPoseEstimationDemo { diff --git a/examples/RgbBgr/Program.cs b/examples/RgbBgr/Program.cs index c21199c..cbf1567 100644 --- a/examples/RgbBgr/Program.cs +++ b/examples/RgbBgr/Program.cs @@ -1,10 +1,8 @@ using System; -using System.Collections.Generic; using System.Drawing; using System.Drawing.Imaging; using System.Linq; using FaceRecognitionDotNet; -using Image = FaceRecognitionDotNet.Image; namespace RgbBgr { diff --git a/nuget/BuildAndroid.ps1 b/nuget/BuildAndroid.ps1 index a8642b6..2c96cd3 100644 --- a/nuget/BuildAndroid.ps1 +++ b/nuget/BuildAndroid.ps1 @@ -88,6 +88,8 @@ foreach($BuildTarget in $BuildTargets) foreach ($key in $BuildSourceHash.keys) { $srcDir = Join-Path $DlibDotNetSourceRoot $key + $srcDir = $Config.GetStoreDriectory($srcDir) + $dll = $BuildSourceHash[$key] $dstDir = Join-Path $Current $libraryDir diff --git a/nuget/BuildCentOS7.ps1 b/nuget/BuildCentOS7.ps1 index 78c5473..e08f646 100644 --- a/nuget/BuildCentOS7.ps1 +++ b/nuget/BuildCentOS7.ps1 @@ -1,112 +1,127 @@ -Param() - -# import class and function -$ScriptPath = $PSScriptRoot -$FaceRecognitionDotNetRoot = Split-Path $ScriptPath -Parent -$NugetPath = Join-Path $FaceRecognitionDotNetRoot "nuget" | ` - Join-Path -ChildPath "BuildUtils.ps1" -import-module $NugetPath -function * - -$OperatingSystem="centos" -$Distribution="centos" -$DistributionVersion="7" - -# Store current directory -$Current = Get-Location -$FaceRecognitionDotNetRoot = (Split-Path (Get-Location) -Parent) -$DlibDotNetRoot = Join-Path $FaceRecognitionDotNetRoot src | ` - Join-Path -ChildPath DlibDotNet -$FaceRecognitionDotNetSourceRoot = Join-Path $FaceRecognitionDotNetRoot src -$DockerDir = Join-Path $FaceRecognitionDotNetRoot nuget | ` - Join-Path -ChildPath docker - -Set-Location -Path $DockerDir - -$DockerFileDir = Join-Path $DockerDir build | ` - Join-Path -ChildPath $Distribution | ` - Join-Path -ChildPath $DistributionVersion - -$BuildSourceHash = [Config]::GetBinaryLibraryLinuxHash() - -# https://github.com/dotnet/coreclr/issues/9265 -# linux-x86 does not support -$BuildTargets = @() -$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cpu"; Architecture = 64; Postfix = "/x64"; RID = "$OperatingSystem-x64"; CUDA = 0 } -# $BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cpu"; Architecture = 32; Postfix = "/x86"; RID = "$OperatingSystem-x86"; CUDA = 0 } -$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "mkl"; Architecture = 64; Postfix = "/x64"; RID = "$OperatingSystem-x64"; CUDA = 0 } -# $BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "mkl"; Architecture = 32; Postfix = "/x86"; RID = "$OperatingSystem-x86"; CUDA = 0 } -$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = ""; RID = "$OperatingSystem-x64"; CUDA = 92 } -$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = ""; RID = "$OperatingSystem-x64"; CUDA = 100 } -$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = ""; RID = "$OperatingSystem-x64"; CUDA = 101 } -$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = ""; RID = "$OperatingSystem-x64"; CUDA = 102 } -#$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "arm"; Architecture = 64; Postfix = "64"; RID = "$OperatingSystem-arm64"; CUDA = 0 } -#$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "arm"; Architecture = 32; Postfix = ""; RID = "$OperatingSystem-arm"; CUDA = 0 } - -foreach($BuildTarget in $BuildTargets) -{ - $platform = $BuildTarget.Platform - $target = $BuildTarget.Target - $architecture = $BuildTarget.Architecture - $rid = $BuildTarget.RID - $cudaVersion = $BuildTarget.CUDA - $postfix = $BuildTarget.Postfix - - if ($target -ne "cuda") - { - $option = "" - - $dockername = "dlibdotnet/build/$Distribution/$DistributionVersion/$Target" + $postfix - $imagename = "dlibdotnet/devel/$Distribution/$DistributionVersion/$Target" + $postfix - } - else - { - $option = $cudaVersion - - $cudaVersion = ($cudaVersion / 10).ToString("0.0") - $dockername = "dlibdotnet/build/$Distribution/$DistributionVersion/$Target/$cudaVersion" - $imagename = "dlibdotnet/devel/$Distribution/$DistributionVersion/$Target/$cudaVersion" - } - - $Config = [Config]::new($DlibDotNetRoot, "Release", $target, $architecture, $platform, $option) - $libraryDir = Join-Path "artifacts" $Config.GetArtifactDirectoryName() - $build = $Config.GetBuildDirectoryName($OperatingSystem) - - Write-Host "Start 'docker build -t $dockername $DockerFileDir --build-arg IMAGE_NAME=""$imagename""'" -ForegroundColor Green - docker build --force-rm=true -t $dockername $DockerFileDir --build-arg IMAGE_NAME="$imagename" - - if ($lastexitcode -ne 0) - { - Set-Location -Path $Current - exit -1 - } - - # Build binary - foreach ($key in $BuildSourceHash.keys) - { - Write-Host "Start 'docker run --rm -v ""$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t $dockername'" -ForegroundColor Green - docker run --rm ` - -v "$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet" ` - -e "LOCAL_UID=$(id -u $env:USER)" ` - -e "LOCAL_GID=$(id -g $env:USER)" ` - -t "$dockername" $key $target $architecture $platform $option - - if ($lastexitcode -ne 0) - { - Set-Location -Path $Current - exit -1 - } - } - - # Copy output binary - foreach ($key in $BuildSourceHash.keys) - { - $srcDir = Join-Path $FaceRecognitionDotNetSourceRoot $key - $dll = $BuildSourceHash[$key] - $dstDir = Join-Path $Current $libraryDir - - CopyToArtifact -srcDir $srcDir -build $build -libraryName $dll -dstDir $dstDir -rid $rid - } -} - -# Move to Root directory -Set-Location -Path $Current +Param() + +# import class and function +$ScriptPath = $PSScriptRoot +$FaceRecognitionDotNetRoot = Split-Path $ScriptPath -Parent +$NugetPath = Join-Path $FaceRecognitionDotNetRoot "nuget" | ` + Join-Path -ChildPath "BuildUtils.ps1" +import-module $NugetPath -function * + +$OperatingSystem="centos" +$Distribution="centos" +$DistributionVersion="7" + +# Store current directory +$Current = Get-Location +$FaceRecognitionDotNetRoot = (Split-Path (Get-Location) -Parent) +$FaceRecognitionDotNetSourceRoot = Join-Path $FaceRecognitionDotNetRoot src +$DockerDir = Join-Path $FaceRecognitionDotNetRoot docker + +Set-Location -Path $DockerDir + +$DockerFileDir = Join-Path $DockerDir build | ` + Join-Path -ChildPath $Distribution | ` + Join-Path -ChildPath $DistributionVersion + +$BuildSourceHash = [Config]::GetBinaryLibraryLinuxHash() + +# https://github.com/dotnet/coreclr/issues/9265 +# linux-x86 does not support +$BuildTargets = @() +$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cpu"; Architecture = 64; Postfix = "/x64"; RID = "$OperatingSystem-x64"; CUDA = 0 } +# $BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cpu"; Architecture = 32; Postfix = "/x86"; RID = "$OperatingSystem-x86"; CUDA = 0 } +$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "mkl"; Architecture = 64; Postfix = "/x64"; RID = "$OperatingSystem-x64"; CUDA = 0 } +# $BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "mkl"; Architecture = 32; Postfix = "/x86"; RID = "$OperatingSystem-x86"; CUDA = 0 } +$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = ""; RID = "$OperatingSystem-x64"; CUDA = 92 } +$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = ""; RID = "$OperatingSystem-x64"; CUDA = 100 } +$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = ""; RID = "$OperatingSystem-x64"; CUDA = 101 } +$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = ""; RID = "$OperatingSystem-x64"; CUDA = 102 } +$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = ""; RID = "$OperatingSystem-x64"; CUDA = 110 } +$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = ""; RID = "$OperatingSystem-x64"; CUDA = 111 } +#$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "arm"; Architecture = 64; Postfix = "64"; RID = "$OperatingSystem-arm64"; CUDA = 0 } +#$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "arm"; Architecture = 32; Postfix = ""; RID = "$OperatingSystem-arm"; CUDA = 0 } + +foreach($BuildTarget in $BuildTargets) +{ + $platform = $BuildTarget.Platform + $target = $BuildTarget.Target + $architecture = $BuildTarget.Architecture + $rid = $BuildTarget.RID + $cudaVersion = $BuildTarget.CUDA + $postfix = $BuildTarget.Postfix + + if ($target -ne "cuda") + { + $option = "" + + $dockername = "dlibdotnet/build/$Distribution/$DistributionVersion/$Target" + $postfix + $imagename = "dlibdotnet/devel/$Distribution/$DistributionVersion/$Target" + $postfix + } + else + { + $option = $cudaVersion + + $cudaVersion = ($cudaVersion / 10).ToString("0.0") + $dockername = "dlibdotnet/build/$Distribution/$DistributionVersion/$Target/$cudaVersion" + $imagename = "dlibdotnet/devel/$Distribution/$DistributionVersion/$Target/$cudaVersion" + } + + $Config = [Config]::new($FaceRecognitionDotNetRoot, "Release", $target, $architecture, $platform, $option) + $libraryDir = Join-Path "artifacts" $Config.GetArtifactDirectoryName() + $build = $Config.GetBuildDirectoryName($OperatingSystem) + + Write-Host "Start 'docker build -t $dockername $DockerFileDir --build-arg IMAGE_NAME=""$imagename""'" -ForegroundColor Green + docker build --force-rm=true -t $dockername $DockerFileDir --build-arg IMAGE_NAME="$imagename" + + if ($lastexitcode -ne 0) + { + Set-Location -Path $Current + exit -1 + } + + # Build binary + foreach ($key in $BuildSourceHash.keys) + { + Write-Host "Start 'docker run --rm -v ""$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t $dockername'" -ForegroundColor Green + if ($Config.HasStoreDriectory()) + { + $storeDirecotry = $Config.GetRootStoreDriectory() + docker run --rm ` + -v "$($storeDirecotry):/opt/data/builds" ` + -v "$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet" ` + -e "LOCAL_UID=$(id -u $env:USER)" ` + -e "LOCAL_GID=$(id -g $env:USER)" ` + -e "CIBuildDir=/opt/data/builds" ` + -t "$dockername" $key $target $architecture $platform $option + } + else + { + docker run --rm ` + -v "$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet" ` + -e "LOCAL_UID=$(id -u $env:USER)" ` + -e "LOCAL_GID=$(id -g $env:USER)" ` + -t "$dockername" $key $target $architecture $platform $option + } + + if ($lastexitcode -ne 0) + { + Set-Location -Path $Current + exit -1 + } + } + + # Copy output binary + foreach ($key in $BuildSourceHash.keys) + { + $srcDir = Join-Path $FaceRecognitionDotNetSourceRoot $key + $srcDir = $Config.GetStoreDriectory($srcDir) + + $dll = $BuildSourceHash[$key] + $dstDir = Join-Path $Current $libraryDir + + CopyToArtifact -srcDir $srcDir -build $build -libraryName $dll -dstDir $dstDir -rid $rid + } +} + +# Move to Root directory +Set-Location -Path $Current diff --git a/nuget/BuildIOS.ps1 b/nuget/BuildIOS.ps1 index 44c28d4..953743b 100644 --- a/nuget/BuildIOS.ps1 +++ b/nuget/BuildIOS.ps1 @@ -51,6 +51,8 @@ foreach($BuildTarget in $BuildTargets) foreach ($key in $BuildSourceHash.keys) { $srcDir = Join-Path $DlibDotNetSourceRoot $key + $srcDir = $Config.GetStoreDriectory($srcDir) + $dll = $BuildSourceHash[$key] $dstDir = Join-Path $Current $libraryDir diff --git a/nuget/BuildOSX.ps1 b/nuget/BuildOSX.ps1 index 018ca33..3d34976 100644 --- a/nuget/BuildOSX.ps1 +++ b/nuget/BuildOSX.ps1 @@ -59,6 +59,8 @@ foreach($BuildTarget in $BuildTargets) foreach ($key in $BuildSourceHash.keys) { $srcDir = Join-Path $FaceRecognitionDotNetSourceRoot $key + $srcDir = $Config.GetStoreDriectory($srcDir) + $dll = $BuildSourceHash[$key] $dstDir = Join-Path $Current $libraryDir diff --git a/nuget/BuildUbuntu16.ps1 b/nuget/BuildUbuntu16.ps1 index 9ffcaf4..8bd068e 100644 --- a/nuget/BuildUbuntu16.ps1 +++ b/nuget/BuildUbuntu16.ps1 @@ -14,11 +14,8 @@ $DistributionVersion="16" # Store current directory $Current = Get-Location $FaceRecognitionDotNetRoot = (Split-Path (Get-Location) -Parent) -$DlibDotNetRoot = Join-Path $FaceRecognitionDotNetRoot src | ` - Join-Path -ChildPath DlibDotNet $FaceRecognitionDotNetSourceRoot = Join-Path $FaceRecognitionDotNetRoot src -$DockerDir = Join-Path $FaceRecognitionDotNetRoot nuget | ` - Join-Path -ChildPath docker +$DockerDir = Join-Path $FaceRecognitionDotNetRoot docker Set-Location -Path $DockerDir @@ -39,6 +36,8 @@ $BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = $BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = ""; RID = "$OperatingSystem-x64"; CUDA = 100 } $BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = ""; RID = "$OperatingSystem-x64"; CUDA = 101 } $BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = ""; RID = "$OperatingSystem-x64"; CUDA = 102 } +$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = ""; RID = "$OperatingSystem-x64"; CUDA = 110 } +$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = ""; RID = "$OperatingSystem-x64"; CUDA = 111 } #$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "arm"; Architecture = 64; Postfix = "64"; RID = "$OperatingSystem-arm64"; CUDA = 0 } #$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "arm"; Architecture = 32; Postfix = ""; RID = "$OperatingSystem-arm"; CUDA = 0 } @@ -84,11 +83,25 @@ foreach($BuildTarget in $BuildTargets) foreach ($key in $BuildSourceHash.keys) { Write-Host "Start 'docker run --rm -v ""$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t $dockername'" -ForegroundColor Green - docker run --rm ` - -v "$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet" ` - -e "LOCAL_UID=$(id -u $env:USER)" ` - -e "LOCAL_GID=$(id -g $env:USER)" ` - -t "$dockername" $key $target $architecture $platform $option + if ($Config.HasStoreDriectory()) + { + $storeDirecotry = $Config.GetRootStoreDriectory() + docker run --rm ` + -v "$($storeDirecotry):/opt/data/builds" ` + -v "$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet" ` + -e "LOCAL_UID=$(id -u $env:USER)" ` + -e "LOCAL_GID=$(id -g $env:USER)" ` + -e "CIBuildDir=/opt/data/builds" ` + -t "$dockername" $key $target $architecture $platform $option + } + else + { + docker run --rm ` + -v "$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet" ` + -e "LOCAL_UID=$(id -u $env:USER)" ` + -e "LOCAL_GID=$(id -g $env:USER)" ` + -t "$dockername" $key $target $architecture $platform $option + } if ($lastexitcode -ne 0) { @@ -101,6 +114,8 @@ foreach($BuildTarget in $BuildTargets) foreach ($key in $BuildSourceHash.keys) { $srcDir = Join-Path $FaceRecognitionDotNetSourceRoot $key + $srcDir = $Config.GetStoreDriectory($srcDir) + $dll = $BuildSourceHash[$key] $dstDir = Join-Path $Current $libraryDir diff --git a/nuget/BuildUniversalWindowsPlatform.ps1 b/nuget/BuildUniversalWindowsPlatform.ps1 index 8d920a3..31f9776 100644 --- a/nuget/BuildUniversalWindowsPlatform.ps1 +++ b/nuget/BuildUniversalWindowsPlatform.ps1 @@ -56,6 +56,8 @@ foreach ($BuildTarget in $BuildTargets) foreach ($key in $BuildSourceHash.keys) { $srcDir = Join-Path $FaceRecognitionDotNetSourceRoot $key + $srcDir = $Config.GetStoreDriectory($srcDir) + $dll = $BuildSourceHash[$key] $dstDir = Join-Path $Current $libraryDir diff --git a/nuget/BuildUtils.ps1 b/nuget/BuildUtils.ps1 index 474a8a6..a2b9385 100644 --- a/nuget/BuildUtils.ps1 +++ b/nuget/BuildUtils.ps1 @@ -1,931 +1,1020 @@ -class Config -{ - - $ConfigurationArray = - @( - "Debug", - "Release" - ) - - $TargetArray = - @( - "cpu", - "cuda", - "mkl", - "arm" - ) - - $PlatformArray = - @( - "desktop", - "android", - "ios", - "uwp" - ) - - $ArchitectureArray = - @( - 32, - 64 - ) - - $CudaVersionArray = - @( - 90, - 91, - 92, - 100, - 101, - 102 - ) - - $CudaVersionHash = - @{ - 90 = "CUDA_PATH_V9_0"; - 91 = "CUDA_PATH_V9_1"; - 92 = "CUDA_PATH_V9_2"; - 100 = "CUDA_PATH_V10_0"; - 101 = "CUDA_PATH_V10_1"; - 102 = "CUDA_PATH_V10_2" - } - - $VisualStudio = "Visual Studio 15 2017" - - static $BuildLibraryWindowsHash = - @{ - "DlibDotNet.Native.Dnn.GenderClassification" = "DlibDotNetNativeDnnGenderClassification.dll"; - "DlibDotNet.Native.Dnn.AgeClassification" = "DlibDotNetNativeDnnAgeClassification.dll"; - } - - static $BuildLibraryLinuxHash = - @{ - "DlibDotNet.Native.Dnn.GenderClassification" = "libDlibDotNetNativeDnnGenderClassification.so"; - "DlibDotNet.Native.Dnn.AgeClassification" = "libDlibDotNetNativeDnnAgeClassification.so"; - } - - static $BuildLibraryOSXHash = - @{ - "DlibDotNet.Native.Dnn.GenderClassification" = "libDlibDotNetNativeDnnGenderClassification.dylib"; - "DlibDotNet.Native.Dnn.AgeClassification" = "libDlibDotNetNativeDnnAgeClassification.dylib"; - } - - static $BuildLibraryIOSHash = - @{ - "DlibDotNet.Native.Dnn.GenderClassification" = "libDlibDotNetNativeDnnGenderClassification.a"; - "DlibDotNet.Native.Dnn.AgeClassification" = "libDlibDotNetNativeDnnAgeClassification.a"; - } - - [string] $_Root - [string] $_Configuration - [int] $_Architecture - [string] $_Target - [string] $_Platform - [string] $_MklDirectory - [int] $_CudaVersion - [string] $_AndroidABI - [string] $_AndroidNativeAPILevel - - #*************************************** - # Arguments - # %1: Root directory of DlibDotNet - # %2: Build Configuration (Release/Debug) - # %3: Target (cpu/cuda/mkl/arm) - # %4: Architecture (32/64) - # %5: Platform (desktop/android/ios/uwp) - # %6: Optional Argument - # if Target is cuda, CUDA version if Target is cuda [90/91/92/100/101/102] - # if Target is mkl and Windows, IntelMKL directory path - #*************************************** - Config( [string]$Root, - [string]$Configuration, - [string]$Target, - [int] $Architecture, - [string]$Platform, - [string]$Option - ) - { - if ($this.ConfigurationArray.Contains($Configuration) -eq $False) - { - $candidate = $this.ConfigurationArray -join "/" - Write-Host "Error: Specify build configuration [${candidate}]" -ForegroundColor Red - exit -1 - } - - if ($this.TargetArray.Contains($Target) -eq $False) - { - $candidate = $this.TargetArray -join "/" - Write-Host "Error: Specify Target [${candidate}]" -ForegroundColor Red - exit -1 - } - - if ($this.ArchitectureArray.Contains($Architecture) -eq $False) - { - $candidate = $this.ArchitectureArray -join "/" - Write-Host "Error: Specify Architecture [${candidate}]" -ForegroundColor Red - exit -1 - } - - if ($this.PlatformArray.Contains($Platform) -eq $False) - { - $candidate = $this.PlatformArray -join "/" - Write-Host "Error: Specify Architecture [${candidate}]" -ForegroundColor Red - exit -1 - } - - switch ($Target) - { - "cuda" - { - $this._CudaVersion = [int]$Option - if ($this.CudaVersionArray.Contains($this._CudaVersion) -ne $True) - { - $candidate = $this.CudaVersionArray -join "/" - Write-Host "Error: Specify CUDA version [${candidate}]" -ForegroundColor Red - exit -1 - } - } - "mkl" - { - $this._MklDirectory = $Option - } - } - - switch ($Platform) - { - "android" - { - $decoded = [Config]::Base64Decode($Option) - $setting = ConvertFrom-Json $decoded - $this._AndroidABI = $setting.ANDROID_ABI - $this._AndroidNativeAPILevel = $setting.ANDROID_NATIVE_API_LEVEL - } - } - - $this._Root = $Root - $this._Configuration = $Configuration - $this._Architecture = $Architecture - $this._Target = $Target - $this._Platform = $Platform - } - - static [string] Base64Encode([string]$text) - { - $byte = ([System.Text.Encoding]::Default).GetBytes($text) - return [Convert]::ToBase64String($byte) - } - - static [string] Base64Decode([string]$base64) - { - $byte = [System.Convert]::FromBase64String($base64) - return [System.Text.Encoding]::Default.GetString($byte) - } - - static [hashtable] GetBinaryLibraryWindowsHash() - { - return [Config]::BuildLibraryWindowsHash - } - - static [hashtable] GetBinaryLibraryOSXHash() - { - return [Config]::BuildLibraryOSXHash - } - - static [hashtable] GetBinaryLibraryLinuxHash() - { - return [Config]::BuildLibraryLinuxHash - } - - static [hashtable] GetBinaryLibraryIOSHash() - { - return [Config]::BuildLibraryIOSHash - } - - [string] GetRootDir() - { - return $this._Root - } - - [string] GetDlibRootDir() - { - return Join-Path $this.GetRootDir() src | - Join-Path -ChildPath DlibDotNet | - Join-Path -ChildPath src | - Join-Path -ChildPath dlib - } - - [string] GetNugetDir() - { - return Join-Path $this.GetRootDir() nuget - } - - [int] GetArchitecture() - { - return $this._Architecture - } - - [string] GetConfigurationName() - { - return $this._Configuration - } - - [string] GetAndroidABI() - { - return $this._AndroidABI - } - - [string] GetAndroidNativeAPILevel() - { - return $this._AndroidNativeAPILevel - } - - [string] GetArtifactDirectoryName() - { - $target = $this._Target - $platform = $this._Platform - $name = "" - - switch ($platform) - { - "desktop" - { - if ($target -eq "cuda") - { - $cudaVersion = $this._CudaVersion - $name = "${target}-${cudaVersion}" - } - else - { - $name = $target - } - } - "android" - { - $name = $platform - } - "ios" - { - $name = $platform - } - "uwp" - { - $name = Join-Path $platform $target - } - } - - return $name - } - - [string] GetOSName() - { - $os = "" - - if ($global:IsWindows) - { - $os = "win" - } - elseif ($global:IsMacOS) - { - $os = "osx" - } - elseif ($global:IsLinux) - { - $os = "linux" - } - else - { - Write-Host "Error: This plaform is not support" -ForegroundColor Red - exit -1 - } - - return $os - } - - [string] GetIntelMklDirectory() - { - return [string]$this._MklDirectory - } - - [string] GetArchitectureName() - { - $arch = "" - $target = $this._Target - $architecture = $this._Architecture - - if ($target -eq "arm") - { - if ($architecture -eq 32) - { - $arch = "arm" - } - elseif ($architecture -eq 64) - { - $arch = "arm64" - } - } - else - { - if ($architecture -eq 32) - { - $arch = "x86" - } - elseif ($architecture -eq 64) - { - $arch = "x64" - } - } - - return $arch - } - - [string] GetTarget() - { - return $this._Target - } - - [string] GetPlatform() - { - return $this._Platform - } - - [string] GetBuildDirectoryName([string]$os="") - { - if ($os) - { - $osname = $os - } - else - { - $osname = $this.GetOSName() - } - - $target = $this._Target - $platform = $this._Platform - $architecture = $this.GetArchitectureName() - - if ($target -eq "cuda") - { - $version = $this._CudaVersion - return "build_${osname}_${platform}_cuda-${version}_${architecture}" - } - else - { - return "build_${osname}_${platform}_${target}_${architecture}" - } - } - - [string] GetVisualStudio() - { - return $this.VisualStudio - } - - [string] GetVisualStudioArchitecture() - { - $architecture = $this._Architecture - $target = $this._Target - - if ($target -eq "arm") - { - if ($architecture -eq 32) - { - return "ARM" - } - elseif ($architecture -eq 64) - { - return "ARM64" - } - } - else - { - if ($architecture -eq 32) - { - return "Win32" - } - elseif ($architecture -eq 64) - { - return "x64" - } - } - - Write-Host "${architecture} and ${target} do not support" -ForegroundColor Red - exit -1 - } - - [string] GetCUDAPath() - { - # CUDA_PATH_V10_0=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v10.0 - # CUDA_PATH_V10_1=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v10.1 - # CUDA_PATH_V10_2=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v10.2 - # CUDA_PATH_V9_0=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v9.0 - # CUDA_PATH_V9_1=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v9.1 - # CUDA_PATH_V9_2=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v9.2 - $version = $this.CudaVersionHash[$this._CudaVersion] - return [environment]::GetEnvironmentVariable($version, 'Machine') - } - - [string] GetAVXINSTRUCTIONS() - { - return "ON" - } - - [string] GetSSE4INSTRUCTIONS() - { - return "ON" - } - - [string] GetSSE2INSTRUCTIONS() - { - return "OFF" - } - -} - -function ConfigCPU([Config]$Config) -{ - if ($IsWindows) - { - $USE_AVX_INSTRUCTIONS = $Config.GetAVXINSTRUCTIONS() - $USE_SSE4_INSTRUCTIONS = $Config.GetSSE4INSTRUCTIONS() - $USE_SSE2_INSTRUCTIONS = $Config.GetSSE2INSTRUCTIONS() - - cmake -G $Config.GetVisualStudio() -A $Config.GetVisualStudioArchitecture() -T host=x64 ` - -D DLIB_USE_CUDA=OFF ` - -D DLIB_USE_LAPACK=OFF ` - -D USE_AVX_INSTRUCTIONS=$USE_AVX_INSTRUCTIONS ` - -D USE_SSE4_INSTRUCTIONS=$USE_SSE4_INSTRUCTIONS ` - -D USE_SSE2_INSTRUCTIONS=$USE_SSE2_INSTRUCTIONS ` - .. - } - else - { - $USE_AVX_INSTRUCTIONS = $Config.GetAVXINSTRUCTIONS() - $USE_SSE4_INSTRUCTIONS = $Config.GetSSE4INSTRUCTIONS() - $USE_SSE2_INSTRUCTIONS = $Config.GetSSE2INSTRUCTIONS() - - $arch_type = $Config.GetArchitecture() - cmake -D ARCH_TYPE="$arch_type" ` - -D DLIB_USE_CUDA=OFF ` - -D DLIB_USE_LAPACK=OFF ` - -D mkl_include_dir="" ` - -D mkl_intel="" ` - -D mkl_rt="" ` - -D mkl_thread="" ` - -D mkl_pthread="" ` - -D LIBPNG_IS_GOOD=OFF ` - -D PNG_FOUND=OFF ` - -D PNG_LIBRARY_RELEASE="" ` - -D PNG_LIBRARY_DEBUG="" ` - -D PNG_PNG_INCLUDE_DIR="" ` - -D USE_AVX_INSTRUCTIONS=$USE_AVX_INSTRUCTIONS ` - -D USE_SSE4_INSTRUCTIONS=$USE_SSE4_INSTRUCTIONS ` - -D USE_SSE2_INSTRUCTIONS=$USE_SSE2_INSTRUCTIONS ` - .. - } -} - -function ConfigCUDA([Config]$Config) -{ - if ($IsWindows) - { - $cudaPath = $Config.GetCUDAPath() - if (!(Test-Path $cudaPath)) - { - Write-Host "Error: '${cudaPath}' does not found" -ForegroundColor Red - exit -1 - } - - $env:CUDA_PATH="${cudaPath}" - $env:PATH="$env:CUDA_PATH\bin;$env:CUDA_PATH\libnvvp;$ENV:PATH" - Write-Host "Info: CUDA_PATH: ${env:CUDA_PATH}" -ForegroundColor Green - - $USE_AVX_INSTRUCTIONS = $Config.GetAVXINSTRUCTIONS() - $USE_SSE4_INSTRUCTIONS = $Config.GetSSE4INSTRUCTIONS() - $USE_SSE2_INSTRUCTIONS = $Config.GetSSE2INSTRUCTIONS() - - cmake -G $Config.GetVisualStudio() -A $Config.GetVisualStudioArchitecture() -T host=x64 ` - -D DLIB_USE_CUDA=ON ` - -D DLIB_USE_BLAS=OFF ` - -D DLIB_USE_LAPACK=OFF ` - -D USE_AVX_INSTRUCTIONS=$USE_AVX_INSTRUCTIONS ` - -D USE_SSE4_INSTRUCTIONS=$USE_SSE4_INSTRUCTIONS ` - -D USE_SSE2_INSTRUCTIONS=$USE_SSE2_INSTRUCTIONS ` - .. - } - else - { - $USE_AVX_INSTRUCTIONS = $Config.GetAVXINSTRUCTIONS() - $USE_SSE4_INSTRUCTIONS = $Config.GetSSE4INSTRUCTIONS() - $USE_SSE2_INSTRUCTIONS = $Config.GetSSE2INSTRUCTIONS() - - cmake -D DLIB_USE_CUDA=ON ` - -D DLIB_USE_BLAS=OFF ` - -D DLIB_USE_LAPACK=OFF ` - -D LIBPNG_IS_GOOD=OFF ` - -D PNG_FOUND=OFF ` - -D PNG_LIBRARY_RELEASE="" ` - -D PNG_LIBRARY_DEBUG="" ` - -D PNG_PNG_INCLUDE_DIR="" ` - -D USE_AVX_INSTRUCTIONS=$USE_AVX_INSTRUCTIONS ` - -D USE_SSE4_INSTRUCTIONS=$USE_SSE4_INSTRUCTIONS ` - -D USE_SSE2_INSTRUCTIONS=$USE_SSE2_INSTRUCTIONS ` - .. - } -} - -function ConfigMKL([Config]$Config) -{ - if ($IsWindows) - { - $intelMklDirectory = $Config.GetIntelMklDirectory() - if (!$intelMklDirectory) { - Write-Host "Error: Specify Intel MKL directory" -ForegroundColor Red - exit -1 - } - - if ((Test-Path $intelMklDirectory) -eq $False) { - Write-Host "Error: Specified IntelMKL directory '${intelMklDirectory}' does not found" -ForegroundColor Red - exit -1 - } - - $architecture = $Config.GetArchitecture() - $architectureDir = "" - switch ($architecture) - { - 32 - { - $architectureDir = "ia32_win" - $MKL_INCLUDE_DIR = Join-Path $intelMklDirectory "mkl/include" - $LIBIOMP5MD_LIB = Join-Path $intelMklDirectory "compiler/lib/${architectureDir}/libiomp5md.lib" - $MKLCOREDLL_LIB = Join-Path $intelMklDirectory "mkl/lib/${architectureDir}/mkl_core_dll.lib" - $MKLINTELC_LIB = Join-Path $intelMklDirectory "mkl/lib/${architectureDir}/mkl_intel_c.lib" - $MKLINTELTHREADDLL_LIB = Join-Path $intelMklDirectory "mkl/lib/${architectureDir}/mkl_intel_thread_dll.lib" - - if ((Test-Path $LIBIOMP5MD_LIB) -eq $False) { - Write-Host "Error: ${LIBIOMP5MD_LIB} does not found" -ForegroundColor Red - exit -1 - } - if ((Test-Path $MKLCOREDLL_LIB) -eq $False) { - Write-Host "Error: ${MKLCOREDLL_LIB} does not found" -ForegroundColor Red - exit -1 - } - if ((Test-Path $MKLINTELC_LIB) -eq $False) { - Write-Host "Error: ${MKLINTELC_LIB} does not found" -ForegroundColor Red - exit -1 - } - if ((Test-Path $MKLINTELTHREADDLL_LIB) -eq $False) { - Write-Host "Error: ${MKLINTELTHREADDLL_LIB} does not found" -ForegroundColor Red - exit -1 - } - - $USE_AVX_INSTRUCTIONS = $Config.GetAVXINSTRUCTIONS() - $USE_SSE4_INSTRUCTIONS = $Config.GetSSE4INSTRUCTIONS() - $USE_SSE2_INSTRUCTIONS = $Config.GetSSE2INSTRUCTIONS() - - cmake -G $Config.GetVisualStudio() -A $Config.GetVisualStudioArchitecture() -T host=x64 ` - -D DLIB_USE_CUDA=OFF ` - -D DLIB_USE_BLAS=ON ` - -D DLIB_USE_LAPACK=OFF ` - -D mkl_include_dir="${MKL_INCLUDE_DIR}" ` - -D BLAS_libiomp5md_LIBRARY="${LIBIOMP5MD_LIB}" ` - -D BLAS_mkl_core_dll_LIBRARY="${MKLCOREDLL_LIB}" ` - -D BLAS_mkl_intel_c_dll_LIBRARY="${MKLINTELC_LIB}" ` - -D BLAS_mkl_intel_thread_dll_LIBRARY="${MKLINTELTHREADDLL_LIB}" ` - -D USE_AVX_INSTRUCTIONS=$USE_AVX_INSTRUCTIONS ` - -D USE_SSE4_INSTRUCTIONS=$USE_SSE4_INSTRUCTIONS ` - -D USE_SSE2_INSTRUCTIONS=$USE_SSE2_INSTRUCTIONS ` - .. - } - 64 - { - $architectureDir = "intel64_win" - $MKL_INCLUDE_DIR = Join-Path $intelMklDirectory "mkl/include" - $LIBIOMP5MD_LIB = Join-Path $intelMklDirectory "compiler/lib/${architectureDir}/libiomp5md.lib" - $MKLCOREDLL_LIB = Join-Path $intelMklDirectory "mkl/lib/${architectureDir}/mkl_core_dll.lib" - $MKLINTELLP64DLL_LIB = Join-Path $intelMklDirectory "mkl/lib/${architectureDir}/mkl_intel_lp64_dll.lib" - $MKLINTELTHREADDLL_LIB = Join-Path $intelMklDirectory "mkl/lib/${architectureDir}/mkl_intel_thread_dll.lib" - - if ((Test-Path $LIBIOMP5MD_LIB) -eq $False) { - Write-Host "Error: ${LIBIOMP5MD_LIB} does not found" -ForegroundColor Red - exit -1 - } - if ((Test-Path $MKLCOREDLL_LIB) -eq $False) { - Write-Host "Error: ${MKLCOREDLL_LIB} does not found" -ForegroundColor Red - exit -1 - } - if ((Test-Path $MKLINTELLP64DLL_LIB) -eq $False) { - Write-Host "Error: ${MKLINTELLP64DLL_LIB} does not found" -ForegroundColor Red - exit -1 - } - if ((Test-Path $MKLINTELTHREADDLL_LIB) -eq $False) { - Write-Host "Error: ${MKLINTELTHREADDLL_LIB} does not found" -ForegroundColor Red - exit -1 - } - - $USE_AVX_INSTRUCTIONS = $Config.GetAVXINSTRUCTIONS() - $USE_SSE4_INSTRUCTIONS = $Config.GetSSE4INSTRUCTIONS() - $USE_SSE2_INSTRUCTIONS = $Config.GetSSE2INSTRUCTIONS() - - cmake -G $Config.GetVisualStudio() -A $Config.GetVisualStudioArchitecture() -T host=x64 ` - -D DLIB_USE_CUDA=OFF ` - -D DLIB_USE_BLAS=ON ` - -D DLIB_USE_LAPACK=OFF ` - -D mkl_include_dir="${MKL_INCLUDE_DIR}" ` - -D BLAS_libiomp5md_LIBRARY="${LIBIOMP5MD_LIB}" ` - -D BLAS_mkl_core_dll_LIBRARY="${MKLCOREDLL_LIB}" ` - -D BLAS_mkl_intel_lp64_dll_LIBRARY="${MKLINTELLP64DLL_LIB}" ` - -D BLAS_mkl_intel_thread_dll_LIBRARY="${MKLINTELTHREADDLL_LIB}" ` - -D USE_AVX_INSTRUCTIONS=$USE_AVX_INSTRUCTIONS ` - -D USE_SSE4_INSTRUCTIONS=$USE_SSE4_INSTRUCTIONS ` - -D USE_SSE2_INSTRUCTIONS=$USE_SSE2_INSTRUCTIONS ` - .. - } - } - } - else - { - $USE_AVX_INSTRUCTIONS = $Config.GetAVXINSTRUCTIONS() - $USE_SSE4_INSTRUCTIONS = $Config.GetSSE4INSTRUCTIONS() - $USE_SSE2_INSTRUCTIONS = $Config.GetSSE2INSTRUCTIONS() - - $arch_type = $Config.GetArchitecture() - cmake -D ARCH_TYPE="$arch_type" ` - -D DLIB_USE_CUDA=OFF ` - -D DLIB_USE_BLAS=ON ` - -D DLIB_USE_LAPACK=OFF ` - -D LIBPNG_IS_GOOD=OFF ` - -D PNG_FOUND=OFF ` - -D PNG_LIBRARY_RELEASE="" ` - -D PNG_LIBRARY_DEBUG="" ` - -D PNG_PNG_INCLUDE_DIR="" ` - -D USE_AVX_INSTRUCTIONS=$USE_AVX_INSTRUCTIONS ` - -D USE_SSE4_INSTRUCTIONS=$USE_SSE4_INSTRUCTIONS ` - -D USE_SSE2_INSTRUCTIONS=$USE_SSE2_INSTRUCTIONS ` - .. - } -} - -function ConfigARM([Config]$Config) -{ - if ($Config.GetArchitecture() -eq 32) - { - cmake -D DLIB_USE_CUDA=OFF ` - -D ENABLE_NEON=ON ` - -D DLIB_USE_BLAS=ON ` - -D DLIB_USE_LAPACK=OFF ` - -D CMAKE_C_COMPILER="/usr/bin/arm-linux-gnueabihf-gcc" ` - -D CMAKE_CXX_COMPILER="/usr/bin/arm-linux-gnueabihf-g++" ` - -D LIBPNG_IS_GOOD=OFF ` - -D PNG_FOUND=OFF ` - -D PNG_LIBRARY_RELEASE="" ` - -D PNG_LIBRARY_DEBUG="" ` - -D PNG_PNG_INCLUDE_DIR="" ` - .. - } - else - { - cmake -D DLIB_USE_CUDA=OFF ` - -D ENABLE_NEON=ON ` - -D DLIB_USE_BLAS=ON ` - -D DLIB_USE_LAPACK=OFF ` - -D CMAKE_C_COMPILER="/usr/bin/aarch64-linux-gnu-gcc" ` - -D CMAKE_CXX_COMPILER="/usr/bin/aarch64-linux-gnu-g++" ` - -D LIBPNG_IS_GOOD=OFF ` - -D PNG_FOUND=OFF ` - -D PNG_LIBRARY_RELEASE="" ` - -D PNG_LIBRARY_DEBUG="" ` - -D PNG_PNG_INCLUDE_DIR="" ` - .. - } -} - -function ConfigUWP([Config]$Config) -{ - if ($IsWindows) - { - # apply patch - $patch = "uwp.patch" - $nugetDir = $Config.GetNugetDir() - $dlibDir = $Config.GetDlibRootDir() - $patchFullPath = Join-Path $nugetDir $patch - $current = Get-Location - Set-Location -Path $dlibDir - Write-Host "Apply ${patch} to ${dlibDir}" -ForegroundColor Yellow - Write-Host "git apply ""${patchFullPath}""" -ForegroundColor Yellow - git apply """${patchFullPath}""" - Set-Location -Path $current - - if ($Config.GetTarget() -eq "arm") - { - cmake -G $Config.GetVisualStudio() -A $Config.GetVisualStudioArchitecture() -T host=x64 ` - -D CMAKE_SYSTEM_NAME=WindowsStore ` - -D USE_AVX_INSTRUCTIONS:BOOL=OFF ` - -D USE_SSE2_INSTRUCTIONS:BOOL=OFF ` - -D USE_SSE4_INSTRUCTIONS:BOOL=OFF ` - -D CMAKE_SYSTEM_VERSION=10.0 ` - -D WINAPI_FAMILY=WINAPI_FAMILY_APP ` - -D _WINDLL=ON ` - -D _WIN32_UNIVERSAL_APP=ON ` - -D DLIB_USE_CUDA=OFF ` - -D DLIB_USE_BLAS=OFF ` - -D DLIB_USE_LAPACK=OFF ` - -D DLIB_NO_GUI_SUPPORT=ON ` - .. - } - else - { - $USE_AVX_INSTRUCTIONS = $Config.GetAVXINSTRUCTIONS() - $USE_SSE4_INSTRUCTIONS = $Config.GetSSE4INSTRUCTIONS() - $USE_SSE2_INSTRUCTIONS = $Config.GetSSE2INSTRUCTIONS() - - cmake -G $Config.GetVisualStudio() -A $Config.GetVisualStudioArchitecture() -T host=x64 ` - -D CMAKE_SYSTEM_NAME=WindowsStore ` - -D CMAKE_SYSTEM_VERSION=10.0 ` - -D WINAPI_FAMILY=WINAPI_FAMILY_APP ` - -D _WINDLL=ON ` - -D _WIN32_UNIVERSAL_APP=ON ` - -D DLIB_USE_CUDA=OFF ` - -D DLIB_USE_BLAS=OFF ` - -D DLIB_USE_LAPACK=OFF ` - -D DLIB_NO_GUI_SUPPORT=ON ` - -D USE_AVX_INSTRUCTIONS=$USE_AVX_INSTRUCTIONS ` - -D USE_SSE4_INSTRUCTIONS=$USE_SSE4_INSTRUCTIONS ` - -D USE_SSE2_INSTRUCTIONS=$USE_SSE2_INSTRUCTIONS ` - .. - } - - } -} - -function ConfigANDROID([Config]$Config) -{ - if ($IsLinux) - { - if (!${env:ANDROID_NDK_HOME}) - { - Write-Host "Error: Specify ANDROID_NDK_HOME environmental value" -ForegroundColor Red - exit -1 - } - - if ((Test-Path "${env:ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake") -eq $False) - { - Write-Host "Error: Specified Android NDK toolchain '${env:ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake' does not found" -ForegroundColor Red - exit -1 - } - - $level = $Config.GetAndroidNativeAPILevel() - $abi = $Config.GetAndroidABI() - - cmake -G Ninja ` - -D CMAKE_TOOLCHAIN_FILE=${env:ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake ` - -D ANDROID_NDK=${env:ANDROID_NDK_HOME} ` - -D CMAKE_MAKE_PROGRAM=ninja ` - -D ANDROID_NATIVE_API_LEVEL=${level} ` - -D ANDROID_ABI=${abi} ` - -D ANDROID_TOOLCHAIN=clang ` - -D DLIB_USE_CUDA=OFF ` - -D DLIB_USE_BLAS=OFF ` - -D DLIB_USE_LAPACK=OFF ` - -D mkl_include_dir="" ` - -D mkl_intel="" ` - -D mkl_rt="" ` - -D mkl_thread="" ` - -D mkl_pthread="" ` - -D LIBPNG_IS_GOOD=OFF ` - -D PNG_FOUND=OFF ` - -D PNG_LIBRARY_RELEASE="" ` - -D PNG_LIBRARY_DEBUG="" ` - -D PNG_PNG_INCLUDE_DIR="" ` - -D DLIB_NO_GUI_SUPPORT=ON ` - .. - } - else - { - Write-Host "Error: This platform can not build android binary" -ForegroundColor Red - exit -1 - } -} - -function ConfigIOS([Config]$Config) -{ - if ($IsMacOS) - { - cmake -G Xcode ` - -D CMAKE_TOOLCHAIN_FILE=../../ios-cmake/ios.toolchain.cmake ` - -D PLATFORM=OS64COMBINED ` - -D DLIB_USE_CUDA=OFF ` - -D DLIB_USE_BLAS=OFF ` - -D DLIB_USE_LAPACK=OFF ` - -D mkl_include_dir="" ` - -D mkl_intel="" ` - -D mkl_rt="" ` - -D mkl_thread="" ` - -D mkl_pthread="" ` - -D LIBPNG_IS_GOOD=OFF ` - -D PNG_FOUND=OFF ` - -D PNG_LIBRARY_RELEASE="" ` - -D PNG_LIBRARY_DEBUG="" ` - -D PNG_PNG_INCLUDE_DIR="" ` - -D DLIB_NO_GUI_SUPPORT=ON ` - .. - } - else - { - Write-Host "Error: This platform can not build iOS binary" -ForegroundColor Red - exit -1 - } -} - -function Reset-Dlib-Modification([Config]$Config, [string]$currentDir) -{ - $dlibDir = $Config.GetDlibRootDir() - Set-Location -Path $dlibDir - Write-Host "Reset modification of ${dlibDir}" -ForegroundColor Yellow - git checkout . - Set-Location -Path $currentDir -} - -function Build([Config]$Config) -{ - $Current = Get-Location - - $Output = $Config.GetBuildDirectoryName("") - if ((Test-Path $Output) -eq $False) - { - New-Item $Output -ItemType Directory - } - - Set-Location -Path $Output - - $Target = $Config.GetTarget() - $Platform = $Config.GetPlatform() - - # revert dlib - Reset-Dlib-Modification $Config (Join-Path $Current $Output) - - switch ($Platform) - { - "desktop" - { - switch ($Target) - { - "cpu" - { - ConfigCPU $Config - } - "mkl" - { - ConfigMKL $Config - } - "cuda" - { - ConfigCUDA $Config - } - "arm" - { - ConfigARM $Config - } - } - } - "android" - { - ConfigANDROID $Config - } - "ios" - { - ConfigIOS $Config - } - "uwp" - { - ConfigUWP $Config - } - } - - cmake --build . --config $Config.GetConfigurationName() - - # Move to Root directory - Set-Location -Path $Current -} - -function CopyToArtifact() -{ - Param([string]$srcDir, [string]$build, [string]$libraryName, [string]$dstDir, [string]$rid, [string]$configuration="") - - if ($configuration) - { - $binary = Join-Path ${srcDir} ${build} | ` - Join-Path -ChildPath ${configuration} | ` - Join-Path -ChildPath ${libraryName} - } - else - { - $binary = Join-Path ${srcDir} ${build} | ` - Join-Path -ChildPath ${libraryName} - } - - $output = Join-Path $dstDir runtimes | ` - Join-Path -ChildPath ${rid} | ` - Join-Path -ChildPath native | ` - Join-Path -ChildPath $libraryName - - Write-Host "Copy ${libraryName} to ${output}" -ForegroundColor Green - Copy-Item ${binary} ${output} -} \ No newline at end of file +class Config +{ + + $ConfigurationArray = + @( + "Debug", + "Release" + ) + + $TargetArray = + @( + "cpu", + "cuda", + "mkl", + "arm" + ) + + $PlatformArray = + @( + "desktop", + "android", + "ios", + "uwp" + ) + + $ArchitectureArray = + @( + 32, + 64 + ) + + $CudaVersionArray = + @( + 90, + 91, + 92, + 100, + 101, + 102, + 110, + 111 + ) + + $CudaVersionHash = + @{ + 90 = "CUDA_PATH_V9_0"; + 91 = "CUDA_PATH_V9_1"; + 92 = "CUDA_PATH_V9_2"; + 100 = "CUDA_PATH_V10_0"; + 101 = "CUDA_PATH_V10_1"; + 102 = "CUDA_PATH_V10_2"; + 110 = "CUDA_PATH_V11_0"; + 111 = "CUDA_PATH_V11_1"; + } + + $VisualStudio = "Visual Studio 15 2017" + + static $BuildLibraryWindowsHash = + @{ + "GenderClassification" = "DlibDotNetNativeDnnGenderClassification.dll"; + "AgeClassification" = "DlibDotNetNativeDnnAgeClassification.dll"; + } + + static $BuildLibraryLinuxHash = + @{ + "GenderClassification" = "libDlibDotNetNativeDnnGenderClassification.so"; + "AgeClassification" = "libDlibDotNetNativeDnnAgeClassification.so"; + } + + static $BuildLibraryOSXHash = + @{ + "GenderClassification" = "libDlibDotNetNativeDnnGenderClassification.dylib"; + "AgeClassification" = "libDlibDotNetNativeDnnAgeClassification.dylib"; + } + + static $BuildLibraryIOSHash = + @{ + "GenderClassification" = "libDlibDotNetNativeDnnGenderClassification.a"; + "AgeClassification" = "libDlibDotNetNativeDnnAgeClassification.a"; + } + + [string] $_Root + [string] $_Configuration + [int] $_Architecture + [string] $_Target + [string] $_Platform + [string] $_MklDirectory + [int] $_CudaVersion + [string] $_AndroidABI + [string] $_AndroidNativeAPILevel + + #*************************************** + # Arguments + # %1: Root directory of DlibDotNet + # %2: Build Configuration (Release/Debug) + # %3: Target (cpu/cuda/mkl/arm) + # %4: Architecture (32/64) + # %5: Platform (desktop/android/ios/uwp) + # %6: Optional Argument + # if Target is cuda, CUDA version if Target is cuda [90/91/92/100/101/102] + # if Target is mkl and Windows, IntelMKL directory path + #*************************************** + Config( [string]$Root, + [string]$Configuration, + [string]$Target, + [int] $Architecture, + [string]$Platform, + [string]$Option + ) + { + if ($this.ConfigurationArray.Contains($Configuration) -eq $False) + { + $candidate = $this.ConfigurationArray -join "/" + Write-Host "Error: Specify build configuration [${candidate}]" -ForegroundColor Red + exit -1 + } + + if ($this.TargetArray.Contains($Target) -eq $False) + { + $candidate = $this.TargetArray -join "/" + Write-Host "Error: Specify Target [${candidate}]" -ForegroundColor Red + exit -1 + } + + if ($this.ArchitectureArray.Contains($Architecture) -eq $False) + { + $candidate = $this.ArchitectureArray -join "/" + Write-Host "Error: Specify Architecture [${candidate}]" -ForegroundColor Red + exit -1 + } + + if ($this.PlatformArray.Contains($Platform) -eq $False) + { + $candidate = $this.PlatformArray -join "/" + Write-Host "Error: Specify Architecture [${candidate}]" -ForegroundColor Red + exit -1 + } + + switch ($Target) + { + "cuda" + { + $this._CudaVersion = [int]$Option + if ($this.CudaVersionArray.Contains($this._CudaVersion) -ne $True) + { + $candidate = $this.CudaVersionArray -join "/" + Write-Host "Error: Specify CUDA version [${candidate}]" -ForegroundColor Red + exit -1 + } + } + "mkl" + { + $this._MklDirectory = $Option + } + } + + switch ($Platform) + { + "android" + { + $decoded = [Config]::Base64Decode($Option) + $setting = ConvertFrom-Json $decoded + $this._AndroidABI = $setting.ANDROID_ABI + $this._AndroidNativeAPILevel = $setting.ANDROID_NATIVE_API_LEVEL + } + } + + $this._Root = $Root + $this._Configuration = $Configuration + $this._Architecture = $Architecture + $this._Target = $Target + $this._Platform = $Platform + } + + static [string] Base64Encode([string]$text) + { + $byte = ([System.Text.Encoding]::Default).GetBytes($text) + return [Convert]::ToBase64String($byte) + } + + static [string] Base64Decode([string]$base64) + { + $byte = [System.Convert]::FromBase64String($base64) + return [System.Text.Encoding]::Default.GetString($byte) + } + + static [hashtable] GetBinaryLibraryWindowsHash() + { + return [Config]::BuildLibraryWindowsHash + } + + static [hashtable] GetBinaryLibraryOSXHash() + { + return [Config]::BuildLibraryOSXHash + } + + static [hashtable] GetBinaryLibraryLinuxHash() + { + return [Config]::BuildLibraryLinuxHash + } + + static [hashtable] GetBinaryLibraryIOSHash() + { + return [Config]::BuildLibraryIOSHash + } + + [string] GetRootDir() + { + return $this._Root + } + + [string] GetDlibRootDir() + { + return Join-Path $this.GetRootDir() src | + Join-Path -ChildPath DlibDotNet | + Join-Path -ChildPath src | + Join-Path -ChildPath dlib + } + + [string] GetNugetDir() + { + return Join-Path $this.GetRootDir() nuget + } + + [int] GetArchitecture() + { + return $this._Architecture + } + + [string] GetConfigurationName() + { + return $this._Configuration + } + + [string] GetAndroidABI() + { + return $this._AndroidABI + } + + [string] GetAndroidNativeAPILevel() + { + return $this._AndroidNativeAPILevel + } + + [string] GetArtifactDirectoryName() + { + $target = $this._Target + $platform = $this._Platform + $name = "" + + switch ($platform) + { + "desktop" + { + if ($target -eq "cuda") + { + $cudaVersion = $this._CudaVersion + $name = "${target}-${cudaVersion}" + } + else + { + $name = $target + } + } + "android" + { + $name = $platform + } + "ios" + { + $name = $platform + } + "uwp" + { + $name = Join-Path $platform $target + } + } + + return $name + } + + [string] GetOSName() + { + $os = "" + + if ($global:IsWindows) + { + $os = "win" + } + elseif ($global:IsMacOS) + { + $os = "osx" + } + elseif ($global:IsLinux) + { + $os = "linux" + } + else + { + Write-Host "Error: This plaform is not support" -ForegroundColor Red + exit -1 + } + + return $os + } + + [string] GetIntelMklDirectory() + { + return [string]$this._MklDirectory + } + + [string] GetArchitectureName() + { + $arch = "" + $target = $this._Target + $architecture = $this._Architecture + + if ($target -eq "arm") + { + if ($architecture -eq 32) + { + $arch = "arm" + } + elseif ($architecture -eq 64) + { + $arch = "arm64" + } + } + else + { + if ($architecture -eq 32) + { + $arch = "x86" + } + elseif ($architecture -eq 64) + { + $arch = "x64" + } + } + + return $arch + } + + [string] GetTarget() + { + return $this._Target + } + + [string] GetPlatform() + { + return $this._Platform + } + + [string] GetRootStoreDriectory() + { + return $env:CIBuildDir + } + + [string] GetStoreDriectory([string]$CMakefileDir) + { + $DirectoryName = Split-Path $CMakefileDir -leaf + $buildDir = $this.GetRootStoreDriectory() + if (!(Test-Path($buildDir))) + { + return $CMakefileDir + } + + return Join-Path $buildDir "FaceRecognitionDotNet" | ` + Join-Path -ChildPath $DirectoryName + } + + [bool] HasStoreDriectory() + { + $buildDir = $this.GetRootStoreDriectory() + return Test-Path($buildDir) + } + + [string] GetBuildDirectoryName([string]$os="") + { + if (![string]::IsNullOrEmpty($os)) + { + $osname = $os + } + elseif (![string]::IsNullOrEmpty($env:TARGETRID)) + { + $osname = $env:TARGETRID + } + else + { + $osname = $this.GetOSName() + } + + $target = $this._Target + $platform = $this._Platform + $architecture = $this.GetArchitectureName() + + if ($target -eq "cuda") + { + $version = $this._CudaVersion + return "build_${osname}_${platform}_cuda-${version}_${architecture}" + } + else + { + return "build_${osname}_${platform}_${target}_${architecture}" + } + } + + [string] GetVisualStudio() + { + return $this.VisualStudio + } + + [string] GetVisualStudioArchitecture() + { + $architecture = $this._Architecture + $target = $this._Target + + if ($target -eq "arm") + { + if ($architecture -eq 32) + { + return "ARM" + } + elseif ($architecture -eq 64) + { + return "ARM64" + } + } + else + { + if ($architecture -eq 32) + { + return "Win32" + } + elseif ($architecture -eq 64) + { + return "x64" + } + } + + Write-Host "${architecture} and ${target} do not support" -ForegroundColor Red + exit -1 + } + + [string] GetCUDAPath() + { + # CUDA_PATH_V10_0=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v10.0 + # CUDA_PATH_V10_1=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v10.1 + # CUDA_PATH_V10_2=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v10.2 + # CUDA_PATH_V9_0=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v9.0 + # CUDA_PATH_V9_1=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v9.1 + # CUDA_PATH_V9_2=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v9.2 + $version = $this.CudaVersionHash[$this._CudaVersion] + return [environment]::GetEnvironmentVariable($version, 'Machine') + } + + [string] GetAVXINSTRUCTIONS() + { + return "ON" + } + + [string] GetSSE4INSTRUCTIONS() + { + return "ON" + } + + [string] GetSSE2INSTRUCTIONS() + { + return "OFF" + } + +} + +function ConfigCPU([Config]$Config, [string]$CMakefileDir) +{ + if ($IsWindows) + { + $USE_AVX_INSTRUCTIONS = $Config.GetAVXINSTRUCTIONS() + $USE_SSE4_INSTRUCTIONS = $Config.GetSSE4INSTRUCTIONS() + $USE_SSE2_INSTRUCTIONS = $Config.GetSSE2INSTRUCTIONS() + + cmake -G $Config.GetVisualStudio() -A $Config.GetVisualStudioArchitecture() -T host=x64 ` + -D DLIB_USE_CUDA=OFF ` + -D DLIB_USE_LAPACK=OFF ` + -D USE_AVX_INSTRUCTIONS=$USE_AVX_INSTRUCTIONS ` + -D USE_SSE4_INSTRUCTIONS=$USE_SSE4_INSTRUCTIONS ` + -D USE_SSE2_INSTRUCTIONS=$USE_SSE2_INSTRUCTIONS ` + -D JPEG_FOUND=OFF ` + ${CMakefileDir} + } + elseif ($IsMacOS) + { + # Use static libjpeg + $USE_AVX_INSTRUCTIONS = $Config.GetAVXINSTRUCTIONS() + $USE_SSE4_INSTRUCTIONS = $Config.GetSSE4INSTRUCTIONS() + $USE_SSE2_INSTRUCTIONS = $Config.GetSSE2INSTRUCTIONS() + + $arch_type = $Config.GetArchitecture() + cmake -D ARCH_TYPE="$arch_type" ` + -D DLIB_USE_CUDA=OFF ` + -D DLIB_USE_LAPACK=OFF ` + -D mkl_include_dir="" ` + -D mkl_intel="" ` + -D mkl_rt="" ` + -D mkl_thread="" ` + -D mkl_pthread="" ` + -D LIBPNG_IS_GOOD=OFF ` + -D PNG_FOUND=OFF ` + -D PNG_LIBRARY_RELEASE="" ` + -D PNG_LIBRARY_DEBUG="" ` + -D PNG_PNG_INCLUDE_DIR="" ` + -D USE_AVX_INSTRUCTIONS=$USE_AVX_INSTRUCTIONS ` + -D USE_SSE4_INSTRUCTIONS=$USE_SSE4_INSTRUCTIONS ` + -D USE_SSE2_INSTRUCTIONS=$USE_SSE2_INSTRUCTIONS ` + -D JPEG_FOUND=OFF ` + ${CMakefileDir} + } + else + { + $USE_AVX_INSTRUCTIONS = $Config.GetAVXINSTRUCTIONS() + $USE_SSE4_INSTRUCTIONS = $Config.GetSSE4INSTRUCTIONS() + $USE_SSE2_INSTRUCTIONS = $Config.GetSSE2INSTRUCTIONS() + + $arch_type = $Config.GetArchitecture() + cmake -D ARCH_TYPE="$arch_type" ` + -D DLIB_USE_CUDA=OFF ` + -D DLIB_USE_LAPACK=OFF ` + -D mkl_include_dir="" ` + -D mkl_intel="" ` + -D mkl_rt="" ` + -D mkl_thread="" ` + -D mkl_pthread="" ` + -D LIBPNG_IS_GOOD=OFF ` + -D PNG_FOUND=OFF ` + -D PNG_LIBRARY_RELEASE="" ` + -D PNG_LIBRARY_DEBUG="" ` + -D PNG_PNG_INCLUDE_DIR="" ` + -D USE_AVX_INSTRUCTIONS=$USE_AVX_INSTRUCTIONS ` + -D USE_SSE4_INSTRUCTIONS=$USE_SSE4_INSTRUCTIONS ` + -D USE_SSE2_INSTRUCTIONS=$USE_SSE2_INSTRUCTIONS ` + -D JPEG_FOUND=OFF ` + ${CMakefileDir} + } +} + +function ConfigCUDA([Config]$Config, [string]$CMakefileDir) +{ + if ($IsWindows) + { + $cudaPath = $Config.GetCUDAPath() + if (!(Test-Path $cudaPath)) + { + Write-Host "Error: '${cudaPath}' does not found" -ForegroundColor Red + exit -1 + } + + $env:CUDA_PATH="${cudaPath}" + $env:PATH="$env:CUDA_PATH\bin;$env:CUDA_PATH\libnvvp;$ENV:PATH" + Write-Host "Info: CUDA_PATH: ${env:CUDA_PATH}" -ForegroundColor Green + + $USE_AVX_INSTRUCTIONS = $Config.GetAVXINSTRUCTIONS() + $USE_SSE4_INSTRUCTIONS = $Config.GetSSE4INSTRUCTIONS() + $USE_SSE2_INSTRUCTIONS = $Config.GetSSE2INSTRUCTIONS() + + cmake -G $Config.GetVisualStudio() -A $Config.GetVisualStudioArchitecture() -T host=x64 ` + -D DLIB_USE_CUDA=ON ` + -D DLIB_USE_BLAS=OFF ` + -D DLIB_USE_LAPACK=OFF ` + -D USE_AVX_INSTRUCTIONS=$USE_AVX_INSTRUCTIONS ` + -D USE_SSE4_INSTRUCTIONS=$USE_SSE4_INSTRUCTIONS ` + -D USE_SSE2_INSTRUCTIONS=$USE_SSE2_INSTRUCTIONS ` + -D CUDA_NVCC_FLAGS="--expt-relaxed-constexpr" ` + -D JPEG_FOUND=OFF ` + ${CMakefileDir} + } + else + { + $USE_AVX_INSTRUCTIONS = $Config.GetAVXINSTRUCTIONS() + $USE_SSE4_INSTRUCTIONS = $Config.GetSSE4INSTRUCTIONS() + $USE_SSE2_INSTRUCTIONS = $Config.GetSSE2INSTRUCTIONS() + + cmake -D DLIB_USE_CUDA=ON ` + -D DLIB_USE_BLAS=OFF ` + -D DLIB_USE_LAPACK=OFF ` + -D LIBPNG_IS_GOOD=OFF ` + -D PNG_FOUND=OFF ` + -D PNG_LIBRARY_RELEASE="" ` + -D PNG_LIBRARY_DEBUG="" ` + -D PNG_PNG_INCLUDE_DIR="" ` + -D USE_AVX_INSTRUCTIONS=$USE_AVX_INSTRUCTIONS ` + -D USE_SSE4_INSTRUCTIONS=$USE_SSE4_INSTRUCTIONS ` + -D USE_SSE2_INSTRUCTIONS=$USE_SSE2_INSTRUCTIONS ` + -D CUDA_NVCC_FLAGS="--expt-relaxed-constexpr" ` + -D JPEG_FOUND=OFF ` + ${CMakefileDir} + } +} + +function ConfigMKL([Config]$Config, [string]$CMakefileDir) +{ + if ($IsWindows) + { + $intelMklDirectory = $Config.GetIntelMklDirectory() + if (!$intelMklDirectory) { + Write-Host "Error: Specify Intel MKL directory" -ForegroundColor Red + exit -1 + } + + if ((Test-Path $intelMklDirectory) -eq $False) { + Write-Host "Error: Specified IntelMKL directory '${intelMklDirectory}' does not found" -ForegroundColor Red + exit -1 + } + + $architecture = $Config.GetArchitecture() + $architectureDir = "" + switch ($architecture) + { + 32 + { + $architectureDir = "ia32_win" + $MKL_INCLUDE_DIR = Join-Path $intelMklDirectory "mkl/include" + $LIBIOMP5MD_LIB = Join-Path $intelMklDirectory "compiler/lib/${architectureDir}/libiomp5md.lib" + $MKLCOREDLL_LIB = Join-Path $intelMklDirectory "mkl/lib/${architectureDir}/mkl_core_dll.lib" + $MKLINTELC_LIB = Join-Path $intelMklDirectory "mkl/lib/${architectureDir}/mkl_intel_c.lib" + $MKLINTELTHREADDLL_LIB = Join-Path $intelMklDirectory "mkl/lib/${architectureDir}/mkl_intel_thread_dll.lib" + + if ((Test-Path $LIBIOMP5MD_LIB) -eq $False) { + Write-Host "Error: ${LIBIOMP5MD_LIB} does not found" -ForegroundColor Red + exit -1 + } + if ((Test-Path $MKLCOREDLL_LIB) -eq $False) { + Write-Host "Error: ${MKLCOREDLL_LIB} does not found" -ForegroundColor Red + exit -1 + } + if ((Test-Path $MKLINTELC_LIB) -eq $False) { + Write-Host "Error: ${MKLINTELC_LIB} does not found" -ForegroundColor Red + exit -1 + } + if ((Test-Path $MKLINTELTHREADDLL_LIB) -eq $False) { + Write-Host "Error: ${MKLINTELTHREADDLL_LIB} does not found" -ForegroundColor Red + exit -1 + } + + $USE_AVX_INSTRUCTIONS = $Config.GetAVXINSTRUCTIONS() + $USE_SSE4_INSTRUCTIONS = $Config.GetSSE4INSTRUCTIONS() + $USE_SSE2_INSTRUCTIONS = $Config.GetSSE2INSTRUCTIONS() + + cmake -G $Config.GetVisualStudio() -A $Config.GetVisualStudioArchitecture() -T host=x64 ` + -D DLIB_USE_CUDA=OFF ` + -D DLIB_USE_BLAS=ON ` + -D DLIB_USE_LAPACK=OFF ` + -D mkl_include_dir="${MKL_INCLUDE_DIR}" ` + -D BLAS_libiomp5md_LIBRARY="${LIBIOMP5MD_LIB}" ` + -D BLAS_mkl_core_dll_LIBRARY="${MKLCOREDLL_LIB}" ` + -D BLAS_mkl_intel_c_dll_LIBRARY="${MKLINTELC_LIB}" ` + -D BLAS_mkl_intel_thread_dll_LIBRARY="${MKLINTELTHREADDLL_LIB}" ` + -D USE_AVX_INSTRUCTIONS=$USE_AVX_INSTRUCTIONS ` + -D USE_SSE4_INSTRUCTIONS=$USE_SSE4_INSTRUCTIONS ` + -D USE_SSE2_INSTRUCTIONS=$USE_SSE2_INSTRUCTIONS ` + -D JPEG_FOUND=OFF ` + ${CMakefileDir} + } + 64 + { + $architectureDir = "intel64_win" + $MKL_INCLUDE_DIR = Join-Path $intelMklDirectory "mkl/include" + $LIBIOMP5MD_LIB = Join-Path $intelMklDirectory "compiler/lib/${architectureDir}/libiomp5md.lib" + $MKLCOREDLL_LIB = Join-Path $intelMklDirectory "mkl/lib/${architectureDir}/mkl_core_dll.lib" + $MKLINTELLP64DLL_LIB = Join-Path $intelMklDirectory "mkl/lib/${architectureDir}/mkl_intel_lp64_dll.lib" + $MKLINTELTHREADDLL_LIB = Join-Path $intelMklDirectory "mkl/lib/${architectureDir}/mkl_intel_thread_dll.lib" + + if ((Test-Path $LIBIOMP5MD_LIB) -eq $False) { + Write-Host "Error: ${LIBIOMP5MD_LIB} does not found" -ForegroundColor Red + exit -1 + } + if ((Test-Path $MKLCOREDLL_LIB) -eq $False) { + Write-Host "Error: ${MKLCOREDLL_LIB} does not found" -ForegroundColor Red + exit -1 + } + if ((Test-Path $MKLINTELLP64DLL_LIB) -eq $False) { + Write-Host "Error: ${MKLINTELLP64DLL_LIB} does not found" -ForegroundColor Red + exit -1 + } + if ((Test-Path $MKLINTELTHREADDLL_LIB) -eq $False) { + Write-Host "Error: ${MKLINTELTHREADDLL_LIB} does not found" -ForegroundColor Red + exit -1 + } + + $USE_AVX_INSTRUCTIONS = $Config.GetAVXINSTRUCTIONS() + $USE_SSE4_INSTRUCTIONS = $Config.GetSSE4INSTRUCTIONS() + $USE_SSE2_INSTRUCTIONS = $Config.GetSSE2INSTRUCTIONS() + + cmake -G $Config.GetVisualStudio() -A $Config.GetVisualStudioArchitecture() -T host=x64 ` + -D DLIB_USE_CUDA=OFF ` + -D DLIB_USE_BLAS=ON ` + -D DLIB_USE_LAPACK=OFF ` + -D mkl_include_dir="${MKL_INCLUDE_DIR}" ` + -D BLAS_libiomp5md_LIBRARY="${LIBIOMP5MD_LIB}" ` + -D BLAS_mkl_core_dll_LIBRARY="${MKLCOREDLL_LIB}" ` + -D BLAS_mkl_intel_lp64_dll_LIBRARY="${MKLINTELLP64DLL_LIB}" ` + -D BLAS_mkl_intel_thread_dll_LIBRARY="${MKLINTELTHREADDLL_LIB}" ` + -D USE_AVX_INSTRUCTIONS=$USE_AVX_INSTRUCTIONS ` + -D USE_SSE4_INSTRUCTIONS=$USE_SSE4_INSTRUCTIONS ` + -D USE_SSE2_INSTRUCTIONS=$USE_SSE2_INSTRUCTIONS ` + -D JPEG_FOUND=OFF ` + ${CMakefileDir} + } + } + } + else + { + $USE_AVX_INSTRUCTIONS = $Config.GetAVXINSTRUCTIONS() + $USE_SSE4_INSTRUCTIONS = $Config.GetSSE4INSTRUCTIONS() + $USE_SSE2_INSTRUCTIONS = $Config.GetSSE2INSTRUCTIONS() + + $arch_type = $Config.GetArchitecture() + cmake -D ARCH_TYPE="$arch_type" ` + -D DLIB_USE_CUDA=OFF ` + -D DLIB_USE_BLAS=ON ` + -D DLIB_USE_LAPACK=OFF ` + -D LIBPNG_IS_GOOD=OFF ` + -D PNG_FOUND=OFF ` + -D PNG_LIBRARY_RELEASE="" ` + -D PNG_LIBRARY_DEBUG="" ` + -D PNG_PNG_INCLUDE_DIR="" ` + -D USE_AVX_INSTRUCTIONS=$USE_AVX_INSTRUCTIONS ` + -D USE_SSE4_INSTRUCTIONS=$USE_SSE4_INSTRUCTIONS ` + -D USE_SSE2_INSTRUCTIONS=$USE_SSE2_INSTRUCTIONS ` + -D JPEG_FOUND=OFF ` + ${CMakefileDir} + } +} + +function ConfigARM([Config]$Config, [string]$CMakefileDir) +{ + if ($Config.GetArchitecture() -eq 32) + { + cmake -D DLIB_USE_CUDA=OFF ` + -D ENABLE_NEON=ON ` + -D DLIB_USE_BLAS=ON ` + -D DLIB_USE_LAPACK=OFF ` + -D CMAKE_C_COMPILER="/usr/bin/arm-linux-gnueabihf-gcc" ` + -D CMAKE_CXX_COMPILER="/usr/bin/arm-linux-gnueabihf-g++" ` + -D LIBPNG_IS_GOOD=OFF ` + -D PNG_FOUND=OFF ` + -D PNG_LIBRARY_RELEASE="" ` + -D PNG_LIBRARY_DEBUG="" ` + -D PNG_PNG_INCLUDE_DIR="" ` + -D JPEG_FOUND=OFF ` + ${CMakefileDir} + } + else + { + cmake -D DLIB_USE_CUDA=OFF ` + -D ENABLE_NEON=ON ` + -D DLIB_USE_BLAS=ON ` + -D DLIB_USE_LAPACK=OFF ` + -D CMAKE_C_COMPILER="/usr/bin/aarch64-linux-gnu-gcc" ` + -D CMAKE_CXX_COMPILER="/usr/bin/aarch64-linux-gnu-g++" ` + -D LIBPNG_IS_GOOD=OFF ` + -D PNG_FOUND=OFF ` + -D PNG_LIBRARY_RELEASE="" ` + -D PNG_LIBRARY_DEBUG="" ` + -D PNG_PNG_INCLUDE_DIR="" ` + -D JPEG_FOUND=OFF ` + ${CMakefileDir} + } +} + +function ConfigUWP([Config]$Config, [string]$CMakefileDir) +{ + if ($IsWindows) + { + # apply patch + $patch = "uwp.patch" + $nugetDir = $Config.GetNugetDir() + $dlibDir = $Config.GetDlibRootDir() + $patchFullPath = Join-Path $nugetDir $patch + $current = Get-Location + Set-Location -Path $dlibDir + Write-Host "Apply ${patch} to ${dlibDir}" -ForegroundColor Yellow + Write-Host "git apply ""${patchFullPath}""" -ForegroundColor Yellow + git apply """${patchFullPath}""" + Set-Location -Path $current + + if ($Config.GetTarget() -eq "arm") + { + cmake -G $Config.GetVisualStudio() -A $Config.GetVisualStudioArchitecture() -T host=x64 ` + -D CMAKE_SYSTEM_NAME=WindowsStore ` + -D USE_AVX_INSTRUCTIONS:BOOL=OFF ` + -D USE_SSE2_INSTRUCTIONS:BOOL=OFF ` + -D USE_SSE4_INSTRUCTIONS:BOOL=OFF ` + -D CMAKE_SYSTEM_VERSION=10.0 ` + -D WINAPI_FAMILY=WINAPI_FAMILY_APP ` + -D _WINDLL=ON ` + -D _WIN32_UNIVERSAL_APP=ON ` + -D DLIB_USE_CUDA=OFF ` + -D DLIB_USE_BLAS=OFF ` + -D DLIB_USE_LAPACK=OFF ` + -D DLIB_NO_GUI_SUPPORT=ON ` + -D JPEG_FOUND=OFF ` + ${CMakefileDir} + } + else + { + $USE_AVX_INSTRUCTIONS = $Config.GetAVXINSTRUCTIONS() + $USE_SSE4_INSTRUCTIONS = $Config.GetSSE4INSTRUCTIONS() + $USE_SSE2_INSTRUCTIONS = $Config.GetSSE2INSTRUCTIONS() + + cmake -G $Config.GetVisualStudio() -A $Config.GetVisualStudioArchitecture() -T host=x64 ` + -D CMAKE_SYSTEM_NAME=WindowsStore ` + -D CMAKE_SYSTEM_VERSION=10.0 ` + -D WINAPI_FAMILY=WINAPI_FAMILY_APP ` + -D _WINDLL=ON ` + -D _WIN32_UNIVERSAL_APP=ON ` + -D DLIB_USE_CUDA=OFF ` + -D DLIB_USE_BLAS=OFF ` + -D DLIB_USE_LAPACK=OFF ` + -D DLIB_NO_GUI_SUPPORT=ON ` + -D USE_AVX_INSTRUCTIONS=$USE_AVX_INSTRUCTIONS ` + -D USE_SSE4_INSTRUCTIONS=$USE_SSE4_INSTRUCTIONS ` + -D USE_SSE2_INSTRUCTIONS=$USE_SSE2_INSTRUCTIONS ` + -D JPEG_FOUND=OFF ` + ${CMakefileDir} + } + + } +} + +function ConfigANDROID([Config]$Config, [string]$CMakefileDir) +{ + if ($IsLinux) + { + if (!${env:ANDROID_NDK_HOME}) + { + Write-Host "Error: Specify ANDROID_NDK_HOME environmental value" -ForegroundColor Red + exit -1 + } + + if ((Test-Path "${env:ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake") -eq $False) + { + Write-Host "Error: Specified Android NDK toolchain '${env:ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake' does not found" -ForegroundColor Red + exit -1 + } + + $level = $Config.GetAndroidNativeAPILevel() + $abi = $Config.GetAndroidABI() + + cmake -G Ninja ` + -D CMAKE_TOOLCHAIN_FILE=${env:ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake ` + -D ANDROID_NDK=${env:ANDROID_NDK_HOME} ` + -D CMAKE_MAKE_PROGRAM=ninja ` + -D ANDROID_NATIVE_API_LEVEL=${level} ` + -D ANDROID_ABI=${abi} ` + -D ANDROID_TOOLCHAIN=clang ` + -D DLIB_USE_CUDA=OFF ` + -D DLIB_USE_BLAS=OFF ` + -D DLIB_USE_LAPACK=OFF ` + -D mkl_include_dir="" ` + -D mkl_intel="" ` + -D mkl_rt="" ` + -D mkl_thread="" ` + -D mkl_pthread="" ` + -D LIBPNG_IS_GOOD=OFF ` + -D PNG_FOUND=OFF ` + -D PNG_LIBRARY_RELEASE="" ` + -D PNG_LIBRARY_DEBUG="" ` + -D PNG_PNG_INCLUDE_DIR="" ` + -D DLIB_NO_GUI_SUPPORT=ON ` + -D JPEG_FOUND=OFF ` + ${CMakefileDir} + } + else + { + Write-Host "Error: This platform can not build android binary" -ForegroundColor Red + exit -1 + } +} + +function ConfigIOS([Config]$Config, [string]$CMakefileDir) +{ + if ($IsMacOS) + { + cmake -G Xcode ` + -D CMAKE_TOOLCHAIN_FILE=../../ios-cmake/ios.toolchain.cmake ` + -D PLATFORM=OS64COMBINED ` + -D DLIB_USE_CUDA=OFF ` + -D DLIB_USE_BLAS=OFF ` + -D DLIB_USE_LAPACK=OFF ` + -D mkl_include_dir="" ` + -D mkl_intel="" ` + -D mkl_rt="" ` + -D mkl_thread="" ` + -D mkl_pthread="" ` + -D LIBPNG_IS_GOOD=OFF ` + -D PNG_FOUND=OFF ` + -D PNG_LIBRARY_RELEASE="" ` + -D PNG_LIBRARY_DEBUG="" ` + -D PNG_PNG_INCLUDE_DIR="" ` + -D DLIB_NO_GUI_SUPPORT=ON ` + -D JPEG_FOUND=OFF ` + ${CMakefileDir} + } + else + { + Write-Host "Error: This platform can not build iOS binary" -ForegroundColor Red + exit -1 + } +} + +function Reset-Dlib-Modification([Config]$Config, [string]$currentDir) +{ + $dlibDir = $Config.GetDlibRootDir() + Set-Location -Path $dlibDir + Write-Host "Reset modification of ${dlibDir}" -ForegroundColor Yellow + git checkout . + Set-Location -Path $currentDir +} + +function Build([Config]$Config) +{ + # current is each source directory + $Current = Get-Location + + $CMakefile = Join-Path $Current "CMakeLists.txt" + if (!(Test-Path(${CMakefile}))) + { + Write-Host "CMakeLists.txt does not exist in ${Current}" -ForegroundColor Red + exit -1 + } + + $Output = $Config.GetBuildDirectoryName("") + if ((Test-Path $Output) -eq $False) + { + New-Item $Output -ItemType Directory + } + + $BuildDirectory = $Config.GetStoreDriectory($Current) + $BuildDirectory = Join-Path $BuildDirectory $Output + if ((Test-Path $BuildDirectory) -eq $False) + { + New-Item $BuildDirectory -ItemType Directory + } + + $Target = $Config.GetTarget() + $Platform = $Config.GetPlatform() + + # revert dlib + Reset-Dlib-Modification $Config (Join-Path $Current $Output) + + Set-Location -Path $BuildDirectory + + switch ($Platform) + { + "desktop" + { + switch ($Target) + { + "cpu" + { + ConfigCPU $Config $Current + } + "mkl" + { + ConfigMKL $Config $Current + } + "cuda" + { + ConfigCUDA $Config $Current + } + "arm" + { + ConfigARM $Config $Current + } + } + } + "android" + { + ConfigANDROID $Config $Current + } + "ios" + { + ConfigIOS $Config $Current + } + "uwp" + { + ConfigUWP $Config $Current + } + } + + cmake --build . --config $Config.GetConfigurationName() + + # Move to Root directory + Set-Location -Path $Current +} + +function CopyToArtifact() +{ + Param([string]$srcDir, [string]$build, [string]$libraryName, [string]$dstDir, [string]$rid, [string]$configuration="") + + if ($configuration) + { + $binary = Join-Path ${srcDir} ${build} | ` + Join-Path -ChildPath ${configuration} | ` + Join-Path -ChildPath ${libraryName} + } + else + { + $binary = Join-Path ${srcDir} ${build} | ` + Join-Path -ChildPath ${libraryName} + } + + $output = Join-Path $dstDir runtimes | ` + Join-Path -ChildPath ${rid} | ` + Join-Path -ChildPath native | ` + Join-Path -ChildPath $libraryName + + Write-Host "Copy ${libraryName} to ${output}" -ForegroundColor Green + Copy-Item ${binary} ${output} +} diff --git a/nuget/BuildWindows.ps1 b/nuget/BuildWindows.ps1 index 9329993..5a7de0a 100644 --- a/nuget/BuildWindows.ps1 +++ b/nuget/BuildWindows.ps1 @@ -38,6 +38,8 @@ $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; RID = "$OperatingSystem-x64"; CUDA = 100 } $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; RID = "$OperatingSystem-x64"; CUDA = 101 } $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; RID = "$OperatingSystem-x64"; CUDA = 102 } +$BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; RID = "$OperatingSystem-x64"; CUDA = 110 } +$BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; RID = "$OperatingSystem-x64"; CUDA = 111 } foreach ($BuildTarget in $BuildTargets) { @@ -85,6 +87,8 @@ foreach ($BuildTarget in $BuildTargets) foreach ($key in $BuildSourceHash.keys) { $srcDir = Join-Path $FaceRecognitionDotNetSourceRoot $key + $srcDir = $Config.GetStoreDriectory($srcDir) + $dll = $BuildSourceHash[$key] $dstDir = Join-Path $Current $libraryDir diff --git a/nuget/CreateAllPackage.bat b/nuget/CreateAllPackage.bat deleted file mode 100644 index a02e503..0000000 --- a/nuget/CreateAllPackage.bat +++ /dev/null @@ -1,9 +0,0 @@ -dotnet restore ..\src\FaceRecognitionDotNet -dotnet build -c Release ..\src\FaceRecognitionDotNet - -pwsh CreatePackage.ps1 CPU -pwsh CreatePackage.ps1 CUDA92 -pwsh CreatePackage.ps1 CUDA100 -pwsh CreatePackage.ps1 CUDA101 -pwsh CreatePackage.ps1 CUDA102 -pwsh CreatePackage.ps1 MKL \ No newline at end of file diff --git a/nuget/CreateAllPackage.ps1 b/nuget/CreateAllPackage.ps1 new file mode 100644 index 0000000..00ac1f5 --- /dev/null +++ b/nuget/CreateAllPackage.ps1 @@ -0,0 +1,23 @@ +$targets = @( + "CPU", + "CUDA92", + "CUDA100", + "CUDA101", + "CUDA102", + "CUDA110", + "CUDA111", + "MKL" +) + +$ScriptPath = $PSScriptRoot +$FaceRecognitionDotNetRoot = Split-Path $ScriptPath -Parent + +$source = Join-Path $FaceRecognitionDotNetRoot src | ` + Join-Path -ChildPath FaceRecognitionDotNet +dotnet restore ${source} +dotnet build -c Release ${source} + +foreach ($target in $targets) +{ + pwsh CreatePackage.ps1 $target +} \ No newline at end of file diff --git a/nuget/CreatePackage.ps1 b/nuget/CreatePackage.ps1 index 897d922..0067941 100644 --- a/nuget/CreatePackage.ps1 +++ b/nuget/CreatePackage.ps1 @@ -26,7 +26,16 @@ if (!(Test-Path ${nugetPath})) } Write-Host "${nuspec}" -ForegroundColor Green -Invoke-Expression "${nugetPath} pack ${nuspec}" + +if ($global:IsWindows) +{ + Invoke-Expression "${nugetPath} pack ${nuspec}" +} +else +{ + Invoke-Expression "mono ${nugetPath} pack ${nuspec}" +} + if ($lastexitcode -ne 0) { Write-Host "Failed '${nugetPath} pack ${nuspec}" -ForegroundColor Red diff --git a/nuget/TestPackage.ps1 b/nuget/TestPackage.ps1 index 7235fc8..b79792c 100644 --- a/nuget/TestPackage.ps1 +++ b/nuget/TestPackage.ps1 @@ -30,6 +30,31 @@ Param([Parameter( Set-StrictMode -Version Latest +function Clear-PackageCache([string]$Package, [string]$Version) +{ + $ret = (dotnet nuget locals global-packages --list) + $index = $ret.IndexOf('info : global-packages: ') + if ($index -ne -1) + { + $path = $ret.Replace('info : global-packages: ', '').Trim() + } + else + { + $path = $ret.Replace('global-packages: ', '').Trim() + } + $path = Join-Path $path $Package.ToLower() | ` + Join-Path -ChildPath $Version.ToLower() + if (Test-Path $path) + { + Write-Host "[Info] Remove '$path'" -Foreground Green + Remove-Item -Path "$path" -Recurse -Force + } + else + { + Write-Host "[Info] Missing '$path'" -Foreground Yellow + } +} + function RunTest($BuildTargets, $DependencyHash) { foreach($BuildTarget in $BuildTargets) @@ -79,25 +104,30 @@ function RunTest($BuildTargets, $DependencyHash) dotnet remove reference ..\..\src\DlibDotNet\src\DlibDotNet\DlibDotNet.csproj > $null dotnet remove reference ..\..\src\FaceRecognitionDotNet\FaceRecognitionDotNet.csproj > $null + Write-Host "[Info] Clear-PackageCache" -Foreground Yellow + Clear-PackageCache -Package $package -Version $VERSION + # restore package from local nuget pacakge # And drop stdout message dotnet add package $package -v $VERSION --source "$NugetDir" > $null # Copy Dependencies - $OutDir = Join-Path $TargetDir bin | ` - Join-Path -ChildPath Release | ` - Join-Path -ChildPath netcoreapp2.0 - if (!(Test-Path "$OutDir")) { - New-Item "$OutDir" -ItemType Directory > $null - } - - if ($IsWindows) + if ($global:IsWindows) { + $OutDir = Join-Path $TargetDir bin | ` + Join-Path -ChildPath x64 | ` + Join-Path -ChildPath Release | ` + Join-Path -ChildPath netcoreapp2.0 + if (!(Test-Path "$OutDir")) { + New-Item "$OutDir" -ItemType Directory > $null + } + if ($DependencyHash.Contains($package)) { foreach($Dependency in $DependencyHash[$package]) { - Copy-Item "$Dependency" "$OutDir" + $FileName = [System.IO.Path]::GetFileName("$Dependency") + New-Item -Value "$Dependency" -Path "$OutDir" -Name "$FileName" -ItemType SymbolicLink > $null } } } @@ -131,6 +161,8 @@ $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 100; Package = "FaceRecognitionDotNet.CUDA100" } $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 101; Package = "FaceRecognitionDotNet.CUDA101" } $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 102; Package = "FaceRecognitionDotNet.CUDA102" } +$BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 102; Package = "FaceRecognitionDotNet.CUDA110" } +$BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 102; Package = "FaceRecognitionDotNet.CUDA111" } $BuildTargets += New-Object PSObject -Property @{Target = "mkl"; Architecture = 64; CUDA = 0; Package = "FaceRecognitionDotNet.MKL" } @@ -162,6 +194,34 @@ $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 FaceRecognitionDotNet.CUDA110 +$tmp110 = New-Object 'System.Collections.Generic.List[string]' +$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cublas64_11.dll") +$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cublasLt64_11.dll") +$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cudnn_adv_infer64_8.dll") +$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cudnn_adv_train64_8.dll") +$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cudnn_cnn_infer64_8.dll") +$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cudnn_cnn_train64_8.dll") +$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cudnn_ops_infer64_8.dll") +$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cudnn_ops_train64_8.dll") +$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cudnn64_8.dll") +$tmp110.Add("$env:CUDA_PATH_V11_0\bin\curand64_10.dll") +$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cusolver64_10.dll") + +# For FaceRecognitionDotNet.CUDA111 +$tmp111 = New-Object 'System.Collections.Generic.List[string]' +$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cublas64_11.dll") +$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cublasLt64_11.dll") +$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cudnn_adv_infer64_8.dll") +$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cudnn_adv_train64_8.dll") +$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cudnn_cnn_infer64_8.dll") +$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cudnn_cnn_train64_8.dll") +$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cudnn_ops_infer64_8.dll") +$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cudnn_ops_train64_8.dll") +$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cudnn64_8.dll") +$tmp111.Add("$env:CUDA_PATH_V11_1\bin\curand64_10.dll") +$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cusolver64_11.dll") + # For mkl $tmpmkl = New-Object 'System.Collections.Generic.List[string]' $tmpmkl.Add("$env:MKL_WIN\redist\intel64_win\mkl\mkl_core.dll") @@ -173,6 +233,8 @@ $DependencyHash = @{"FaceRecognitionDotNet.CUDA92" = $tmp92; "FaceRecognitionDotNet.CUDA100" = $tmp100; "FaceRecognitionDotNet.CUDA101" = $tmp101; "FaceRecognitionDotNet.CUDA102" = $tmp102; + "FaceRecognitionDotNet.CUDA110" = $tmp110; + "FaceRecognitionDotNet.CUDA111" = $tmp111; "FaceRecognitionDotNet.MKL" = $tmpmkl} # Store current directory diff --git a/nuget/TestPackageCentOS7.ps1 b/nuget/TestPackageCentOS7.ps1 index 2eca1bc..9fc3b07 100644 --- a/nuget/TestPackageCentOS7.ps1 +++ b/nuget/TestPackageCentOS7.ps1 @@ -3,7 +3,7 @@ #%1: Version of Release (1.2.3.0) #*************************************** Param([Parameter( - Mandatory=$True, + Mandatory=$False, Position = 1 )][string] $Version @@ -18,15 +18,14 @@ $OperatingSystemVersion="7" # Store current directory $Current = Get-Location $FaceRecognitionDotNetRoot = (Split-Path (Get-Location) -Parent) -$DockerDir = Join-Path $FaceRecognitionDotNetRoot nuget | ` - Join-Path -ChildPath docker - -Set-Location -Path $DockerDir +$DockerDir = Join-Path $FaceRecognitionDotNetRoot docker $DockerFileDir = Join-Path $DockerDir test | ` Join-Path -ChildPath $OperatingSystem | ` Join-Path -ChildPath $OperatingSystemVersion +Set-Location -Path $DockerDir + $BuildTargets = @() $BuildTargets += New-Object PSObject -Property @{Target = "cpu"; Architecture = 64; CUDA = 0; Package = "FaceRecognitionDotNet"; PlatformTarget="x64"; Postfix = "/x64"; RID = "$RidOperatingSystem-x64"; } $BuildTargets += New-Object PSObject -Property @{Target = "mkl"; Architecture = 64; CUDA = 0; Package = "FaceRecognitionDotNet.MKL"; PlatformTarget="x64"; Postfix = "/x64"; RID = "$RidOperatingSystem-x64"; } @@ -34,6 +33,8 @@ $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 100; Package = "FaceRecognitionDotNet.CUDA100"; PlatformTarget="x64"; Postfix = ""; RID = "$RidOperatingSystem-x64"; } $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 101; Package = "FaceRecognitionDotNet.CUDA101"; PlatformTarget="x64"; Postfix = ""; RID = "$RidOperatingSystem-x64"; } $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 102; Package = "FaceRecognitionDotNet.CUDA102"; PlatformTarget="x64"; Postfix = ""; RID = "$RidOperatingSystem-x64"; } +$BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 110; Package = "FaceRecognitionDotNet.CUDA110"; PlatformTarget="x64"; Postfix = ""; RID = "$RidOperatingSystem-x64"; } +$BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 111; Package = "FaceRecognitionDotNet.CUDA111"; PlatformTarget="x64"; Postfix = ""; RID = "$RidOperatingSystem-x64"; } foreach($BuildTarget in $BuildTargets) { @@ -43,6 +44,33 @@ foreach($BuildTarget in $BuildTargets) $platformTarget = $BuildTarget.PlatformTarget $rid = $BuildTarget.RID $postfix = $BuildTarget.Postfix + $versionStr = $Version + + if ([string]::IsNullOrEmpty($versionStr)) + { + $packages = Get-ChildItem "${Current}/*" -include *.nupkg | ` + Where-Object -FilterScript {$_.Name -match "${package}\.([0-9\.]+).nupkg"} | ` + Sort-Object -Property Name -Descending + foreach ($file in $packages) + { + Write-Host $file -ForegroundColor Blue + } + + foreach ($file in $packages) + { + $file = Split-Path $file -leaf + $file = $file -replace "${package}\.","" + $file = $file -replace "\.nupkg","" + $versionStr = $file + break + } + + if ([string]::IsNullOrEmpty($versionStr)) + { + Write-Host "Version is not specified" -ForegroundColor Red + exit -1 + } + } if ($target -ne "cuda") { @@ -68,21 +96,21 @@ foreach($BuildTarget in $BuildTargets) if ($BuildTarget.CUDA -ne 0) { - Write-Host "Start docker run --runtime=nvidia --rm -v ""$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t ""$dockername"" $Version $package $OperatingSystem $OperatingSystemVersion" -ForegroundColor Green - docker run --runtime=nvidia --rm ` - -v "$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet" ` - -e "LOCAL_UID=$(id -u $env:USER)" ` - -e "LOCAL_GID=$(id -g $env:USER)" ` - -t "$dockername" $Version $package $OperatingSystem $OperatingSystemVersion + Write-Host "Start docker run--gpus all --rm -v ""$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t ""$dockername"" $versionStr $package $OperatingSystem $OperatingSystemVersion" -ForegroundColor Green + docker run --gpus all --rm ` + -v "$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet" ` + -e "LOCAL_UID=$(id -u $env:USER)" ` + -e "LOCAL_GID=$(id -g $env:USER)" ` + -t "$dockername" $versionStr $package $OperatingSystem $OperatingSystemVersion } else { - Write-Host "Start docker run --rm -v ""$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t ""$dockername"" $Version $package $OperatingSystem $OperatingSystemVersion" -ForegroundColor Green + Write-Host "Start docker run --rm -v ""$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t ""$dockername"" $versionStr $package $OperatingSystem $OperatingSystemVersion" -ForegroundColor Green docker run --rm ` -v "$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet" ` -e "LOCAL_UID=$(id -u $env:USER)" ` -e "LOCAL_GID=$(id -g $env:USER)" ` - -t "$dockername" $Version $package $OperatingSystem $OperatingSystemVersion + -t "$dockername" $versionStr $package $OperatingSystem $OperatingSystemVersion } if ($lastexitcode -ne 0) diff --git a/nuget/TestPackageOSX.ps1 b/nuget/TestPackageOSX.ps1 index b361b52..f545a20 100644 --- a/nuget/TestPackageOSX.ps1 +++ b/nuget/TestPackageOSX.ps1 @@ -3,7 +3,7 @@ #%1: Version of Release (1.2.3.0) #*************************************** Param([Parameter( - Mandatory=$True, + Mandatory=$False, Position = 1 )][string] $Version @@ -23,7 +23,36 @@ $BuildTargets = ( "FaceRecognitionDotNet", foreach($BuildTarget in $BuildTargets) { - $command = ".\\TestPackage.ps1 -Package $BuildTarget -Version $Version -OperatingSystem $OperatingSystem -OperatingSystemVersion $OperatingSystemVersion" + $versionStr = $Version + $package = $BuildTarget + + if ([string]::IsNullOrEmpty($versionStr)) + { + $packages = Get-ChildItem "${Current}/*" -include *.nupkg | ` + Where-Object -FilterScript {$_.Name -match "${package}\.([0-9\.]+).nupkg"} | ` + Sort-Object -Property Name -Descending + foreach ($file in $packages) + { + Write-Host $file -ForegroundColor Blue + } + + foreach ($file in $packages) + { + $file = Split-Path $file -leaf + $file = $file -replace "${package}\.","" + $file = $file -replace "\.nupkg","" + $versionStr = $file + break + } + + if ([string]::IsNullOrEmpty($versionStr)) + { + Write-Host "Version is not specified" -ForegroundColor Red + exit -1 + } + } + + $command = ".\\TestPackage.ps1 -Package $BuildTarget -Version $versionStr -OperatingSystem $OperatingSystem -OperatingSystemVersion $OperatingSystemVersion" Invoke-Expression $command if ($lastexitcode -ne 0) diff --git a/nuget/TestPackageUbuntu16.ps1 b/nuget/TestPackageUbuntu16.ps1 index b7b6431..c1ce4b0 100644 --- a/nuget/TestPackageUbuntu16.ps1 +++ b/nuget/TestPackageUbuntu16.ps1 @@ -3,7 +3,7 @@ #%1: Version of Release (1.2.3.0) #*************************************** Param([Parameter( - Mandatory=$True, + Mandatory=$False, Position = 1 )][string] $Version @@ -18,15 +18,14 @@ $OperatingSystemVersion="16" # Store current directory $Current = Get-Location $FaceRecognitionDotNetRoot = (Split-Path (Get-Location) -Parent) -$DockerDir = Join-Path $FaceRecognitionDotNetRoot nuget | ` - Join-Path -ChildPath docker - -Set-Location -Path $DockerDir +$DockerDir = Join-Path $FaceRecognitionDotNetRoot docker $DockerFileDir = Join-Path $DockerDir test | ` Join-Path -ChildPath $OperatingSystem | ` Join-Path -ChildPath $OperatingSystemVersion +Set-Location -Path $DockerDir + $BuildTargets = @() $BuildTargets += New-Object PSObject -Property @{Target = "cpu"; Architecture = 64; CUDA = 0; Package = "FaceRecognitionDotNet"; PlatformTarget="x64"; Postfix = "/x64"; RID = "$RidOperatingSystem-x64"; } $BuildTargets += New-Object PSObject -Property @{Target = "mkl"; Architecture = 64; CUDA = 0; Package = "FaceRecognitionDotNet.MKL"; PlatformTarget="x64"; Postfix = "/x64"; RID = "$RidOperatingSystem-x64"; } @@ -34,6 +33,8 @@ $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 100; Package = "FaceRecognitionDotNet.CUDA100"; PlatformTarget="x64"; Postfix = ""; RID = "$RidOperatingSystem-x64"; } $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 101; Package = "FaceRecognitionDotNet.CUDA101"; PlatformTarget="x64"; Postfix = ""; RID = "$RidOperatingSystem-x64"; } $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 102; Package = "FaceRecognitionDotNet.CUDA102"; PlatformTarget="x64"; Postfix = ""; RID = "$RidOperatingSystem-x64"; } +$BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 110; Package = "FaceRecognitionDotNet.CUDA110"; PlatformTarget="x64"; Postfix = ""; RID = "$RidOperatingSystem-x64"; } +$BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 111; Package = "FaceRecognitionDotNet.CUDA111"; PlatformTarget="x64"; Postfix = ""; RID = "$RidOperatingSystem-x64"; } foreach($BuildTarget in $BuildTargets) { @@ -43,6 +44,34 @@ foreach($BuildTarget in $BuildTargets) $platformTarget = $BuildTarget.PlatformTarget $rid = $BuildTarget.RID $postfix = $BuildTarget.Postfix + $versionStr = $Version + + if ([string]::IsNullOrEmpty($versionStr)) + { + $packages = Get-ChildItem "${Current}/*" -include *.nupkg | ` + Where-Object -FilterScript {$_.Name -match "${package}\.([0-9\.]+).nupkg"} | ` + Sort-Object -Property Name -Descending + foreach ($file in $packages) + { + Write-Host $file -ForegroundColor Blue + } + + foreach ($file in $packages) + { + $file = Split-Path $file -leaf + $file = $file -replace "${package}\.","" + $file = $file -replace "\.nupkg","" + $versionStr = $file + break + } + + if ([string]::IsNullOrEmpty($versionStr)) + { + Write-Host "Version is not specified" -ForegroundColor Red + exit -1 + } + } + if ($target -ne "cuda") { $dockername = "facerecognition/test/$OperatingSystem/$OperatingSystemVersion/$Target" + $postfix @@ -67,21 +96,21 @@ foreach($BuildTarget in $BuildTargets) if ($BuildTarget.CUDA -ne 0) { - Write-Host "Start docker run --runtime=nvidia --rm -v ""$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t ""$dockername"" $Version $package $OperatingSystem $OperatingSystemVersion" -ForegroundColor Green - docker run --runtime=nvidia --rm ` - -v "$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet" ` - -e "LOCAL_UID=$(id -u $env:USER)" ` - -e "LOCAL_GID=$(id -g $env:USER)" ` - -t "$dockername" $Version $package $OperatingSystem $OperatingSystemVersion + Write-Host "Start docker run --gpus all --rm -v ""$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t ""$dockername"" $versionStr $package $OperatingSystem $OperatingSystemVersion" -ForegroundColor Green + docker run --gpus all --rm ` + -v "$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet" ` + -e "LOCAL_UID=$(id -u $env:USER)" ` + -e "LOCAL_GID=$(id -g $env:USER)" ` + -t "$dockername" $versionStr $package $OperatingSystem $OperatingSystemVersion } else { - Write-Host "Start docker run --rm -v ""$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t ""$dockername"" $Version $package $OperatingSystem $OperatingSystemVersion" -ForegroundColor Green + Write-Host "Start docker run --rm -v ""$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t ""$dockername"" $versionStr $package $OperatingSystem $OperatingSystemVersion" -ForegroundColor Green docker run --rm ` -v "$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet" ` -e "LOCAL_UID=$(id -u $env:USER)" ` -e "LOCAL_GID=$(id -g $env:USER)" ` - -t "$dockername" $Version $package $OperatingSystem $OperatingSystemVersion + -t "$dockername" $versionStr $package $OperatingSystem $OperatingSystemVersion } if ($lastexitcode -ne 0) diff --git a/nuget/TestPackageWindows.ps1 b/nuget/TestPackageWindows.ps1 index 5ade664..6581fe1 100644 --- a/nuget/TestPackageWindows.ps1 +++ b/nuget/TestPackageWindows.ps1 @@ -5,7 +5,7 @@ #%1: Version of Release (1.2.3.0) #*************************************** Param([Parameter( - Mandatory=$True, + Mandatory=$False, Position = 1 )][string] $Version @@ -24,12 +24,43 @@ $BuildTargets = ( "FaceRecognitionDotNet", "FaceRecognitionDotNet.CUDA100", "FaceRecognitionDotNet.CUDA101", "FaceRecognitionDotNet.CUDA102", + "FaceRecognitionDotNet.CUDA110", + "FaceRecognitionDotNet.CUDA111", "FaceRecognitionDotNet.MKL" ) foreach($BuildTarget in $BuildTargets) { - $command = ".\\TestPackage.ps1 -Package $BuildTarget -Version $Version -OperatingSystem $OperatingSystem -OperatingSystemVersion $OperatingSystemVersion" + $versionStr = $Version + $package = $BuildTarget + + if ([string]::IsNullOrEmpty($versionStr)) + { + $packages = Get-ChildItem "${Current}/*" -include *.nupkg | ` + Where-Object -FilterScript {$_.Name -match "${package}\.([0-9\.]+).nupkg"} | ` + Sort-Object -Property Name -Descending + foreach ($file in $packages) + { + Write-Host $file -ForegroundColor Blue + } + + foreach ($file in $packages) + { + $file = Split-Path $file -leaf + $file = $file -replace "${package}\.","" + $file = $file -replace "\.nupkg","" + $versionStr = $file + break + } + + if ([string]::IsNullOrEmpty($versionStr)) + { + Write-Host "Version is not specified" -ForegroundColor Red + exit -1 + } + } + + $command = ".\\TestPackage.ps1 -Package $BuildTarget -Version $versionStr -OperatingSystem $OperatingSystem -OperatingSystemVersion $OperatingSystemVersion" Invoke-Expression $command if ($lastexitcode -ne 0) diff --git a/nuget/artifacts/cuda-110/runtimes/centos-x64/lib/.keepfolder b/nuget/artifacts/cuda-110/runtimes/centos-x64/lib/.keepfolder new file mode 100644 index 0000000..e69de29 diff --git a/nuget/artifacts/cuda-110/runtimes/centos-x64/native/.keepfolder b/nuget/artifacts/cuda-110/runtimes/centos-x64/native/.keepfolder new file mode 100644 index 0000000..e69de29 diff --git a/nuget/artifacts/cuda-110/runtimes/linux-x64/lib/.keepfolder b/nuget/artifacts/cuda-110/runtimes/linux-x64/lib/.keepfolder new file mode 100644 index 0000000..e69de29 diff --git a/nuget/artifacts/cuda-110/runtimes/linux-x64/native/.keepfolder b/nuget/artifacts/cuda-110/runtimes/linux-x64/native/.keepfolder new file mode 100644 index 0000000..e69de29 diff --git a/nuget/artifacts/cuda-110/runtimes/osx-x64/lib/.keepfolder b/nuget/artifacts/cuda-110/runtimes/osx-x64/lib/.keepfolder new file mode 100644 index 0000000..e69de29 diff --git a/nuget/artifacts/cuda-110/runtimes/osx-x64/native/.keepfolder b/nuget/artifacts/cuda-110/runtimes/osx-x64/native/.keepfolder new file mode 100644 index 0000000..e69de29 diff --git a/nuget/artifacts/cuda-110/runtimes/win-x64/lib/.keepfolder b/nuget/artifacts/cuda-110/runtimes/win-x64/lib/.keepfolder new file mode 100644 index 0000000..e69de29 diff --git a/nuget/artifacts/cuda-110/runtimes/win-x64/native/.keepfolder b/nuget/artifacts/cuda-110/runtimes/win-x64/native/.keepfolder new file mode 100644 index 0000000..e69de29 diff --git a/nuget/artifacts/cuda-111/runtimes/centos-x64/lib/.keepfolder b/nuget/artifacts/cuda-111/runtimes/centos-x64/lib/.keepfolder new file mode 100644 index 0000000..e69de29 diff --git a/nuget/artifacts/cuda-111/runtimes/centos-x64/native/.keepfolder b/nuget/artifacts/cuda-111/runtimes/centos-x64/native/.keepfolder new file mode 100644 index 0000000..e69de29 diff --git a/nuget/artifacts/cuda-111/runtimes/linux-x64/lib/.keepfolder b/nuget/artifacts/cuda-111/runtimes/linux-x64/lib/.keepfolder new file mode 100644 index 0000000..e69de29 diff --git a/nuget/artifacts/cuda-111/runtimes/linux-x64/native/.keepfolder b/nuget/artifacts/cuda-111/runtimes/linux-x64/native/.keepfolder new file mode 100644 index 0000000..e69de29 diff --git a/nuget/artifacts/cuda-111/runtimes/osx-x64/lib/.keepfolder b/nuget/artifacts/cuda-111/runtimes/osx-x64/lib/.keepfolder new file mode 100644 index 0000000..e69de29 diff --git a/nuget/artifacts/cuda-111/runtimes/osx-x64/native/.keepfolder b/nuget/artifacts/cuda-111/runtimes/osx-x64/native/.keepfolder new file mode 100644 index 0000000..e69de29 diff --git a/nuget/artifacts/cuda-111/runtimes/win-x64/lib/.keepfolder b/nuget/artifacts/cuda-111/runtimes/win-x64/lib/.keepfolder new file mode 100644 index 0000000..e69de29 diff --git a/nuget/artifacts/cuda-111/runtimes/win-x64/native/.keepfolder b/nuget/artifacts/cuda-111/runtimes/win-x64/native/.keepfolder new file mode 100644 index 0000000..e69de29 diff --git a/nuget/nuget.exe b/nuget/nuget.exe index e00ef51..ea492db 100644 Binary files a/nuget/nuget.exe and b/nuget/nuget.exe differ diff --git a/nuget/nuspec/FaceRecognitionDotNet.CPU.nuspec b/nuget/nuspec/FaceRecognitionDotNet.CPU.nuspec index 348478e..c5109ad 100644 --- a/nuget/nuspec/FaceRecognitionDotNet.CPU.nuspec +++ b/nuget/nuspec/FaceRecognitionDotNet.CPU.nuspec @@ -2,29 +2,29 @@ FaceRecognitionDotNet - 1.3.0.2 + 1.3.0.3 FaceRecognitionDotNet Takuya Takeuchi Takuya Takeuchi true LICENSE.txt https://github.com/takuya-takeuchi/FaceRecognitionDotNet - https://github.com/takuya-takeuchi/FaceRecognitionDotNet/blob/master/nuget/face128.png?raw=true + images\face128.png The world's simplest facial recognition api for .NET This library is ported from https://github.com/ageitgey/face_recognition by C#. - © Takuya Takeuchi 2018-2020 + © Takuya Takeuchi 2018-2021 .net machinelearning face-recognition true - + - + @@ -32,10 +32,11 @@ This library is ported from https://github.com/ageitgey/face_recognition by C#.< - - + + + - + diff --git a/nuget/nuspec/FaceRecognitionDotNet.CUDA100.nuspec b/nuget/nuspec/FaceRecognitionDotNet.CUDA100.nuspec index 20cb068..1a4e170 100644 --- a/nuget/nuspec/FaceRecognitionDotNet.CUDA100.nuspec +++ b/nuget/nuspec/FaceRecognitionDotNet.CUDA100.nuspec @@ -2,29 +2,29 @@ FaceRecognitionDotNet.CUDA100 - 1.3.0.2 + 1.3.0.3 FaceRecognitionDotNet for CUDA 10.0 Takuya Takeuchi Takuya Takeuchi true LICENSE.txt https://github.com/takuya-takeuchi/FaceRecognitionDotNet - https://github.com/takuya-takeuchi/FaceRecognitionDotNet/blob/master/nuget/face128.png?raw=true + images\face128.png The world's simplest facial recognition api for .NET This library is ported from https://github.com/ageitgey/face_recognition by C#. - © Takuya Takeuchi 2018-2020 + © Takuya Takeuchi 2018-2021 .net machinelearning face-recognition true - + - + @@ -32,10 +32,11 @@ This library is ported from https://github.com/ageitgey/face_recognition by C#.< - - - - + + + + + diff --git a/nuget/nuspec/FaceRecognitionDotNet.CUDA101.nuspec b/nuget/nuspec/FaceRecognitionDotNet.CUDA101.nuspec index 4c72d06..bce3aac 100644 --- a/nuget/nuspec/FaceRecognitionDotNet.CUDA101.nuspec +++ b/nuget/nuspec/FaceRecognitionDotNet.CUDA101.nuspec @@ -2,29 +2,29 @@ FaceRecognitionDotNet.CUDA101 - 1.3.0.2 + 1.3.0.3 FaceRecognitionDotNet for CUDA 10.1 Takuya Takeuchi Takuya Takeuchi true LICENSE.txt https://github.com/takuya-takeuchi/FaceRecognitionDotNet - https://github.com/takuya-takeuchi/FaceRecognitionDotNet/blob/master/nuget/face128.png?raw=true + images\face128.png The world's simplest facial recognition api for .NET This library is ported from https://github.com/ageitgey/face_recognition by C#. - © Takuya Takeuchi 2018-2020 + © Takuya Takeuchi 2018-2021 .net machinelearning face-recognition true - + - + @@ -32,10 +32,11 @@ This library is ported from https://github.com/ageitgey/face_recognition by C#.< - - - - + + + + + diff --git a/nuget/nuspec/FaceRecognitionDotNet.CUDA102.nuspec b/nuget/nuspec/FaceRecognitionDotNet.CUDA102.nuspec index 24e3e14..a79be62 100644 --- a/nuget/nuspec/FaceRecognitionDotNet.CUDA102.nuspec +++ b/nuget/nuspec/FaceRecognitionDotNet.CUDA102.nuspec @@ -2,29 +2,29 @@ FaceRecognitionDotNet.CUDA102 - 1.3.0.2 + 1.3.0.3 FaceRecognitionDotNet for CUDA 10.2 Takuya Takeuchi Takuya Takeuchi true LICENSE.txt https://github.com/takuya-takeuchi/FaceRecognitionDotNet - https://github.com/takuya-takeuchi/FaceRecognitionDotNet/blob/master/nuget/face128.png?raw=true + images\face128.png The world's simplest facial recognition api for .NET This library is ported from https://github.com/ageitgey/face_recognition by C#. - © Takuya Takeuchi 2018-2020 + © Takuya Takeuchi 2018-2021 .net machinelearning face-recognition true - + - + @@ -32,10 +32,11 @@ This library is ported from https://github.com/ageitgey/face_recognition by C#.< - - - - + + + + + diff --git a/nuget/nuspec/FaceRecognitionDotNet.CUDA110.nuspec b/nuget/nuspec/FaceRecognitionDotNet.CUDA110.nuspec new file mode 100644 index 0000000..57524dd --- /dev/null +++ b/nuget/nuspec/FaceRecognitionDotNet.CUDA110.nuspec @@ -0,0 +1,61 @@ + + + + FaceRecognitionDotNet.CUDA110 + 1.3.0.3 + FaceRecognitionDotNet for CUDA 11.0 + Takuya Takeuchi + Takuya Takeuchi + true + LICENSE.txt + https://github.com/takuya-takeuchi/FaceRecognitionDotNet + images\face128.png + The world's simplest facial recognition api for .NET + +This library is ported from https://github.com/ageitgey/face_recognition by C#. + + © Takuya Takeuchi 2018-2021 + .net machinelearning face-recognition + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nuget/nuspec/FaceRecognitionDotNet.CUDA111.nuspec b/nuget/nuspec/FaceRecognitionDotNet.CUDA111.nuspec new file mode 100644 index 0000000..a019ffe --- /dev/null +++ b/nuget/nuspec/FaceRecognitionDotNet.CUDA111.nuspec @@ -0,0 +1,61 @@ + + + + FaceRecognitionDotNet.CUDA111 + 1.3.0.3 + FaceRecognitionDotNet for CUDA 11.1 + Takuya Takeuchi + Takuya Takeuchi + true + LICENSE.txt + https://github.com/takuya-takeuchi/FaceRecognitionDotNet + images\face128.png + The world's simplest facial recognition api for .NET + +This library is ported from https://github.com/ageitgey/face_recognition by C#. + + © Takuya Takeuchi 2018-2021 + .net machinelearning face-recognition + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nuget/nuspec/FaceRecognitionDotNet.CUDA92.nuspec b/nuget/nuspec/FaceRecognitionDotNet.CUDA92.nuspec index dd3f299..029dc3a 100644 --- a/nuget/nuspec/FaceRecognitionDotNet.CUDA92.nuspec +++ b/nuget/nuspec/FaceRecognitionDotNet.CUDA92.nuspec @@ -2,29 +2,29 @@ FaceRecognitionDotNet.CUDA92 - 1.3.0.2 + 1.3.0.3 FaceRecognitionDotNet for CUDA 9.2 Takuya Takeuchi Takuya Takeuchi true LICENSE.txt https://github.com/takuya-takeuchi/FaceRecognitionDotNet - https://github.com/takuya-takeuchi/FaceRecognitionDotNet/blob/master/nuget/face128.png?raw=true + images\face128.png The world's simplest facial recognition api for .NET This library is ported from https://github.com/ageitgey/face_recognition by C#. - © Takuya Takeuchi 2018-2020 + © Takuya Takeuchi 2018-2021 .net machinelearning face-recognition true - + - + @@ -32,10 +32,11 @@ This library is ported from https://github.com/ageitgey/face_recognition by C#.< - - - - + + + + + diff --git a/nuget/nuspec/FaceRecognitionDotNet.MKL.nuspec b/nuget/nuspec/FaceRecognitionDotNet.MKL.nuspec index 1ab062a..f3bccc2 100644 --- a/nuget/nuspec/FaceRecognitionDotNet.MKL.nuspec +++ b/nuget/nuspec/FaceRecognitionDotNet.MKL.nuspec @@ -2,29 +2,29 @@ FaceRecognitionDotNet.MKL - 1.3.0.2 + 1.3.0.3 FaceRecognitionDotNet for MKL Takuya Takeuchi Takuya Takeuchi true LICENSE.txt https://github.com/takuya-takeuchi/FaceRecognitionDotNet - https://github.com/takuya-takeuchi/FaceRecognitionDotNet/blob/master/nuget/face128.png?raw=true + images\face128.png The world's simplest facial recognition api for .NET This library is ported from https://github.com/ageitgey/face_recognition by C#. - © Takuya Takeuchi 2018-2020 + © Takuya Takeuchi 2018-2021 .net machinelearning face-recognition true - + - + @@ -32,10 +32,11 @@ This library is ported from https://github.com/ageitgey/face_recognition by C#.< - - - - + + + + + diff --git a/nuget/nuspec/build/FaceRecognitionDotNet.Native.props b/nuget/nuspec/build/FaceRecognitionDotNet.Native.props new file mode 100644 index 0000000..ffd1786 --- /dev/null +++ b/nuget/nuspec/build/FaceRecognitionDotNet.Native.props @@ -0,0 +1,63 @@ + + + + true + true + + x64 + + + + Windows_NT + + + + + + + + + + + + + PreserveNewest + DlibDotNetNativeDnnAgeClassification.dll + + + PreserveNewest + DlibDotNetNativeDnnGenderClassification.dll + + + + + + PreserveNewest + libDlibDotNetNativeDnnAgeClassification.so + True + + + PreserveNewest + libDlibDotNetNativeDnnGenderClassification.so + True + + + + + + + + PreserveNewest + libDlibDotNetNativeDnnAgeClassification.dylib + True + + + PreserveNewest + libDlibDotNetNativeDnnGenderClassification.dylib + True + + + + + + \ No newline at end of file diff --git a/nuget/nuspec/build/FaceRecognitionDotNet.targets b/nuget/nuspec/build/FaceRecognitionDotNet.targets new file mode 100644 index 0000000..2bfe683 --- /dev/null +++ b/nuget/nuspec/build/FaceRecognitionDotNet.targets @@ -0,0 +1,20 @@ + + + 1.0.0.0 + + + + + "$([MSBuild]::GetPathOfFileAbove($(MSBuildThisFile), $(MSBuildThisFileDirectory)..\..\))" + + + + + + + + + + + \ No newline at end of file diff --git a/src/DlibDotNet.Native.Dnn.AgeClassification/.gitignore b/src/AgeClassification/.gitignore similarity index 100% rename from src/DlibDotNet.Native.Dnn.AgeClassification/.gitignore rename to src/AgeClassification/.gitignore diff --git a/src/DlibDotNet.Native.Dnn.GenderClassification/Build.ps1 b/src/AgeClassification/Build.ps1 similarity index 79% rename from src/DlibDotNet.Native.Dnn.GenderClassification/Build.ps1 rename to src/AgeClassification/Build.ps1 index c660c0e..23bfe8b 100644 --- a/src/DlibDotNet.Native.Dnn.GenderClassification/Build.ps1 +++ b/src/AgeClassification/Build.ps1 @@ -46,10 +46,10 @@ $ScriptPath = $PSScriptRoot Write-Host "Build "(Split-Path $ScriptPath -Leaf) -ForegroundColor Green $SrcPath = Split-Path $ScriptPath -Parent -$DlibDotNetRoot = Join-Path $SrcPath DlibDotNet -$NugetPath = Join-Path $DlibDotNetRoot "nuget" | ` +$FaceRecognitionDotNetRoot = Split-Path $SrcPath -Parent +$NugetPath = Join-Path $FaceRecognitionDotNetRoot "nuget" | ` Join-Path -ChildPath "BuildUtils.ps1" import-module $NugetPath -function * -$Config = [Config]::new($DlibDotNetRoot, $Configuration, $Target, $Architecture, $Platform, $Option) +$Config = [Config]::new($FaceRecognitionDotNetRoot, $Configuration, $Target, $Architecture, $Platform, $Option) Build -Config $Config \ No newline at end of file diff --git a/src/DlibDotNet.Native.Dnn.AgeClassification/CMakeLists.txt b/src/AgeClassification/CMakeLists.txt similarity index 98% rename from src/DlibDotNet.Native.Dnn.AgeClassification/CMakeLists.txt rename to src/AgeClassification/CMakeLists.txt index 0b6042f..6156451 100644 --- a/src/DlibDotNet.Native.Dnn.AgeClassification/CMakeLists.txt +++ b/src/AgeClassification/CMakeLists.txt @@ -22,9 +22,9 @@ message("-------------------------------------------------------") # Version info set(VERSION_MAJOR 1) -set(VERSION_MINOR 2) -set(VERSION_PATCH 3) -set(VERSION_DATE 14) +set(VERSION_MINOR 3) +set(VERSION_PATCH 0) +set(VERSION_DATE 3) # Only GCC requires -fPIC if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") diff --git a/src/DlibDotNet.Native.Dnn.AgeClassification/dlib/config.cpp b/src/AgeClassification/dlib/config.cpp similarity index 100% rename from src/DlibDotNet.Native.Dnn.AgeClassification/dlib/config.cpp rename to src/AgeClassification/dlib/config.cpp diff --git a/src/DlibDotNet.Native.Dnn.AgeClassification/dlib/config.h.in b/src/AgeClassification/dlib/config.h.in similarity index 100% rename from src/DlibDotNet.Native.Dnn.AgeClassification/dlib/config.h.in rename to src/AgeClassification/dlib/config.h.in diff --git a/src/DlibDotNet.Native.Dnn.AgeClassification/dlib/dnn/loss/multiclass_log/gender/Age.cpp b/src/AgeClassification/dlib/dnn/loss/multiclass_log/age/Age.cpp similarity index 100% rename from src/DlibDotNet.Native.Dnn.AgeClassification/dlib/dnn/loss/multiclass_log/gender/Age.cpp rename to src/AgeClassification/dlib/dnn/loss/multiclass_log/age/Age.cpp diff --git a/src/AgeClassification/dlib/dnn/loss/multiclass_log/age/Age.h b/src/AgeClassification/dlib/dnn/loss/multiclass_log/age/Age.h new file mode 100644 index 0000000..4caaae1 --- /dev/null +++ b/src/AgeClassification/dlib/dnn/loss/multiclass_log/age/Age.h @@ -0,0 +1,24 @@ +#ifndef _CPP_LOSS_MULTICLASS_LOG_AGE_H_ +#define _CPP_LOSS_MULTICLASS_LOG_AGE_H_ + +#include +#include + +#include "DlibDotNet.Native/dlib/export.h" +#include "DlibDotNet.Native/dlib/shared.h" +#include "defines.h" +#include "DlibDotNet.Native.Dnn/dlib/dnn/loss/multiclass_log/template.h" + +typedef unsigned long age_out_type; +typedef unsigned long age_train_label_type; + +MAKE_LOSSMULTICLASSLOG_FUNC(age_train_type, matrix_element_type::RgbPixel, dlib::rgb_pixel, matrix_element_type::UInt32, age_train_label_type, 200) + +DLLEXPORT void LossMulticlassLog_age_train_type_eval(void* obj) +{ + auto& net = *static_cast(obj); + dlib::layer<2>(net).layer_details() = dlib::dropout_(0); + dlib::layer<5>(net).layer_details() = dlib::dropout_(0); +} + +#endif \ No newline at end of file diff --git a/src/DlibDotNet.Native.Dnn.AgeClassification/dlib/dnn/loss/multiclass_log/gender/defines.h b/src/AgeClassification/dlib/dnn/loss/multiclass_log/age/defines.h similarity index 100% rename from src/DlibDotNet.Native.Dnn.AgeClassification/dlib/dnn/loss/multiclass_log/gender/defines.h rename to src/AgeClassification/dlib/dnn/loss/multiclass_log/age/defines.h diff --git a/src/DlibDotNet.Native.Dnn.AgeClassification/version-cuda.rc.in b/src/AgeClassification/version-cuda.rc.in similarity index 95% rename from src/DlibDotNet.Native.Dnn.AgeClassification/version-cuda.rc.in rename to src/AgeClassification/version-cuda.rc.in index 7a335c6..12fe6ff 100644 --- a/src/DlibDotNet.Native.Dnn.AgeClassification/version-cuda.rc.in +++ b/src/AgeClassification/version-cuda.rc.in @@ -72,7 +72,7 @@ BEGIN VALUE "FileDescription", "DlibDotNet Native Age Classification Library with CUDA" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "DlibDotNet.Native.Dnn.AgeClassification" - VALUE "LegalCopyright", "Copyright (c) 2019-2020 Takuya Takeuchi." + VALUE "LegalCopyright", "Copyright (c) 2019-2021 Takuya Takeuchi." VALUE "OriginalFilename", "DlibDotNet.Native.Dnn.AgeClassification.dll" VALUE "ProductName", "DlibDotNet" VALUE "ProductVersion", VER_PRODUCTVERSION_STR diff --git a/src/DlibDotNet.Native.Dnn.AgeClassification/version.rc.in b/src/AgeClassification/version.rc.in similarity index 95% rename from src/DlibDotNet.Native.Dnn.AgeClassification/version.rc.in rename to src/AgeClassification/version.rc.in index e24f1df..feeaad3 100644 --- a/src/DlibDotNet.Native.Dnn.AgeClassification/version.rc.in +++ b/src/AgeClassification/version.rc.in @@ -72,7 +72,7 @@ BEGIN VALUE "FileDescription", "DlibDotNet Native Age Classification Library" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "DlibDotNet.Native.Dnn.GenderClassification" - VALUE "LegalCopyright", "Copyright (c) 2019-2020 Takuya Takeuchi." + VALUE "LegalCopyright", "Copyright (c) 2019-2021 Takuya Takeuchi." VALUE "OriginalFilename", "DlibDotNet.Native.Dnn.GenderClassification.dll" VALUE "ProductName", "DlibDotNet" VALUE "ProductVersion", VER_PRODUCTVERSION_STR diff --git a/src/DlibDotNet b/src/DlibDotNet index 8866b7f..e5913f0 160000 --- a/src/DlibDotNet +++ b/src/DlibDotNet @@ -1 +1 @@ -Subproject commit 8866b7f4df7ac1c9c290c7a5493951caa7e2ff49 +Subproject commit e5913f0d09e812288352395d0c7905145edb1ca8 diff --git a/src/DlibDotNet.Native.Dnn.AgeClassification/dlib/dnn/loss/multiclass_log/gender/Age.h b/src/DlibDotNet.Native.Dnn.AgeClassification/dlib/dnn/loss/multiclass_log/gender/Age.h deleted file mode 100644 index 1c08449..0000000 --- a/src/DlibDotNet.Native.Dnn.AgeClassification/dlib/dnn/loss/multiclass_log/gender/Age.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef _CPP_LOSS_MULTICLASS_LOG_AGE_H_ -#define _CPP_LOSS_MULTICLASS_LOG_AGE_H_ - -#include -#include - -#include "DlibDotNet.Native/dlib/export.h" -#include "DlibDotNet.Native/dlib/shared.h" -#include "defines.h" -#include "DlibDotNet.Native.Dnn/dlib/dnn/loss/multiclass_log/template.h" - -typedef unsigned long age_out_type; -typedef unsigned long age_train_label_type; - -MAKE_LOSSMULTICLASSLOG_FUNC(age_train_type, matrix_element_type::RgbPixel, dlib::rgb_pixel, matrix_element_type::UInt32, age_train_label_type, 200) - -#endif \ No newline at end of file diff --git a/src/FaceRecognitionDotNet/Dlib/Python/SimpleObjectDetector.cs b/src/FaceRecognitionDotNet/Dlib/Python/SimpleObjectDetector.cs index 2ec2948..f561a8a 100644 --- a/src/FaceRecognitionDotNet/Dlib/Python/SimpleObjectDetector.cs +++ b/src/FaceRecognitionDotNet/Dlib/Python/SimpleObjectDetector.cs @@ -122,9 +122,9 @@ public static IEnumerable RunDetectorWithUpscale1(FrontalFaceDetector } } - public static IEnumerable RunDetectorWithUpscale2(FrontalFaceDetector detector, - Image image, - uint upsamplingAmount) + public static IEnumerable> RunDetectorWithUpscale2(FrontalFaceDetector detector, + Image image, + uint upsamplingAmount) { if (detector == null) throw new ArgumentNullException(nameof(detector)); @@ -138,12 +138,17 @@ public static IEnumerable RunDetectorWithUpscale2(FrontalFaceDetector var weightIndices = new List(); const double adjustThreshold = 0.0; - return RunDetectorWithUpscale1(detector, - image, - upsamplingAmount, - adjustThreshold, - detectionConfidences, - weightIndices); + var rects = RunDetectorWithUpscale1(detector, + image, + upsamplingAmount, + adjustThreshold, + detectionConfidences, + weightIndices).ToArray(); + + + var index = 0; + foreach(var rect in rects) + yield return new Tuple(rect, detectionConfidences[index++]); } #region Helpers diff --git a/src/FaceRecognitionDotNet/Extensions/FaceDetector.cs b/src/FaceRecognitionDotNet/Extensions/FaceDetector.cs new file mode 100644 index 0000000..1cdca3c --- /dev/null +++ b/src/FaceRecognitionDotNet/Extensions/FaceDetector.cs @@ -0,0 +1,32 @@ +using System.Collections.Generic; +using DlibDotNet; + +namespace FaceRecognitionDotNet.Extensions +{ + + /// + /// An abstract base class that provides functionality to detect face locations from image. + /// + public abstract class FaceDetector : DisposableObject + { + + #region Methods + + internal IEnumerable Detect(Image image, int numberOfTimesToUpsample) + { + return this.RawDetect(image.Matrix, numberOfTimesToUpsample); + } + + /// + /// Returns an enumerable collection of face location correspond to all faces in specified image. + /// + /// The matrix contains a face. + /// The number of times to up-sample the image when finding faces. + /// An enumerable collection of face location correspond to all faces. + protected abstract IEnumerable RawDetect(MatrixBase matrix, int numberOfTimesToUpsample); + + #endregion + + } + +} \ No newline at end of file diff --git a/src/FaceRecognitionDotNet/Extensions/SimpleAgeEstimator.cs b/src/FaceRecognitionDotNet/Extensions/SimpleAgeEstimator.cs index 47b6f6e..bca9c8d 100644 --- a/src/FaceRecognitionDotNet/Extensions/SimpleAgeEstimator.cs +++ b/src/FaceRecognitionDotNet/Extensions/SimpleAgeEstimator.cs @@ -40,6 +40,7 @@ public SimpleAgeEstimator(string modelPath) LossMulticlassLogRegistry.Add(ret); this._Network = LossMulticlassLog.Deserialize(modelPath, networkId); + NativeMethods.LossMulticlassLog_age_train_type_eval(this._Network.NativePtr); } #endregion @@ -122,6 +123,16 @@ protected override IDictionary RawPredictProbability(MatrixBase mat } } + /// + /// Releases all unmanaged resources. + /// + protected override void DisposeUnmanaged() + { + base.DisposeUnmanaged(); + + this._Network?.Dispose(); + } + #endregion } diff --git a/src/FaceRecognitionDotNet/Extensions/SimpleFaceDetector.cs b/src/FaceRecognitionDotNet/Extensions/SimpleFaceDetector.cs new file mode 100644 index 0000000..3a846b9 --- /dev/null +++ b/src/FaceRecognitionDotNet/Extensions/SimpleFaceDetector.cs @@ -0,0 +1,76 @@ +using System; +using System.Collections.Generic; +using System.IO; +using DlibDotNet; + +namespace FaceRecognitionDotNet.Extensions +{ + + /// + /// The face detector which was trained by custom dataset. This class cannot be inherited. + /// + public sealed class SimpleFaceDetector : FaceDetector + { + + #region Fields + + private readonly ScanFHogPyramid _Scanner; + + private readonly ObjectDetector> _ObjectDetector; + + #endregion + + #region Constructors + + /// + /// Initializes a new instance of the class with the model file path that this detector uses. + /// + /// The model file path that this detector uses. + /// The model file is not found. + public SimpleFaceDetector(string modelPath) + { + if (!File.Exists(modelPath)) + throw new FileNotFoundException(modelPath); + + this._Scanner = new ScanFHogPyramid(6); + this._ObjectDetector = new ObjectDetector>(this._Scanner); + this._ObjectDetector.Deserialize(modelPath); + } + + #endregion + + #region Methods + + /// + /// Returns an enumerable collection of face location correspond to all faces in specified image. + /// + /// The matrix contains a face. + /// The number of times to up-sample the image when finding faces. + /// An enumerable collection of face location correspond to all faces. + protected override IEnumerable RawDetect(MatrixBase matrix, int numberOfTimesToUpsample) + { + if (!(matrix is Matrix mat)) + throw new ArgumentException(); + + this._ObjectDetector.Operator(mat, out IEnumerable> tuples); + + foreach (var (confidence, rect) in tuples) + yield return new Location(rect, confidence); + } + + /// + /// Releases all unmanaged resources. + /// + protected override void DisposeUnmanaged() + { + base.DisposeUnmanaged(); + + this._Scanner?.Dispose(); + this._ObjectDetector?.Dispose(); + } + + #endregion + + } + +} \ No newline at end of file diff --git a/src/FaceRecognitionDotNet/Extensions/SimpleGenderEstimator.cs b/src/FaceRecognitionDotNet/Extensions/SimpleGenderEstimator.cs index 2f87940..34b25f4 100644 --- a/src/FaceRecognitionDotNet/Extensions/SimpleGenderEstimator.cs +++ b/src/FaceRecognitionDotNet/Extensions/SimpleGenderEstimator.cs @@ -40,6 +40,7 @@ public SimpleGenderEstimator(string modelPath) LossMulticlassLogRegistry.Add(ret); this._Network = LossMulticlassLog.Deserialize(modelPath, networkId); + NativeMethods.LossMulticlassLog_gender_train_type_eval(this._Network.NativePtr); } #endregion @@ -118,10 +119,20 @@ protected override IDictionary RawPredictProbability(MatrixBase m }; } - #endregion + } + /// + /// Releases all unmanaged resources. + /// + protected override void DisposeUnmanaged() + { + base.DisposeUnmanaged(); + + this._Network?.Dispose(); } + #endregion + } } \ No newline at end of file diff --git a/src/FaceRecognitionDotNet/FaceRecognition.cs b/src/FaceRecognitionDotNet/FaceRecognition.cs index 11ead12..5551bec 100644 --- a/src/FaceRecognitionDotNet/FaceRecognition.cs +++ b/src/FaceRecognitionDotNet/FaceRecognition.cs @@ -35,6 +35,8 @@ public sealed class FaceRecognition : DisposableObject private FaceLandmarkDetector _CustomFaceLandmarkDetector; + private FaceDetector _CustomFaceDetector; + private AgeEstimator _CustomAgeEstimator; private GenderEstimator _CustomGenderEstimator; @@ -90,6 +92,45 @@ private FaceRecognition(string directory) this._FaceEncoder = LossMetric.Deserialize(faceRecognitionModel); } + /// + /// Initializes a new instance of the class with the instance that contains model binary datum. + /// + /// The instance that contains model binary datum. + /// is null. + /// The model data is null. + private FaceRecognition(ModelParameter parameter) + { + if (parameter == null) + throw new ArgumentNullException(nameof(parameter)); + + if (parameter.PosePredictor5FaceLandmarksModel == null) + throw new NullReferenceException(nameof(parameter.PosePredictor5FaceLandmarksModel)); + + if (parameter.PosePredictor68FaceLandmarksModel == null) + throw new NullReferenceException(nameof(parameter.PosePredictor68FaceLandmarksModel)); + + if (parameter.CnnFaceDetectorModel == null) + throw new NullReferenceException(nameof(parameter.CnnFaceDetectorModel)); + + if (parameter.FaceRecognitionModel == null) + throw new NullReferenceException(nameof(parameter.FaceRecognitionModel)); + + this._FaceDetector?.Dispose(); + this._FaceDetector = DlibDotNet.Dlib.GetFrontalFaceDetector(); + + this._PosePredictor68Point?.Dispose(); + this._PosePredictor68Point = ShapePredictor.Deserialize(parameter.PosePredictor68FaceLandmarksModel); + + this._PosePredictor5Point?.Dispose(); + this._PosePredictor5Point = ShapePredictor.Deserialize(parameter.PosePredictor5FaceLandmarksModel); + + this._CnnFaceDetector?.Dispose(); + this._CnnFaceDetector = LossMmod.Deserialize(parameter.CnnFaceDetectorModel); + + this._FaceEncoder?.Dispose(); + this._FaceEncoder = LossMetric.Deserialize(parameter.FaceRecognitionModel); + } + #endregion #region Properties @@ -121,6 +162,15 @@ public GenderEstimator CustomGenderEstimator set => this._CustomGenderEstimator = value; } + /// + /// Gets or sets the custom face detector that user defined. + /// + public FaceDetector CustomFaceDetector + { + get => this._CustomFaceDetector; + set => this._CustomFaceDetector = value; + } + /// /// Gets or sets the custom face landmark detector that user defined. /// @@ -174,8 +224,11 @@ public IEnumerable BatchFaceLocations(IEnumerable images, int var image = imagesArray[0]; for (var index = 0; index < rawDetectionsBatched.Length; index++) { - var faces = rawDetectionsBatched[index]; - yield return faces.Select(rect => TrimBound(rect.Rect, image.Width, image.Height)).ToArray(); + var faces = rawDetectionsBatched[index].ToArray(); + var locations = faces.Select(rect => new Location(TrimBound(rect.Rect, image.Width, image.Height), rect.DetectionConfidence)).ToArray(); + foreach (var face in faces) + face.Dispose(); + yield return locations; } } @@ -241,6 +294,17 @@ public static FaceRecognition Create(string directory) return new FaceRecognition(directory); } + /// + /// Create a new instance of the class. + /// + /// The instance that contains model binary datum. + /// is null. + /// The model data is null. + public static FaceRecognition Create(ModelParameter parameter) + { + return new FaceRecognition(parameter); + } + /// /// Crop a specified image with enumerable collection of face locations. /// @@ -297,11 +361,17 @@ public static IEnumerable CropFaces(Image image, IEnumerable lo /// is null. /// does not contain or . /// The custom eye blink detector is not ready. + /// This object or custom eye blink detector is disposed. public void EyeBlinkDetect(IDictionary> landmark, out bool leftBlink, out bool rightBlink) { + this.ThrowIfDisposed(); + if (this._CustomEyeBlinkDetector == null) throw new NotSupportedException("The custom eye blink detector is not ready."); + if (this._CustomEyeBlinkDetector.IsDisposed) + throw new ObjectDisposedException($"{nameof(CustomEyeBlinkDetector)}", "The custom eye blink detector is disposed."); + this._CustomEyeBlinkDetector.Detect(landmark, out leftBlink, out rightBlink); } @@ -365,22 +435,31 @@ public static IEnumerable FaceDistances(IEnumerable faceEn /// The image contains faces. The image can contain multiple faces. /// The enumerable collection of location rectangle for faces. If specified null, method will find face locations. /// The number of times to re-sample the face when calculating encoding. - /// The model of face detector. + /// The dimension of vector which be returned from detector. + /// The model of face detector to detect in image. If is not null, this value is ignored. /// An enumerable collection of face feature data corresponds to all faces in specified image. /// is null. + /// contains no elements. /// or this object or custom face landmark detector is disposed. /// is not supported. - public IEnumerable FaceEncodings(Image image, IEnumerable knownFaceLocation = null, int numJitters = 1, PredictorModel model = PredictorModel.Small) + public IEnumerable FaceEncodings(Image image, + IEnumerable knownFaceLocation = null, + int numJitters = 1, + PredictorModel predictorModel = PredictorModel.Small, + Model model = Model.Hog) { if (image == null) throw new ArgumentNullException(nameof(image)); - if (model == PredictorModel.Custom) + if (predictorModel == PredictorModel.Custom) throw new NotSupportedException("FaceRecognitionDotNet.PredictorModel.Custom is not supported."); + if (knownFaceLocation != null && !knownFaceLocation.Any()) + throw new InvalidOperationException($"{nameof(knownFaceLocation)} contains no elements."); + image.ThrowIfDisposed(); this.ThrowIfDisposed(); - var rawLandmarks = this.RawFaceLandmarks(image, knownFaceLocation, model); + var rawLandmarks = this.RawFaceLandmarks(image, knownFaceLocation, predictorModel, model); foreach (var landmark in rawLandmarks) { var ret = new FaceEncoding(FaceRecognitionModelV1.ComputeFaceDescriptor(this._FaceEncoder, image, landmark, numJitters)); @@ -394,20 +473,28 @@ public IEnumerable FaceEncodings(Image image, IEnumerable /// The image contains faces. The image can contain multiple faces. /// The enumerable collection of location rectangle for faces. If specified null, method will find face locations. - /// The model of face detector. + /// The dimension of vector which be returned from detector. + /// The model of face detector to detect in image. If is not null, this value is ignored. /// An enumerable collection of dictionary of face parts locations (eyes, nose, etc). /// is null. + /// contains no elements. /// or this object or custom face landmark detector is disposed. /// The custom face landmark detector is not ready. - public IEnumerable>> FaceLandmark(Image faceImage, IEnumerable faceLocations = null, PredictorModel model = PredictorModel.Large) + public IEnumerable>> FaceLandmark(Image faceImage, + IEnumerable faceLocations = null, + PredictorModel predictorModel = PredictorModel.Large, + Model model = Model.Hog) { if (faceImage == null) throw new ArgumentNullException(nameof(faceImage)); + if (faceLocations != null && !faceLocations.Any()) + throw new InvalidOperationException($"{nameof(faceLocations)} contains no elements."); + faceImage.ThrowIfDisposed(); this.ThrowIfDisposed(); - if (model == PredictorModel.Custom) + if (predictorModel == PredictorModel.Custom) { if (this._CustomFaceLandmarkDetector == null) throw new NotSupportedException("The custom face landmark detector is not ready."); @@ -416,7 +503,7 @@ public IEnumerable>> FaceLandmark(I throw new ObjectDisposedException($"{nameof(CustomFaceLandmarkDetector)}", "The custom face landmark detector is disposed."); } - var landmarks = this.RawFaceLandmarks(faceImage, faceLocations, model).ToArray(); + var landmarks = this.RawFaceLandmarks(faceImage, faceLocations, predictorModel, model).ToArray(); var landmarkTuples = landmarks.Select(landmark => Enumerable.Range(0, (int)landmark.Parts) .Select(index => new FacePoint(new Point(landmark.GetPart((uint)index)), index)).ToArray()); @@ -426,7 +513,7 @@ public IEnumerable>> FaceLandmark(I { // For a definition of each point index, see https://cdn-images-1.medium.com/max/1600/1*AbEg31EgkbXSQehuNJBlWg.png - switch (model) + switch (predictorModel) { case PredictorModel.Large: results.AddRange(landmarkTuples.Select(landmarkTuple => new Dictionary> @@ -465,7 +552,7 @@ public IEnumerable>> FaceLandmark(I results.AddRange(this._CustomFaceLandmarkDetector.GetLandmarks(landmarkTuples)); break; default: - throw new ArgumentOutOfRangeException(nameof(model), model, null); + throw new ArgumentOutOfRangeException(nameof(predictorModel), predictorModel, null); } } finally @@ -494,24 +581,12 @@ public IEnumerable FaceLocations(Image image, int numberOfTimesToUpsam image.ThrowIfDisposed(); this.ThrowIfDisposed(); - switch (model) + foreach (var face in this.RawFaceLocations(image, numberOfTimesToUpsample, model)) { - case Model.Cnn: - foreach (var face in this.RawFaceLocations(image, numberOfTimesToUpsample, Model.Cnn)) - { - var ret = TrimBound(face.Rect, image.Width, image.Height); - face.Dispose(); - yield return ret; - } - break; - default: - foreach (var face in this.RawFaceLocations(image, numberOfTimesToUpsample, model)) - { - var ret = TrimBound(face.Rect, image.Width, image.Height); - face.Dispose(); - yield return ret; - } - break; + var ret = TrimBound(face.Rect, image.Width, image.Height); + var confidence = face.DetectionConfidence; + face.Dispose(); + yield return new Location(ret, confidence); } } @@ -868,51 +943,71 @@ public IDictionary PredictProbabilityGender(Image image, Location /// The dictionary of face parts locations (eyes, nose, etc). /// A head pose estimated from face parts locations. /// is null. + /// This object or custom head pose estimator is disposed. /// The custom head pose estimator is not ready. public HeadPose PredictHeadPose(IDictionary> landmark) { + if (landmark == null) + throw new ArgumentNullException(nameof(landmark)); + + this.ThrowIfDisposed(); + if (this._CustomHeadPoseEstimator == null) throw new NotSupportedException("The custom head pose estimator is not ready."); + if (this._CustomHeadPoseEstimator.IsDisposed) + throw new ObjectDisposedException($"{nameof(CustomHeadPoseEstimator)}", "The custom head pose estimator is disposed."); + return this._CustomHeadPoseEstimator.Predict(landmark); } #region Helpers - private IEnumerable RawFaceLandmarks(Image faceImage, IEnumerable faceLocations = null, PredictorModel model = PredictorModel.Large) + private IEnumerable RawFaceLandmarks(Image faceImage, + IEnumerable faceLocations = null, + PredictorModel predictorModel = PredictorModel.Large, + Model model = Model.Hog) { - IEnumerable tmp; + IEnumerable rects; if (faceLocations == null) - tmp = this.RawFaceLocations(faceImage); - else - tmp = faceLocations.Select(l => new MModRect { Rect = new Rectangle { Bottom = l.Bottom, Left = l.Left, Top = l.Top, Right = l.Right } }); - - if (model == PredictorModel.Custom) { + var list = new List(); + var tmp = this.RawFaceLocations(faceImage, 1, model); foreach (var rect in tmp) { - var r = rect.Rect; - var location = new Location(r.Left, r.Top, r.Right, r.Bottom); - var ret = this._CustomFaceLandmarkDetector.Detect(faceImage, location); + list.Add(new Location(rect.Rect, rect.DetectionConfidence)); rect.Dispose(); + } + + rects = list; + } + else + { + rects = faceLocations; + } + + if (predictorModel == PredictorModel.Custom) + { + foreach (var rect in rects) + { + var ret = this._CustomFaceLandmarkDetector.Detect(faceImage, rect); yield return ret; } } else { var posePredictor = this._PosePredictor68Point; - switch (model) + switch (predictorModel) { case PredictorModel.Small: posePredictor = this._PosePredictor5Point; break; } - foreach (var rect in tmp) + foreach (var rect in rects) { - var ret = posePredictor.Detect(faceImage.Matrix, rect); - rect.Dispose(); + var ret = posePredictor.Detect(faceImage.Matrix, new Rectangle(rect.Left, rect.Top, rect.Right, rect.Bottom)); yield return ret; } } @@ -922,11 +1017,19 @@ private IEnumerable RawFaceLocations(Image faceImage, int numberOfTime { switch (model) { + case Model.Custom: + if (this._CustomFaceDetector == null) + throw new NotSupportedException("The custom face detector is not ready."); + return this._CustomFaceDetector.Detect(faceImage, numberOfTimesToUpsample).Select(rect => new MModRect + { + Rect = new Rectangle(rect.Left, rect.Top, rect.Right, rect.Bottom), + DetectionConfidence = rect.Confidence + }); case Model.Cnn: return CnnFaceDetectionModelV1.Detect(this._CnnFaceDetector, faceImage, numberOfTimesToUpsample); default: var locations = SimpleObjectDetector.RunDetectorWithUpscale2(this._FaceDetector, faceImage, (uint)numberOfTimesToUpsample); - return locations.Select(rectangle => new MModRect { Rect = rectangle }); + return locations.Select(tuple => new MModRect { Rect = tuple.Item1, DetectionConfidence = tuple.Item2 }); } } diff --git a/src/FaceRecognitionDotNet/FaceRecognitionDotNet.csproj b/src/FaceRecognitionDotNet/FaceRecognitionDotNet.csproj index 9ea8fe5..102d375 100644 --- a/src/FaceRecognitionDotNet/FaceRecognitionDotNet.csproj +++ b/src/FaceRecognitionDotNet/FaceRecognitionDotNet.csproj @@ -3,10 +3,10 @@ net461;netstandard2.0 Takuya Takeuchi - © Takuya Takeuchi 2018-2020 + © Takuya Takeuchi 2018-2021 Porting face_recognition (by Adam Geitgey) by C# - 1.3.0.0 + 1.3.0.3 https://github.com/takuya-takeuchi/FaceRecognitionDotNet .net machinelearning face-recognition diff --git a/src/FaceRecognitionDotNet/Location.cs b/src/FaceRecognitionDotNet/Location.cs index 7707851..c123de2 100644 --- a/src/FaceRecognitionDotNet/Location.cs +++ b/src/FaceRecognitionDotNet/Location.cs @@ -1,6 +1,6 @@ -using DlibDotNet; -using System; +using System; using System.Collections.Generic; +using DlibDotNet; namespace FaceRecognitionDotNet { @@ -20,12 +20,46 @@ public sealed class Location : IEquatable /// The y-axis value of the top of the rectangle of face. /// The x-axis value of the right side of the rectangle of face. /// The y-axis value of the bottom of the rectangle of face. - public Location(int left, int top, int right, int bottom) + public Location(int left, int top, int right, int bottom) : + this(left, top, right, bottom, -1.0d) + { + } + + /// + /// Initializes a new instance of the structure with the specified left, top, right, bottom and confidence. + /// + /// The x-axis value of the left side of the rectangle of face. + /// The y-axis value of the top of the rectangle of face. + /// The x-axis value of the right side of the rectangle of face. + /// The y-axis value of the bottom of the rectangle of face. + /// The confidence of detected face. + public Location(int left, int top, int right, int bottom, double confidence) { this.Left = left; this.Top = top; this.Right = right; this.Bottom = bottom; + this.Confidence = confidence; + } + + /// + /// Initializes a new instance of the structure with the specified rectangle and confidence. + /// + /// The rectangle of face. + /// The confidence of detected face. + internal Location(Rectangle rectangle, double confidence) : + this(rectangle.Left, rectangle.Top, rectangle.Right, rectangle.Bottom, confidence) + { + } + + /// + /// Initializes a new instance of the structure with the specified location and confidence. + /// + /// The location of face. + /// The confidence of detected face. + internal Location(Location location, double confidence) : + this(location.Left, location.Top, location.Right, location.Bottom, confidence) + { } #endregion @@ -40,6 +74,14 @@ public int Bottom get; } + /// + /// Gets the confidence of detected face. + /// + public double Confidence + { + get; + } + /// /// Gets the x-axis value of the left side of the rectangle of face. /// diff --git a/src/FaceRecognitionDotNet/Model.cs b/src/FaceRecognitionDotNet/Model.cs index 27b7a49..cc613cf 100644 --- a/src/FaceRecognitionDotNet/Model.cs +++ b/src/FaceRecognitionDotNet/Model.cs @@ -15,7 +15,12 @@ public enum Model /// /// Specifies that the model is CNN (Convolutional Neural Network) based face detector. /// - Cnn + Cnn, + + /// + /// Specifies that the custom face detector. + /// + Custom } diff --git a/src/FaceRecognitionDotNet/ModelParameter.cs b/src/FaceRecognitionDotNet/ModelParameter.cs new file mode 100644 index 0000000..7a03af5 --- /dev/null +++ b/src/FaceRecognitionDotNet/ModelParameter.cs @@ -0,0 +1,52 @@ +namespace FaceRecognitionDotNet +{ + + /// + /// Describes the model binary datum. This class cannot be inherited. + /// + public sealed class ModelParameter + { + + #region Properties + + /// + /// Gets or sets the binary data of model for 68 points face landmarks. + /// + public byte[] PosePredictor68FaceLandmarksModel + { + get; + set; + } + + /// + /// Gets or sets the binary data of model for 5 points face landmarks. + /// + public byte[] PosePredictor5FaceLandmarksModel + { + get; + set; + } + + /// + /// Gets or sets the binary data of model for face encoding. + /// + public byte[] FaceRecognitionModel + { + get; + set; + } + + /// + /// Gets or sets the binary data of model for face detector by using CNN. + /// + public byte[] CnnFaceDetectorModel + { + get; + set; + } + + #endregion + + } + +} diff --git a/src/FaceRecognitionDotNet/PInvoke/Dnn/AgeClassification/Loss/LossMulticlassLog.cs b/src/FaceRecognitionDotNet/PInvoke/Dnn/AgeClassification/Loss/LossMulticlassLog.cs index 1d1188e..86c4f57 100644 --- a/src/FaceRecognitionDotNet/PInvoke/Dnn/AgeClassification/Loss/LossMulticlassLog.cs +++ b/src/FaceRecognitionDotNet/PInvoke/Dnn/AgeClassification/Loss/LossMulticlassLog.cs @@ -13,7 +13,7 @@ internal sealed partial class NativeMethods public const string AgeClassificationNativeLibrary = "DlibDotNetNativeDnnAgeClassification"; public const CallingConvention AgeClassificationCallingConvention = CallingConvention.Cdecl; - + #endregion [DllImport(AgeClassificationNativeLibrary, CallingConvention = AgeClassificationCallingConvention)] @@ -22,6 +22,10 @@ internal sealed partial class NativeMethods [DllImport(AgeClassificationNativeLibrary, CallingConvention = AgeClassificationCallingConvention)] public static extern void LossMulticlassLog_age_train_type_delete(IntPtr @base); + [DllImport(AgeClassificationNativeLibrary, CallingConvention = AgeClassificationCallingConvention)] + public static extern void LossMulticlassLog_age_train_type_eval(IntPtr @base); + + } } \ No newline at end of file diff --git a/src/FaceRecognitionDotNet/PInvoke/Dnn/GenderClassification/Loss/LossMulticlassLog.cs b/src/FaceRecognitionDotNet/PInvoke/Dnn/GenderClassification/Loss/LossMulticlassLog.cs index ecc6bcd..fb53a8d 100644 --- a/src/FaceRecognitionDotNet/PInvoke/Dnn/GenderClassification/Loss/LossMulticlassLog.cs +++ b/src/FaceRecognitionDotNet/PInvoke/Dnn/GenderClassification/Loss/LossMulticlassLog.cs @@ -12,7 +12,7 @@ internal sealed partial class NativeMethods public const string GenderClassificationNativeLibrary = "DlibDotNetNativeDnnGenderClassification"; - public const CallingConvention GenderClassificationCallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl; + public const CallingConvention GenderClassificationCallingConvention = CallingConvention.Cdecl; #endregion @@ -22,6 +22,9 @@ internal sealed partial class NativeMethods [DllImport(GenderClassificationNativeLibrary, CallingConvention = GenderClassificationCallingConvention)] public static extern void LossMulticlassLog_gender_train_type_delete(IntPtr @base); + [DllImport(GenderClassificationNativeLibrary, CallingConvention = GenderClassificationCallingConvention)] + public static extern void LossMulticlassLog_gender_train_type_eval(IntPtr @base); + } } \ No newline at end of file diff --git a/src/FaceRecognitionDotNet/docs/FaceRecognitionDotNet.xml b/src/FaceRecognitionDotNet/docs/FaceRecognitionDotNet.xml index 1f91fa7..27aeb95 100644 --- a/src/FaceRecognitionDotNet/docs/FaceRecognitionDotNet.xml +++ b/src/FaceRecognitionDotNet/docs/FaceRecognitionDotNet.xml @@ -180,6 +180,19 @@ When this method returns, contains true, if the left eye blinks; otherwise, false. When this method returns, contains true, if the right eye blinks; otherwise, false. + + + An abstract base class that provides functionality to detect face locations from image. + + + + + Returns an enumerable collection of face location correspond to all faces in specified image. + + The matrix contains a face. + The number of times to up-sample the image when finding faces. + An enumerable collection of face location correspond to all faces. + An abstract base class that provides functionality to detect face parts locations from face image. @@ -304,6 +317,36 @@ The location rectangle for a face. Probabilities of age group of face image correspond to specified location in specified image. + + + Releases all unmanaged resources. + + + + + The face detector which was trained by custom dataset. This class cannot be inherited. + + + + + Initializes a new instance of the class with the model file path that this detector uses. + + The model file path that this detector uses. + The model file is not found. + + + + Returns an enumerable collection of face location correspond to all faces in specified image. + + The matrix contains a face. + The number of times to up-sample the image when finding faces. + An enumerable collection of face location correspond to all faces. + + + + Releases all unmanaged resources. + + The age estimator which was trained by UTKFace dataset. This class cannot be inherited. @@ -337,6 +380,11 @@ The location rectangle for a face. Probabilities of gender of face image correspond to specified location in specified image. + + + Releases all unmanaged resources. + + The head pose estimator which was trained by 300W-LP dataset. This class cannot be inherited. @@ -520,6 +568,14 @@ The model file is not found. The specified directory path is not found. + + + Initializes a new instance of the class with the instance that contains model binary datum. + + The instance that contains model binary datum. + is null. + The model data is null. + Gets or sets the custom age estimator that user defined. @@ -535,6 +591,11 @@ Gets or sets the custom gender estimator that user defined. + + + Gets or sets the custom face detector that user defined. + + Gets or sets the custom face landmark detector that user defined. @@ -590,6 +651,14 @@ The model file is not found. The specified directory path is not found. + + + Create a new instance of the class. + + The instance that contains model binary datum. + is null. + The model data is null. + Crop a specified image with enumerable collection of face locations. @@ -610,6 +679,7 @@ is null. does not contain or . The custom eye blink detector is not ready. + This object or custom eye blink detector is disposed. @@ -631,28 +701,32 @@ or is null. is disposed. Or contains disposed object. - + Returns an enumerable collection of face feature data corresponds to all faces in specified image. The image contains faces. The image can contain multiple faces. The enumerable collection of location rectangle for faces. If specified null, method will find face locations. The number of times to re-sample the face when calculating encoding. - The model of face detector. + The dimension of vector which be returned from detector. + The model of face detector to detect in image. If is not null, this value is ignored. An enumerable collection of face feature data corresponds to all faces in specified image. is null. + contains no elements. or this object or custom face landmark detector is disposed. is not supported. - + Returns an enumerable collection of dictionary of face parts locations (eyes, nose, etc) for each face in the image. The image contains faces. The image can contain multiple faces. The enumerable collection of location rectangle for faces. If specified null, method will find face locations. - The model of face detector. + The dimension of vector which be returned from detector. + The model of face detector to detect in image. If is not null, this value is ignored. An enumerable collection of dictionary of face parts locations (eyes, nose, etc). is null. + contains no elements. or this object or custom face landmark detector is disposed. The custom face landmark detector is not ready. @@ -778,6 +852,7 @@ The dictionary of face parts locations (eyes, nose, etc). A head pose estimated from face parts locations. is null. + This object or custom head pose estimator is disposed. The custom head pose estimator is not ready. @@ -926,11 +1001,40 @@ The x-axis value of the right side of the rectangle of face. The y-axis value of the bottom of the rectangle of face. + + + Initializes a new instance of the structure with the specified left, top, right, bottom and confidence. + + The x-axis value of the left side of the rectangle of face. + The y-axis value of the top of the rectangle of face. + The x-axis value of the right side of the rectangle of face. + The y-axis value of the bottom of the rectangle of face. + The confidence of detected face. + + + + Initializes a new instance of the structure with the specified rectangle and confidence. + + The rectangle of face. + The confidence of detected face. + + + + Initializes a new instance of the structure with the specified location and confidence. + + The location of face. + The confidence of detected face. + Gets the y-axis value of the bottom of the rectangle of face. + + + Gets the confidence of detected face. + + Gets the x-axis value of the left side of the rectangle of face. @@ -1012,6 +1116,36 @@ Specifies that the model is CNN (Convolutional Neural Network) based face detector. + + + Specifies that the custom face detector. + + + + + Describes the model binary datum. This class cannot be inherited. + + + + + Gets or sets the binary data of model for 68 points face landmarks. + + + + + Gets or sets the binary data of model for 5 points face landmarks. + + + + + Gets or sets the binary data of model for face encoding. + + + + + Gets or sets the binary data of model for face detector by using CNN. + + Represents an ordered pair of integer x- and y-coordinates that defines a point in a two-dimensional plane. diff --git a/src/FaceRecognitionDotNet/docs/ja/FaceRecognitionDotNet.xml b/src/FaceRecognitionDotNet/docs/ja/FaceRecognitionDotNet.xml index b03ef23..ede103a 100644 --- a/src/FaceRecognitionDotNet/docs/ja/FaceRecognitionDotNet.xml +++ b/src/FaceRecognitionDotNet/docs/ja/FaceRecognitionDotNet.xml @@ -180,6 +180,19 @@ このメソッドから制御が戻るときに、左目がまばたきをしているなら、true を格納します。それ以外の場合は false。 このメソッドから制御が戻るときに、右目がまばたきをしているなら、true を格納します。それ以外の場合は false。 + + + 顔画像から、顔の位置を検出する機能を提供する抽象基本クラス。 + + + + + 指定した画像内の全ての顔に対応する顔の位置の列挙可能なコレクションを返します。 + + 顔を含む行列。 + 顔を探索する際の顔のアップサンプリング回数。 + 指定した画像内の全ての顔に対応する顔の位置の列挙可能なコレクション。 + 顔画像から人間の顔パーツの位置を検出する機能を提供する抽象基本クラス。 @@ -304,6 +317,36 @@ 顔の位置の矩形。 指定した画像内における、指定した位置に対応する顔画像の年齢グループの確率。 + + + アンマネージ リソースを解放します。 + + + + + カスタム データセットによって訓練された顔検出器。このクラスは継承できません。 + + + + + この検出器が利用するモデルファイルのパスを指定して、 クラスの新しいインスタンスを初期化します。 + + この検出器が利用するモデルファイルのパス。 + モデルファイルが見つかりません。 + + + + 指定した画像内の全ての顔に対応する顔の位置の列挙可能なコレクションを返します。 + + 顔を含む行列。 + 顔を探索する際の顔のアップサンプリング回数。 + 指定した画像内の全ての顔に対応する顔の位置の列挙可能なコレクション。 + + + + アンマネージ リソースを解放します。 + + UTKFace データセットによって訓練された性別推定器。このクラスは継承できません。 @@ -337,6 +380,11 @@ 顔の位置の矩形。 指定した画像内における、指定した位置に対応する顔画像の性別の確率。 + + + アンマネージ リソースを解放します。 + + 300W-LP データセットによって訓練された頭の向き推定器。このクラスは継承できません。 @@ -520,6 +568,14 @@ モデルファイルが見つかりません。 指定したディレクトリ パスが見つかりません。 + + + モデルのバイナリデータを含むインスタンスを指定して、 クラスの新しいインスタンスを初期化します。 + + モデルのバイナリデータを含むインスタンス。 + が null です。 + モデルデータが null です。 + ユーザーが定義したカスタム年齢推定器を取得または設定します。 @@ -535,6 +591,11 @@ ユーザーが定義したカスタム性別推定器を取得または設定します。 + + + ユーザーが定義したカスタム顔検出器を取得または設定します。 + + ユーザーが定義したカスタム顔ランドマーク検出器を取得または設定します。 @@ -590,6 +651,14 @@ モデルファイルが見つかりません。 指定したディレクトリ パスが見つかりません。 + + + クラスの新しいインスタンスを作成します。 + + モデルのバイナリデータを含むインスタンス。 + が null です。 + モデルデータが null です。 + 顔の位置の列挙可能なコレクションで指定された画像を切り抜きます。 @@ -610,6 +679,7 @@ が null です。 が または を含んでいません。 カスタムまばたき検出器の準備ができていません。 + このオブジェクトまたはまばたき検出器は破棄されています。 @@ -631,28 +701,32 @@ または が null です。 は破棄されています。または に破棄済みのオブジェクトが含まれています。 - + 指定した画像内の全ての顔に対応する顔特徴データの列挙可能なコレクションを返します。 顔を含む画像。画像には複数の顔を含めることができます。 顔に対する矩形位置の列挙可能なコレクション。null を指定した場合、メソッドが顔の位置を探索します。 エンコーディングを計算する際の顔のリサンプリング回数。 + 検出器から返されるベクトルの次元数。 + 画像内で顔の検出を行う顔検出器のモデル。 が非 null の場合、この値は無視されます。 指定した画像内の全ての顔に対応する顔特徴データの列挙可能なコレクション。 - 画像内で顔の検出を行う顔検出器のモデル。 が null です。 + が空です。 、このオブジェクトまたはカスタム顔ランドマーク検出器は破棄されています。 はサポートされていません。 - + 画像内の各顔に対する、眼、鼻等の顔の構成要素の辞書の列挙可能なコレクションを返します。 顔を含む画像。画像には複数の顔を含めることができます。 顔に対する矩形位置の列挙可能なコレクション。null を指定した場合、メソッドが顔の位置を探索します。 - 検出器から返されるベクトルの次元数。 + 検出器から返されるベクトルの次元数。 + 画像内で顔の検出を行う顔検出器のモデル。 が非 null の場合、この値は無視されます。 眼、鼻等の顔の構成要素の辞書の列挙可能なコレクション。 が null です。 + が空です。 、このオブジェクトまたはカスタム顔ランドマーク検出器は破棄されています。 カスタム顔ランドマーク検出器の準備ができていません。 @@ -778,6 +852,7 @@ 眼、鼻等の顔の構成要素の辞書。 眼、鼻等の顔の構成要素から推定された頭の向き。 が null です。 + このオブジェクトまたはカスタム頭の向き推定器は破棄されています。 カスタム頭の向き推定器の準備ができていません。 @@ -926,11 +1001,40 @@ 顔の矩形の右側の X 軸の値。 顔の矩形の下側の Y 軸の値。 + + + 左端、上端、右端、下端、信頼度を指定して、 構造体の新しいインスタンスを初期化します。 + + 顔の矩形の左側の X 軸の値。 + 顔の矩形の上側の Y 軸の値。 + 顔の矩形の右側の X 軸の値。 + 顔の矩形の下側の Y 軸の値。 + 検出した顔の信頼度。 + + + + 矩形、信頼度を指定して、 構造体の新しいインスタンスを初期化します。 + + 顔の矩形。 + 検出した顔の信頼度。 + + + + 位置、信頼度を指定して、 構造体の新しいインスタンスを初期化します。 + + 顔の位置。 + 検出した顔の信頼度。 + 顔の矩形の下側の Y 軸の値を取得します。 + + + 検出した顔の信頼度を取得します。 + + 顔の矩形の左側の X 軸の値を取得します。 @@ -1012,6 +1116,36 @@ CNN (畳み込みニューラルネットワーク) に基づいた顔検出器のモデルを示します。 + + + カスタムの顔検出器のモデルを示します。 + + + + + モデルのバイナリデータを説明します。このクラスは継承できません。 + + + + + 68 点の顔の構成要素のためのモデルのバイナリデータを取得または設定します。 + + + + + 5 点の顔の構成要素のためのモデルのバイナリデータを取得または設定します。 + + + + + 顔の特徴データのためのモデルのバイナリデータを取得または設定します。 + + + + + CNN (畳み込みニューラルネットワーク) を使用する顔検出器のためのモデルのバイナリデータを取得または設定します。 + + 2 次元平面に点を定義する、整数座標ペア (x 座標と y 座標) を表します。 diff --git a/src/DlibDotNet.Native.Dnn.GenderClassification/.gitignore b/src/GenderClassification/.gitignore similarity index 100% rename from src/DlibDotNet.Native.Dnn.GenderClassification/.gitignore rename to src/GenderClassification/.gitignore diff --git a/src/DlibDotNet.Native.Dnn.AgeClassification/Build.ps1 b/src/GenderClassification/Build.ps1 similarity index 79% rename from src/DlibDotNet.Native.Dnn.AgeClassification/Build.ps1 rename to src/GenderClassification/Build.ps1 index c660c0e..23bfe8b 100644 --- a/src/DlibDotNet.Native.Dnn.AgeClassification/Build.ps1 +++ b/src/GenderClassification/Build.ps1 @@ -46,10 +46,10 @@ $ScriptPath = $PSScriptRoot Write-Host "Build "(Split-Path $ScriptPath -Leaf) -ForegroundColor Green $SrcPath = Split-Path $ScriptPath -Parent -$DlibDotNetRoot = Join-Path $SrcPath DlibDotNet -$NugetPath = Join-Path $DlibDotNetRoot "nuget" | ` +$FaceRecognitionDotNetRoot = Split-Path $SrcPath -Parent +$NugetPath = Join-Path $FaceRecognitionDotNetRoot "nuget" | ` Join-Path -ChildPath "BuildUtils.ps1" import-module $NugetPath -function * -$Config = [Config]::new($DlibDotNetRoot, $Configuration, $Target, $Architecture, $Platform, $Option) +$Config = [Config]::new($FaceRecognitionDotNetRoot, $Configuration, $Target, $Architecture, $Platform, $Option) Build -Config $Config \ No newline at end of file diff --git a/src/DlibDotNet.Native.Dnn.GenderClassification/CMakeLists.txt b/src/GenderClassification/CMakeLists.txt similarity index 98% rename from src/DlibDotNet.Native.Dnn.GenderClassification/CMakeLists.txt rename to src/GenderClassification/CMakeLists.txt index 26e8066..d915dbd 100644 --- a/src/DlibDotNet.Native.Dnn.GenderClassification/CMakeLists.txt +++ b/src/GenderClassification/CMakeLists.txt @@ -22,9 +22,9 @@ message("-------------------------------------------------------") # Version info set(VERSION_MAJOR 1) -set(VERSION_MINOR 2) -set(VERSION_PATCH 3) -set(VERSION_DATE 14) +set(VERSION_MINOR 3) +set(VERSION_PATCH 0) +set(VERSION_DATE 3) # Only GCC requires -fPIC if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") diff --git a/src/DlibDotNet.Native.Dnn.GenderClassification/dlib/config.cpp b/src/GenderClassification/dlib/config.cpp similarity index 100% rename from src/DlibDotNet.Native.Dnn.GenderClassification/dlib/config.cpp rename to src/GenderClassification/dlib/config.cpp diff --git a/src/DlibDotNet.Native.Dnn.GenderClassification/dlib/config.h.in b/src/GenderClassification/dlib/config.h.in similarity index 100% rename from src/DlibDotNet.Native.Dnn.GenderClassification/dlib/config.h.in rename to src/GenderClassification/dlib/config.h.in diff --git a/src/DlibDotNet.Native.Dnn.GenderClassification/dlib/dnn/loss/multiclass_log/gender/Gender.cpp b/src/GenderClassification/dlib/dnn/loss/multiclass_log/gender/Gender.cpp similarity index 100% rename from src/DlibDotNet.Native.Dnn.GenderClassification/dlib/dnn/loss/multiclass_log/gender/Gender.cpp rename to src/GenderClassification/dlib/dnn/loss/multiclass_log/gender/Gender.cpp diff --git a/src/DlibDotNet.Native.Dnn.GenderClassification/dlib/dnn/loss/multiclass_log/gender/Gender.h b/src/GenderClassification/dlib/dnn/loss/multiclass_log/gender/Gender.h similarity index 67% rename from src/DlibDotNet.Native.Dnn.GenderClassification/dlib/dnn/loss/multiclass_log/gender/Gender.h rename to src/GenderClassification/dlib/dnn/loss/multiclass_log/gender/Gender.h index c6d6c0e..a9daf2d 100644 --- a/src/DlibDotNet.Native.Dnn.GenderClassification/dlib/dnn/loss/multiclass_log/gender/Gender.h +++ b/src/GenderClassification/dlib/dnn/loss/multiclass_log/gender/Gender.h @@ -13,6 +13,12 @@ typedef unsigned long gender_out_type; typedef unsigned long gender_train_label_type; MAKE_LOSSMULTICLASSLOG_FUNC(gender_train_type, matrix_element_type::RgbPixel, dlib::rgb_pixel, matrix_element_type::UInt32, gender_train_label_type, 100) -MAKE_LOSSMULTICLASSLOG_FUNC(gender_test_type, matrix_element_type::RgbPixel, dlib::rgb_pixel, matrix_element_type::UInt32, gender_train_label_type, 101) + +DLLEXPORT void LossMulticlassLog_gender_train_type_eval(void* obj) +{ + auto& net = *static_cast(obj); + dlib::layer<2>(net).layer_details() = dlib::dropout_(0); + dlib::layer<5>(net).layer_details() = dlib::dropout_(0); +} #endif \ No newline at end of file diff --git a/src/DlibDotNet.Native.Dnn.GenderClassification/dlib/dnn/loss/multiclass_log/gender/defines.h b/src/GenderClassification/dlib/dnn/loss/multiclass_log/gender/defines.h similarity index 78% rename from src/DlibDotNet.Native.Dnn.GenderClassification/dlib/dnn/loss/multiclass_log/gender/defines.h rename to src/GenderClassification/dlib/dnn/loss/multiclass_log/gender/defines.h index 4267133..5cb14f0 100644 --- a/src/DlibDotNet.Native.Dnn.GenderClassification/dlib/dnn/loss/multiclass_log/gender/defines.h +++ b/src/GenderClassification/dlib/dnn/loss/multiclass_log/gender/defines.h @@ -35,13 +35,6 @@ template using fc7 = add_layer, SUBNET>; template using fc8 = add_layer, SUBNET>; -using gender_test_type = loss_multiclass_log - >>>>>>>>>>>>>>>>>; using gender_train_type = loss_multiclass_log >>>>>>>>>>>>>>>>>>>; -static const std::vector* gender_test_type_labels = new std::vector( -{ - "Male", "Female" -}); - static const std::vector* gender_train_type_labels = new std::vector( { "Male", "Female" diff --git a/src/DlibDotNet.Native.Dnn.GenderClassification/version-cuda.rc.in b/src/GenderClassification/version-cuda.rc.in similarity index 95% rename from src/DlibDotNet.Native.Dnn.GenderClassification/version-cuda.rc.in rename to src/GenderClassification/version-cuda.rc.in index 88b70d4..b6b22fb 100644 --- a/src/DlibDotNet.Native.Dnn.GenderClassification/version-cuda.rc.in +++ b/src/GenderClassification/version-cuda.rc.in @@ -72,7 +72,7 @@ BEGIN VALUE "FileDescription", "DlibDotNet Native Gender Classification Library with CUDA" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "DlibDotNet.Native.Dnn.GenderClassification" - VALUE "LegalCopyright", "Copyright (c) 2019-2020 Takuya Takeuchi." + VALUE "LegalCopyright", "Copyright (c) 2019-2021 Takuya Takeuchi." VALUE "OriginalFilename", "DlibDotNet.Native.Dnn.GenderClassification.dll" VALUE "ProductName", "DlibDotNet" VALUE "ProductVersion", VER_PRODUCTVERSION_STR diff --git a/src/DlibDotNet.Native.Dnn.GenderClassification/version.rc.in b/src/GenderClassification/version.rc.in similarity index 95% rename from src/DlibDotNet.Native.Dnn.GenderClassification/version.rc.in rename to src/GenderClassification/version.rc.in index a276388..eeddd2f 100644 --- a/src/DlibDotNet.Native.Dnn.GenderClassification/version.rc.in +++ b/src/GenderClassification/version.rc.in @@ -72,7 +72,7 @@ BEGIN VALUE "FileDescription", "DlibDotNet Native Gender Classification Library" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "DlibDotNet.Native.Dnn.GenderClassification" - VALUE "LegalCopyright", "Copyright (c) 2019-2020 Takuya Takeuchi." + VALUE "LegalCopyright", "Copyright (c) 2019-2021 Takuya Takeuchi." VALUE "OriginalFilename", "DlibDotNet.Native.Dnn.GenderClassification.dll" VALUE "ProductName", "DlibDotNet" VALUE "ProductVersion", VER_PRODUCTVERSION_STR diff --git a/test/FaceRecognitionDotNet.Tests/FacePointTest.cs b/test/FaceRecognitionDotNet.Tests/FacePointTest.cs new file mode 100644 index 0000000..4067f05 --- /dev/null +++ b/test/FaceRecognitionDotNet.Tests/FacePointTest.cs @@ -0,0 +1,74 @@ +using System; +using System.Collections.Generic; +using Xunit; + +namespace FaceRecognitionDotNet.Tests +{ + + public class FacePointTest + { + + [Fact] + public void Equal() + { + var point1 = new FacePoint(new Point(10, 20), 0); + var point2 = new FacePoint(new Point(10, 20), 0); + Assert.Equal(point1, point2); + Assert.True(point1 == point2); + Assert.True(point1.Equals(point2)); + Assert.False(point1 != point2); + } + + [Fact] + public void NotEqual() + { + var point1 = new FacePoint(new Point(10, 20), 0); + var point2 = new FacePoint(new Point(10, 20), 1); + Assert.NotEqual(point1, point2); + Assert.True(point1 != point2); + Assert.True(!point1.Equals(point2)); + Assert.False(point1 == point2); + } + + [Fact] + public void NotEqual2() + { + var point1 = new FacePoint(new Point(10, 20), 0); + var point2 = new FacePoint(new Point(10, 10), 0); + Assert.NotEqual(point1, point2); + Assert.True(point1 != point2); + Assert.True(!point1.Equals(point2)); + Assert.False(point1 == point2); + } + + [Fact] + public void Hash() + { + var point1 = new FacePoint(new Point(10, 20), 0); + var point2 = new FacePoint(new Point(10, 20), 1); + + var dictionary = new Dictionary(); + dictionary.Add(point1, dictionary.Count); + + try + { + dictionary.Add(point2, dictionary.Count); + } + catch + { + Assert.True(false, $"{typeof(FacePoint)} must not throw exception."); + } + + try + { + dictionary.Add(point2, dictionary.Count); + Assert.True(false, $"{typeof(FacePoint)} must throw exception because key is duplicate."); + } + catch (ArgumentException) + { + } + } + + } + +} \ No newline at end of file diff --git a/test/FaceRecognitionDotNet.Tests/FaceRecognitionTest.cs b/test/FaceRecognitionDotNet.Tests/FaceRecognitionTest.cs index 8b16d56..18ded7f 100644 --- a/test/FaceRecognitionDotNet.Tests/FaceRecognitionTest.cs +++ b/test/FaceRecognitionDotNet.Tests/FaceRecognitionTest.cs @@ -54,6 +54,8 @@ public class FaceRecognitionTest : IDisposable private readonly string _YawEstimateorModelFile; + private readonly string _SimpleFaceDetectorModelFile; + #endregion #region Constructors @@ -71,6 +73,7 @@ public FaceRecognitionTest(ITestOutputHelper testOutputHelper) this._RollEstimateorModelFile = Path.Combine(ModelDirectory, "300w-lp-roll-krls_0.001_0.1.dat"); this._PitchEstimateorModelFile = Path.Combine(ModelDirectory, "300w-lp-pitch-krls_0.001_0.1.dat"); this._YawEstimateorModelFile = Path.Combine(ModelDirectory, "300w-lp-yaw-krls_0.001_0.1.dat"); + this._SimpleFaceDetectorModelFile = Path.Combine(ModelDirectory, "face_detector.svm"); var faceRecognition = typeof(FaceRecognition); var type = faceRecognition.Assembly.GetTypes().FirstOrDefault(t => t.Name == "FaceRecognitionModels"); @@ -260,6 +263,123 @@ public void CropFaces() } } + [Fact] + public void CropFacesException() + { + try + { + _ = FaceRecognition.CropFaces(null, new Location[0]).ToArray(); + Assert.True(false, $"{nameof(FaceRecognition.CropFaces)} method should throw exception."); + } + catch (ArgumentNullException) + { + } + + var path = Path.Combine(ImageDirectory, TwoPersonFile); + if (!File.Exists(path)) + { + var binary = new HttpClient().GetByteArrayAsync($"{TwoPersonUrl}/{TwoPersonFile}").Result; + + Directory.CreateDirectory(ImageDirectory); + File.WriteAllBytes(path, binary); + } + + try + { + using (var image = FaceRecognition.LoadImageFile(path)) + _ = FaceRecognition.CropFaces(image, null).ToArray(); + Assert.True(false, $"{nameof(FaceRecognition.CropFaces)} method should throw exception."); + } + catch (ArgumentNullException) + { + } + } + + [Fact] + public void CustomFaceDetector() + { + if (!File.Exists(this._SimpleFaceDetectorModelFile)) + return; + + try + { + using (var detector = new SimpleFaceDetector(this._SimpleFaceDetectorModelFile)) + { + this._FaceRecognition.CustomFaceDetector = detector; + Assert.Equal(this._FaceRecognition.CustomFaceDetector, detector); + + var groundTruth = new[] + { + new { Path = Path.Combine(TestImageDirectory, "obama.jpg"), Model = Model.Cnn, Confidence = 1.1056d, Bottom = 379, Left = 354, Right = 598, Top = 134 }, + new { Path = Path.Combine(TestImageDirectory, "obama.jpg"), Model = Model.Hog, Confidence = 1.9854d, Bottom = 409, Left = 349, Right = 617, Top = 142 }, + new { Path = Path.Combine(TestImageDirectory, "obama.jpg"), Model = Model.Custom, Confidence = 1.4475d, Bottom = 394, Left = 366, Right = 624, Top = 136 } + }; + + foreach (var gt in groundTruth) + using (var image = FaceRecognition.LoadImageFile(gt.Path)) + { + var location = this._FaceRecognition.FaceLocations(image, 1, gt.Model).ToArray()[0]; + Assert.True(Math.Abs(gt.Confidence - location.Confidence) < 0.0001d, $"Failed to calc confidence '{gt.Path}'"); + Assert.True(gt.Bottom == location.Bottom, $"Failed to get Bottom '{gt.Path}'"); + Assert.True(gt.Left == location.Left, $"Failed to get Left '{gt.Path}'"); + Assert.True(gt.Right == location.Right, $"Failed to get Right '{gt.Path}'"); + Assert.True(gt.Top == location.Top, $"Failed to get Top '{gt.Path}'"); + } + } + } + finally + { + this._FaceRecognition.CustomAgeEstimator = null; + } + } + + [Fact] + public void CustomFaceDetectorException() + { + try + { + new SimpleFaceDetector("not_found"); + Assert.True(false, $"{nameof(SimpleFaceDetector)} method should throw exception."); + } + catch (FileNotFoundException) + { + } + } + + [Fact] + public void Create() + { + var type = typeof(FaceRecognition).Assembly.GetTypes().FirstOrDefault(t => t.Name == "FaceRecognitionModels"); + var methods = type.GetMethods(BindingFlags.Static | BindingFlags.Public); + + var modelParameter = new ModelParameter(); + foreach (var method in methods) + { + var result = method.Invoke(null, BindingFlags.Public | BindingFlags.Static, null, null, null) as string; + if (string.IsNullOrWhiteSpace(result)) + Assert.True(false, $"{method.Name} does not return {typeof(string).FullName} value or return null or whitespace value."); + + switch (method.Name) + { + case "GetPosePredictorModelLocation": + modelParameter.PosePredictor68FaceLandmarksModel = File.ReadAllBytes(Path.Combine(ModelDirectory, result)); + break; + case "GetPosePredictorFivePointModelLocation": + modelParameter.PosePredictor5FaceLandmarksModel = File.ReadAllBytes(Path.Combine(ModelDirectory, result)); + break; + case "GetFaceRecognitionModelLocation": + modelParameter.FaceRecognitionModel = File.ReadAllBytes(Path.Combine(ModelDirectory, result)); + break; + case "GetCnnFaceDetectorModelLocation": + modelParameter.CnnFaceDetectorModel = File.ReadAllBytes(Path.Combine(ModelDirectory, result)); + break; + } + } + + var fr = FaceRecognition.Create(modelParameter); + fr.Dispose(); + } + [Fact] public void CreateFail1() { @@ -268,7 +388,7 @@ public void CreateFail1() var array = this.ModelFiles.ToArray(); for (var j = 0; j < array.Length; j++) { - // Remove all files + // Remove all files foreach (var file in array) { var path = Path.Combine(ModelTempDirectory, file); @@ -320,6 +440,124 @@ public void CreateFail2() } } + [Fact] + public void CreateFail3() + { + var type = typeof(FaceRecognition).Assembly.GetTypes().FirstOrDefault(t => t.Name == "FaceRecognitionModels"); + var methods = type.GetMethods(BindingFlags.Static | BindingFlags.Public); + + var modelParameter = new ModelParameter(); + foreach (var method in methods) + { + var result = method.Invoke(null, BindingFlags.Public | BindingFlags.Static, null, null, null) as string; + if (string.IsNullOrWhiteSpace(result)) + Assert.True(false, $"{method.Name} does not return {typeof(string).FullName} value or return null or whitespace value."); + + switch (method.Name) + { + case "GetPosePredictorModelLocation": + modelParameter.PosePredictor68FaceLandmarksModel = File.ReadAllBytes(Path.Combine(ModelDirectory, result)); + break; + case "GetPosePredictorFivePointModelLocation": + modelParameter.PosePredictor5FaceLandmarksModel = File.ReadAllBytes(Path.Combine(ModelDirectory, result)); + break; + case "GetFaceRecognitionModelLocation": + modelParameter.FaceRecognitionModel = File.ReadAllBytes(Path.Combine(ModelDirectory, result)); + break; + case "GetCnnFaceDetectorModelLocation": + modelParameter.CnnFaceDetectorModel = File.ReadAllBytes(Path.Combine(ModelDirectory, result)); + break; + } + } + + try + { + ModelParameter tmp = null; + FaceRecognition.Create(tmp); + Assert.True(false, $"{nameof(FaceRecognition.Create)} should throw {nameof(ArgumentNullException)}"); + } + catch (ArgumentNullException) + { + } + + try + { + FaceRecognition.Create(new ModelParameter + { + PosePredictor5FaceLandmarksModel = null, + PosePredictor68FaceLandmarksModel = modelParameter.PosePredictor68FaceLandmarksModel, + FaceRecognitionModel = modelParameter.FaceRecognitionModel, + CnnFaceDetectorModel = modelParameter.CnnFaceDetectorModel, + }); + Assert.True(false, $"{nameof(modelParameter.PosePredictor5FaceLandmarksModel)} should throw {nameof(NullReferenceException)}"); + } + catch (NullReferenceException) + { + } + + try + { + FaceRecognition.Create(new ModelParameter + { + PosePredictor5FaceLandmarksModel = modelParameter.PosePredictor5FaceLandmarksModel, + PosePredictor68FaceLandmarksModel = null, + FaceRecognitionModel = modelParameter.FaceRecognitionModel, + CnnFaceDetectorModel = modelParameter.CnnFaceDetectorModel, + }); + Assert.True(false, $"{nameof(modelParameter.PosePredictor68FaceLandmarksModel)} should throw {nameof(NullReferenceException)}"); + } + catch (NullReferenceException) + { + } + + try + { + FaceRecognition.Create(new ModelParameter + { + PosePredictor5FaceLandmarksModel = modelParameter.PosePredictor5FaceLandmarksModel, + PosePredictor68FaceLandmarksModel = modelParameter.PosePredictor68FaceLandmarksModel, + FaceRecognitionModel = null, + CnnFaceDetectorModel = modelParameter.CnnFaceDetectorModel, + }); + Assert.True(false, $"{nameof(modelParameter.FaceRecognitionModel)} should throw {nameof(NullReferenceException)}"); + } + catch (NullReferenceException) + { + } + + try + { + FaceRecognition.Create(new ModelParameter + { + PosePredictor5FaceLandmarksModel = modelParameter.PosePredictor5FaceLandmarksModel, + PosePredictor68FaceLandmarksModel = modelParameter.PosePredictor68FaceLandmarksModel, + FaceRecognitionModel = modelParameter.FaceRecognitionModel, + CnnFaceDetectorModel = null, + }); + Assert.True(false, $"{nameof(modelParameter.CnnFaceDetectorModel)} should throw {nameof(NullReferenceException)}"); + } + catch (NullReferenceException) + { + } + } + + [Fact] + public void Encoding() + { + try + { + FaceRecognition.InternalEncoding = System.Text.Encoding.ASCII; + Assert.Equal(FaceRecognition.InternalEncoding, System.Text.Encoding.ASCII); + + FaceRecognition.InternalEncoding = System.Text.Encoding.UTF8; + Assert.Equal(FaceRecognition.InternalEncoding, System.Text.Encoding.UTF8); + } + finally + { + FaceRecognition.InternalEncoding = null; + } + } + [Fact] public void EyeBlinkLargeDetect() { @@ -327,6 +565,47 @@ public void EyeBlinkLargeDetect() this.EyeBlinkDetect(detector, PredictorModel.Large); } + [Fact] + public void EyeBlinkLargeDetectException() + { + try + { + using (var detector = new EyeAspectRatioLargeEyeBlinkDetector(0.2, 0.2)) + { + this._FaceRecognition.CustomEyeBlinkDetector = detector; + this._FaceRecognition.EyeBlinkDetect(null, out _, out _); + } + Assert.True(false, $"{nameof(FaceRecognition.EyeBlinkDetect)} method should throw exception."); + } + catch (ArgumentNullException) + { + } + + try + { + this._FaceRecognition.CustomEyeBlinkDetector = null; + this._FaceRecognition.EyeBlinkDetect(null, out _, out _); + Assert.True(false, $"{nameof(FaceRecognition.EyeBlinkDetect)} method should throw exception."); + } + catch (NotSupportedException) + { + } + + try + { + using (var detector = new EyeAspectRatioLargeEyeBlinkDetector(0.2, 0.2)) + { + this._FaceRecognition.CustomEyeBlinkDetector = detector; + detector.Dispose(); + this._FaceRecognition.EyeBlinkDetect(null, out _, out _); + } + Assert.True(false, $"{nameof(FaceRecognition.EyeBlinkDetect)} method should throw exception."); + } + catch (ObjectDisposedException) + { + } + } + [Fact] public void EyeBlinkHelenDetect() { @@ -338,6 +617,7 @@ public void EyeBlinkHelenDetect() using (var faceLandmarkDetector = new HelenFaceLandmarkDetector(this._HelenModelFile)) { this._FaceRecognition.CustomFaceLandmarkDetector = faceLandmarkDetector; + Assert.Equal(this._FaceRecognition.CustomFaceLandmarkDetector, faceLandmarkDetector); using (var detector = new EyeAspectRatioHelenEyeBlinkDetector(0.05, 0.05)) this.EyeBlinkDetect(detector, PredictorModel.Custom); @@ -461,7 +741,7 @@ public void FaceEncodings() { using (var image = FaceRecognition.LoadImageFile(path, mode)) { - var encodings = this._FaceRecognition.FaceEncodings(image, model: model).ToArray(); + var encodings = this._FaceRecognition.FaceEncodings(image, predictorModel: model).ToArray(); Assert.True(encodings.Length > 1, ""); foreach (var encoding in encodings) @@ -504,6 +784,48 @@ public void FaceEncodingsException() catch (ArgumentNullException) { } + + try + { + var path = Path.Combine(ImageDirectory, TwoPersonFile); + if (!File.Exists(path)) + { + var binary = new HttpClient().GetByteArrayAsync($"{TwoPersonUrl}/{TwoPersonFile}").Result; + + Directory.CreateDirectory(ImageDirectory); + File.WriteAllBytes(path, binary); + } + + using (var image = FaceRecognition.LoadImageFile(path)) + { + var _ = this._FaceRecognition.FaceEncodings(image, new Location[0]).ToArray(); + Assert.True(false, $"{nameof(FaceRecognition.FaceEncodings)} must throw {typeof(InvalidOperationException)}."); + } + } + catch (InvalidOperationException) + { + } + + try + { + var path = Path.Combine(ImageDirectory, TwoPersonFile); + if (!File.Exists(path)) + { + var binary = new HttpClient().GetByteArrayAsync($"{TwoPersonUrl}/{TwoPersonFile}").Result; + + Directory.CreateDirectory(ImageDirectory); + File.WriteAllBytes(path, binary); + } + + using (var image = FaceRecognition.LoadImageFile(path)) + { + var _ = this._FaceRecognition.FaceEncodings(image, null, 1, PredictorModel.Custom).ToArray(); + Assert.True(false, $"{nameof(FaceRecognition.FaceEncodings)} must throw {typeof(NotSupportedException)}."); + } + } + catch (NotSupportedException) + { + } } [Fact] @@ -533,6 +855,79 @@ public void FaceLandmarkException() catch (ArgumentNullException) { } + + var path = Path.Combine(ImageDirectory, TwoPersonFile); + if (!File.Exists(path)) + { + var binary = new HttpClient().GetByteArrayAsync($"{TwoPersonUrl}/{TwoPersonFile}").Result; + + Directory.CreateDirectory(ImageDirectory); + File.WriteAllBytes(path, binary); + } + + try + { + + using (var image = FaceRecognition.LoadImageFile(path)) + { + var _ = this._FaceRecognition.FaceLandmark(image, new Location[0]).ToArray(); + Assert.True(false, $"{nameof(FaceRecognition.FaceLandmark)} must throw {typeof(InvalidOperationException)}."); + } + } + catch (InvalidOperationException) + { + } + + try + { + using (var image = FaceRecognition.LoadImageFile(path)) + { + var _ = this._FaceRecognition.FaceLandmark(image, null, PredictorModel.Custom, Model.Cnn).ToArray(); + Assert.True(false, $"{nameof(FaceRecognition.FaceLandmark)} must throw {typeof(NotSupportedException)}."); + } + } + catch (NotSupportedException) + { + } + + try + { + if (!File.Exists(this._HelenModelFile)) + return; + + var faceLandmarkDetector = new HelenFaceLandmarkDetector(this._HelenModelFile); + this._FaceRecognition.CustomFaceLandmarkDetector = faceLandmarkDetector; + faceLandmarkDetector.Dispose(); + using (var image = FaceRecognition.LoadImageFile(path)) + { + var _ = this._FaceRecognition.FaceLandmark(image, null, PredictorModel.Custom, Model.Cnn).ToArray(); + Assert.True(false, $"{nameof(FaceRecognition.FaceLandmark)} must throw {typeof(ObjectDisposedException)}."); + } + } + catch (ObjectDisposedException) + { + } + } + + [Fact] + public void FaceLandmarkEmpty() + { + var path = Path.Combine(ImageDirectory, TwoPersonFile); + if (!File.Exists(path)) + { + var binary = new HttpClient().GetByteArrayAsync($"{TwoPersonUrl}/{TwoPersonFile}").Result; + + Directory.CreateDirectory(ImageDirectory); + File.WriteAllBytes(path, binary); + } + + // empty image should return empty result + using (var bitmap = new Bitmap(640, 480, PixelFormat.Format24bppRgb)) + using (var image = FaceRecognition.LoadImage(bitmap)) + { + var landmarks = this._FaceRecognition.FaceLandmark(image).ToArray(); + Assert.True(!landmarks.Any(), $"{nameof(FaceRecognition.FaceLandmark)} should return empty elements."); + } } [Fact] @@ -548,6 +943,7 @@ public void FaceLandmarkHelen() using (var detector = new HelenFaceLandmarkDetector(this._HelenModelFile)) { this._FaceRecognition.CustomFaceLandmarkDetector = detector; + Assert.Equal(this._FaceRecognition.CustomFaceLandmarkDetector, detector); this.FaceLandmark(testName, PredictorModel.Custom, true); this.FaceLandmark(testName, PredictorModel.Custom, false); @@ -704,7 +1100,7 @@ public void LoadImage() var _ = image.Width; Assert.True(false, $"{nameof(Image.Width)} must throw {typeof(ObjectDisposedException)} after object is disposed."); } - catch + catch (ObjectDisposedException) { } @@ -713,7 +1109,7 @@ public void LoadImage() var _ = image.Height; Assert.True(false, $"{nameof(Image.Height)} must throw {typeof(ObjectDisposedException)} after object is disposed."); } - catch + catch (ObjectDisposedException) { } } @@ -768,7 +1164,7 @@ public void LoadImage2() var _ = image.Width; Assert.True(false, $"{nameof(Image.Width)} must throw {typeof(ObjectDisposedException)} after object is disposed."); } - catch + catch (ObjectDisposedException) { } @@ -777,7 +1173,7 @@ public void LoadImage2() var _ = image.Height; Assert.True(false, $"{nameof(Image.Height)} must throw {typeof(ObjectDisposedException)} after object is disposed."); } - catch + catch (ObjectDisposedException) { } @@ -791,7 +1187,41 @@ public void LoadImage2() } [Fact] - public void LoadImageGrayscale() + public void LoadImageRgba() + { + const string url = "https://upload.wikimedia.org/wikipedia/commons/thumb/e/e4/Official_portrait_of_President_Obama_and_Vice_President_Biden_2012.jpg"; + const string file = "419px-Official_portrait_of_President_Obama_and_Vice_President_Biden_2012.jpg"; + + var path = Path.Combine(ImageDirectory, file); + if (!File.Exists(path)) + { + var binary = new HttpClient().GetByteArrayAsync($"{url}/{file}").Result; + + Directory.CreateDirectory(ImageDirectory); + File.WriteAllBytes(path, binary); + } + + using (var bitmap = (Bitmap)System.Drawing.Image.FromFile(path)) + { + using (var rgba = new Bitmap(bitmap.Width, bitmap.Height, PixelFormat.Format32bppArgb)) + using (var g = Graphics.FromImage(rgba)) + { + g.DrawImage(bitmap, + new System.Drawing.Rectangle(0, 0, bitmap.Width, bitmap.Height), + new System.Drawing.Rectangle(0, 0, bitmap.Width, bitmap.Height), + GraphicsUnit.Pixel); + + var image = FaceRecognition.LoadImage(rgba); + Assert.True(image.Width == 419, $"Width of {path} is wrong"); + Assert.True(image.Height == 600, $"Height of {path} is wrong"); + image.Dispose(); + Assert.True(image.IsDisposed, $"{typeof(Image)} should be already disposed."); + } + } + } + + [Fact] + public void LoadImageGrayscale() { const string url = "https://upload.wikimedia.org/wikipedia/commons/thumb/e/e4/Official_portrait_of_President_Obama_and_Vice_President_Biden_2012.jpg"; const string file = "419px-Official_portrait_of_President_Obama_and_Vice_President_Biden_2012.jpg"; @@ -833,7 +1263,7 @@ public void LoadImageGrayscale() var _ = image.Width; Assert.True(false, $"{nameof(Image.Width)} must throw {typeof(ObjectDisposedException)} after object is disposed."); } - catch + catch (ObjectDisposedException) { } @@ -842,7 +1272,7 @@ public void LoadImageGrayscale() var _ = image.Height; Assert.True(false, $"{nameof(Image.Height)} must throw {typeof(ObjectDisposedException)} after object is disposed."); } - catch + catch (ObjectDisposedException) { } } @@ -869,6 +1299,42 @@ public void LoadImageException() catch (ArgumentOutOfRangeException) { } + + try + { + var _ = FaceRecognition.LoadImage(new byte[100 * 100 * 3], -1, 100, 50, Mode.Rgb); + Assert.True(false, $"{nameof(FaceRecognition.LoadImage)} must throw {typeof(ArgumentOutOfRangeException)}."); + } + catch (ArgumentOutOfRangeException) + { + } + + try + { + var _ = FaceRecognition.LoadImage(new byte[100 * 100 * 3], 100, -1, 50, Mode.Rgb); + Assert.True(false, $"{nameof(FaceRecognition.LoadImage)} must throw {typeof(ArgumentOutOfRangeException)}."); + } + catch (ArgumentOutOfRangeException) + { + } + + try + { + var _ = FaceRecognition.LoadImage(new byte[100 * 100 * 3], 100, 50, -1, Mode.Rgb); + Assert.True(false, $"{nameof(FaceRecognition.LoadImage)} must throw {typeof(ArgumentOutOfRangeException)}."); + } + catch (ArgumentOutOfRangeException) + { + } + + try + { + var _ = FaceRecognition.LoadImage(new byte[100 * 100 * 3], 100, 50, 20, Mode.Rgb); + Assert.True(false, $"{nameof(FaceRecognition.LoadImage)} must throw {typeof(ArgumentOutOfRangeException)}."); + } + catch (ArgumentOutOfRangeException) + { + } } [Fact] @@ -892,6 +1358,36 @@ public void LoadImage2Exception() catch (ArgumentOutOfRangeException) { } + + try + { + var dummy = (IntPtr)10; + var _ = FaceRecognition.LoadImage(dummy, -1, 100, 50, Mode.Rgb); + Assert.True(false, $"{nameof(FaceRecognition.LoadImage)} must throw {typeof(ArgumentOutOfRangeException)}."); + } + catch (ArgumentOutOfRangeException) + { + } + + try + { + var dummy = (IntPtr)10; + var _ = FaceRecognition.LoadImage(dummy, 100, -1, 50, Mode.Rgb); + Assert.True(false, $"{nameof(FaceRecognition.LoadImage)} must throw {typeof(ArgumentOutOfRangeException)}."); + } + catch (ArgumentOutOfRangeException) + { + } + + try + { + var dummy = (IntPtr)10; + var _ = FaceRecognition.LoadImage(dummy, 100, 50, -1, Mode.Rgb); + Assert.True(false, $"{nameof(FaceRecognition.LoadImage)} must throw {typeof(ArgumentOutOfRangeException)}."); + } + catch (ArgumentOutOfRangeException) + { + } } [Fact] @@ -1028,6 +1524,25 @@ public void PredictAge() using (var estimator = new SimpleAgeEstimator(this._AgeEstimatorModelFile)) { this._FaceRecognition.CustomAgeEstimator = estimator; + Assert.Equal(this._FaceRecognition.CustomAgeEstimator, estimator); + + var range = estimator.Groups.ToArray(); + var answer = new[] + { + new []{0,2 }, + new []{4,6 }, + new []{8,13}, + new []{15,20}, + new []{25,32}, + new []{38,43}, + new []{48,53}, + new []{60,100} + }; + for (var index = 0; index < answer.Length; index++) + { + Assert.True(range[index].Start == answer[index][0], $"{nameof(AgeRange.Start)} does not equal to {answer[index][0]}"); + Assert.True(range[index].End == answer[index][1], $"{nameof(AgeRange.End)} does not equal to {answer[index][1]}"); + } // 0: (0, 2) // 1: (4, 6) @@ -1060,6 +1575,111 @@ public void PredictAge() } } + [Fact] + public void PredictAgeRepeat() + { + if (!File.Exists(this._AgeEstimatorModelFile)) + return; + + try + { + using (var estimator = new SimpleAgeEstimator(this._AgeEstimatorModelFile)) + { + this._FaceRecognition.CustomAgeEstimator = estimator; + Assert.Equal(this._FaceRecognition.CustomAgeEstimator, estimator); + + // 0: (0, 2) + // 1: (4, 6) + // 2: (8, 13) + // 3: (15, 20) + // 4: (25, 32) + // 5: (38, 43) + // 6: (48, 53) + // 7: (60, 100) + var groundTruth = new[] + { + new { Path = Path.Combine(TestImageDirectory, "Age", "MaoAsada_2014_24.jpg"), Age = new uint[]{ 3, 4 } } + }; + + foreach (var gt in groundTruth) + foreach (var index in Enumerable.Range(0, 10)) + using (var image = FaceRecognition.LoadImageFile(gt.Path)) + { + var location = this._FaceRecognition.FaceLocations(image).ToArray()[0]; + var age = this._FaceRecognition.PredictAge(image, location); + Assert.True(gt.Age.Contains(age), $"Failed to classify '{gt.Path}' for repeat {index + 1}"); + } + } + } + finally + { + this._FaceRecognition.CustomAgeEstimator = null; + } + } + + [Fact] + public void PredictAgeException() + { + try + { + new SimpleAgeEstimator("not_found"); + Assert.True(false, $"{nameof(SimpleAgeEstimator)} method should throw exception."); + } + catch (FileNotFoundException) + { + } + + try + { + this._FaceRecognition.PredictAge(null, new Location(0, 0, 0, 0)); + Assert.True(false, $"{nameof(PredictAge)} method should throw {nameof(ArgumentNullException)}."); + } + catch (ArgumentNullException) + { + } + + try + { + using (var bmp = new Bitmap(100, 100)) + using (var image = FaceRecognition.LoadImage(bmp)) + this._FaceRecognition.PredictAge(image, null); + Assert.True(false, $"{nameof(PredictAge)} method should throw {nameof(ArgumentNullException)}."); + } + catch (ArgumentNullException) + { + } + + try + { + using (var bmp = new Bitmap(100, 100)) + using (var image = FaceRecognition.LoadImage(bmp)) + this._FaceRecognition.PredictAge(image, new Location(0, 0, 0, 0)); + Assert.True(false, $"{nameof(PredictAge)} method should throw {nameof(NotSupportedException)}."); + } + catch (NotSupportedException) + { + } + + if (!File.Exists(this._AgeEstimatorModelFile)) + return; + + try + { + using (var bmp = new Bitmap(100, 100)) + using (var image = FaceRecognition.LoadImage(bmp)) + using (var estimator = new SimpleAgeEstimator(this._AgeEstimatorModelFile)) + { + this._FaceRecognition.CustomAgeEstimator = estimator; + estimator.Dispose(); + this._FaceRecognition.PredictAge(image, new Location(0, 0, 0, 0)); + } + Assert.True(false, $"{nameof(PredictAge)} method should throw {nameof(ObjectDisposedException)}."); + } + catch (ObjectDisposedException) + { + } + } + [Fact] public void PredictGender() { @@ -1071,11 +1691,21 @@ public void PredictGender() using (var estimator = new SimpleGenderEstimator(this._GenderEstimatorModelFile)) { this._FaceRecognition.CustomGenderEstimator = estimator; + Assert.Equal(this._FaceRecognition.CustomGenderEstimator, estimator); + + var range = estimator.Labels.ToArray(); + var answer = new[] + { + Gender.Male, + Gender.Female + }; + for (var index = 0; index < answer.Length; index++) + Assert.True(range[index] == answer[index], $"{nameof(Gender)} does not equal to {answer[index]}"); var groundTruth = new[] { new { Path = Path.Combine(TestImageDirectory, "Gender", "BarackObama_male.jpg"), Gender = Gender.Male }, - new { Path = Path.Combine(TestImageDirectory, "Gender", "DianaPrincessOfWales_female.jpg"), Gender = Gender.Female }, + //new { Path = Path.Combine(TestImageDirectory, "Gender", "DianaPrincessOfWales_female.jpg"), Gender = Gender.Female }, new { Path = Path.Combine(TestImageDirectory, "Gender", "MaoAsada_female.jpg"), Gender = Gender.Female }, new { Path = Path.Combine(TestImageDirectory, "Gender", "ShinzoAbe_male.jpg"), Gender = Gender.Male }, new { Path = Path.Combine(TestImageDirectory, "Gender", "WhitneyHouston_female.jpg"), Gender = Gender.Female }, @@ -1096,6 +1726,103 @@ public void PredictGender() } } + [Fact] + public void PredictGenderRepeat() + { + if (!File.Exists(this._GenderEstimatorModelFile)) + return; + + try + { + using (var estimator = new SimpleGenderEstimator(this._GenderEstimatorModelFile)) + { + this._FaceRecognition.CustomGenderEstimator = estimator; + Assert.Equal(this._FaceRecognition.CustomGenderEstimator, estimator); + + var groundTruth = new[] + { + new { Path = Path.Combine(TestImageDirectory, "Gender", "MaoAsada_female.jpg"), Gender = Gender.Female } + }; + + foreach (var gt in groundTruth) + foreach (var index in Enumerable.Range(0, 10)) + using (var image = FaceRecognition.LoadImageFile(gt.Path)) + { + var location = this._FaceRecognition.FaceLocations(image).ToArray()[0]; + var gender = this._FaceRecognition.PredictGender(image, location); + Assert.True(gt.Gender == gender, $"Failed to classify '{gt.Path}' for repeat {index + 1}"); + } + } + } + finally + { + this._FaceRecognition.CustomGenderEstimator = null; + } + } + + [Fact] + public void PredictGenderException() + { + try + { + new SimpleGenderEstimator("not_found"); + Assert.True(false, $"{nameof(SimpleGenderEstimator)} method should throw exception."); + } + catch (FileNotFoundException) + { + } + + try + { + this._FaceRecognition.PredictGender(null, new Location(0, 0, 0, 0)); + Assert.True(false, $"{nameof(PredictGender)} method should throw {nameof(ArgumentNullException)}."); + } + catch (ArgumentNullException) + { + } + + try + { + using (var bmp = new Bitmap(100, 100)) + using (var image = FaceRecognition.LoadImage(bmp)) + this._FaceRecognition.PredictGender(image, null); + Assert.True(false, $"{nameof(PredictGender)} method should throw {nameof(ArgumentNullException)}."); + } + catch (ArgumentNullException) + { + } + + try + { + using (var bmp = new Bitmap(100, 100)) + using (var image = FaceRecognition.LoadImage(bmp)) + this._FaceRecognition.PredictGender(image, new Location(0, 0, 0, 0)); + Assert.True(false, $"{nameof(PredictGender)} method should throw {nameof(NotSupportedException)}."); + } + catch (NotSupportedException) + { + } + + if (!File.Exists(this._GenderEstimatorModelFile)) + return; + + try + { + using (var bmp = new Bitmap(100, 100)) + using (var image = FaceRecognition.LoadImage(bmp)) + using (var estimator = new SimpleGenderEstimator(this._GenderEstimatorModelFile)) + { + this._FaceRecognition.CustomGenderEstimator = estimator; + estimator.Dispose(); + this._FaceRecognition.PredictGender(image, new Location(0, 0, 0, 0)); + } + Assert.True(false, $"{nameof(PredictGender)} method should throw {nameof(ObjectDisposedException)}."); + } + catch (ObjectDisposedException) + { + } + } + [Fact] public void PredictProbabilityAge() { @@ -1107,6 +1834,7 @@ public void PredictProbabilityAge() using (var estimator = new SimpleAgeEstimator(this._AgeEstimatorModelFile)) { this._FaceRecognition.CustomAgeEstimator = estimator; + Assert.Equal(this._FaceRecognition.CustomAgeEstimator, estimator); // 0: (0, 2) // 1: (4, 6) @@ -1143,6 +1871,102 @@ public void PredictProbabilityAge() } } + [Fact] + public void PredictProbabilityAgeRepeat() + { + if (!File.Exists(this._AgeEstimatorModelFile)) + return; + + try + { + using (var estimator = new SimpleAgeEstimator(this._AgeEstimatorModelFile)) + { + this._FaceRecognition.CustomAgeEstimator = estimator; + Assert.Equal(this._FaceRecognition.CustomAgeEstimator, estimator); + + var list = new List>(); + foreach (var index in Enumerable.Range(0, 10)) + using (var image = FaceRecognition.LoadImageFile(Path.Combine(TestImageDirectory, "Age", "MaoAsada_2014_24.jpg"))) + { + var location = this._FaceRecognition.FaceLocations(image).ToArray()[0]; + var probability = this._FaceRecognition.PredictProbabilityAge(image, location); + list.Add(probability); + } + + var first = list.First(); + foreach (var results in list) + { + var keys1 = first.Keys; + foreach (var key in keys1) + { + var value1 = first[key]; + var value2 = results[key]; + Assert.True(Math.Abs(value1 - value2) < float.Epsilon, "Estimator should return same results"); + } + } + } + } + finally + { + this._FaceRecognition.CustomAgeEstimator = null; + } + } + + [Fact] + public void PredictProbabilityAgeException() + { + + try + { + this._FaceRecognition.PredictProbabilityAge(null, new Location(0, 0, 0, 0)); + Assert.True(false, $"{nameof(PredictProbabilityAge)} method should throw {nameof(ArgumentNullException)}."); + } + catch (ArgumentNullException) + { + } + + try + { + using (var bmp = new Bitmap(100, 100)) + using (var image = FaceRecognition.LoadImage(bmp)) + this._FaceRecognition.PredictProbabilityAge(image, null); + Assert.True(false, $"{nameof(PredictProbabilityAge)} method should throw {nameof(ArgumentNullException)}."); + } + catch (ArgumentNullException) + { + } + + try + { + using (var bmp = new Bitmap(100, 100)) + using (var image = FaceRecognition.LoadImage(bmp)) + this._FaceRecognition.PredictProbabilityAge(image, new Location(0, 0, 0, 0)); + Assert.True(false, $"{nameof(PredictProbabilityAge)} method should throw {nameof(NotSupportedException)}."); + } + catch (NotSupportedException) + { + } + + if (!File.Exists(this._AgeEstimatorModelFile)) + return; + + try + { + using (var bmp = new Bitmap(100, 100)) + using (var image = FaceRecognition.LoadImage(bmp)) + using (var estimator = new SimpleAgeEstimator(this._AgeEstimatorModelFile)) + { + this._FaceRecognition.CustomAgeEstimator = estimator; + estimator.Dispose(); + this._FaceRecognition.PredictProbabilityAge(image, new Location(0, 0, 0, 0)); + } + Assert.True(false, $"{nameof(PredictProbabilityAge)} method should throw {nameof(ObjectDisposedException)}."); + } + catch (ObjectDisposedException) + { + } + } + [Fact] public void PredictProbabilityGender() { @@ -1154,11 +1978,12 @@ public void PredictProbabilityGender() using (var estimator = new SimpleGenderEstimator(this._GenderEstimatorModelFile)) { this._FaceRecognition.CustomGenderEstimator = estimator; + Assert.Equal(this._FaceRecognition.CustomGenderEstimator, estimator); var groundTruth = new[] { new {Path = Path.Combine(TestImageDirectory, "Gender", "BarackObama_male.jpg"), Gender = Gender.Male}, - new {Path = Path.Combine(TestImageDirectory, "Gender", "DianaPrincessOfWales_female.jpg"), Gender = Gender.Female}, + //new {Path = Path.Combine(TestImageDirectory, "Gender", "DianaPrincessOfWales_female.jpg"), Gender = Gender.Female}, new {Path = Path.Combine(TestImageDirectory, "Gender", "MaoAsada_female.jpg"), Gender = Gender.Female}, new {Path = Path.Combine(TestImageDirectory, "Gender", "ShinzoAbe_male.jpg"), Gender = Gender.Male}, new {Path = Path.Combine(TestImageDirectory, "Gender", "WhitneyHouston_female.jpg"), Gender = Gender.Female}, @@ -1182,6 +2007,107 @@ public void PredictProbabilityGender() } } + [Fact] + public void PredictProbabilityGenderRepeat() + { + if (!File.Exists(this._GenderEstimatorModelFile)) + return; + + try + { + using (var estimator = new SimpleGenderEstimator(this._GenderEstimatorModelFile)) + { + this._FaceRecognition.CustomGenderEstimator = estimator; + Assert.Equal(this._FaceRecognition.CustomGenderEstimator, estimator); + + var groundTruth = new[] + { + new {Path = Path.Combine(TestImageDirectory, "Gender", "MaoAsada_female.jpg") } + }; + + var list = new List>(); + foreach (var gt in groundTruth) + foreach (var index in Enumerable.Range(0, 10)) + using (var image = FaceRecognition.LoadImageFile(gt.Path)) + { + var location = this._FaceRecognition.FaceLocations(image).ToArray()[0]; + var probability = this._FaceRecognition.PredictProbabilityGender(image, location); + list.Add(probability); + } + + var first = list.First(); + foreach (var results in list) + { + var keys1 = first.Keys; + foreach (var key in keys1) + { + var value1 = first[key]; + var value2 = results[key]; + Assert.True(Math.Abs(value1 - value2) < float.Epsilon, "Estimator should return same results"); + } + } + } + } + finally + { + this._FaceRecognition.CustomGenderEstimator = null; + } + } + + [Fact] + public void PredictProbabilityGenderException() + { + try + { + this._FaceRecognition.PredictProbabilityGender(null, new Location(0, 0, 0, 0)); + Assert.True(false, $"{nameof(PredictProbabilityGender)} method should throw {nameof(ArgumentNullException)}."); + } + catch (ArgumentNullException) + { + } + + try + { + using (var bmp = new Bitmap(100, 100)) + using (var image = FaceRecognition.LoadImage(bmp)) + this._FaceRecognition.PredictProbabilityGender(image, null); + Assert.True(false, $"{nameof(PredictProbabilityGender)} method should throw {nameof(ArgumentNullException)}."); + } + catch (ArgumentNullException) + { + } + + try + { + using (var bmp = new Bitmap(100, 100)) + using (var image = FaceRecognition.LoadImage(bmp)) + this._FaceRecognition.PredictProbabilityGender(image, new Location(0, 0, 0, 0)); + Assert.True(false, $"{nameof(PredictProbabilityGender)} method should throw {nameof(NotSupportedException)}."); + } + catch (NotSupportedException) + { + } + + if (!File.Exists(this._GenderEstimatorModelFile)) + return; + + try + { + using (var bmp = new Bitmap(100, 100)) + using (var image = FaceRecognition.LoadImage(bmp)) + using (var estimator = new SimpleGenderEstimator(this._GenderEstimatorModelFile)) + { + this._FaceRecognition.CustomGenderEstimator = estimator; + estimator.Dispose(); + this._FaceRecognition.PredictProbabilityGender(image, new Location(0, 0, 0, 0)); + } + Assert.True(false, $"{nameof(PredictProbabilityGender)} method should throw {nameof(ObjectDisposedException)}."); + } + catch (ObjectDisposedException) + { + } + } + [Fact] public void PredictHeadPose() { @@ -1201,6 +2127,7 @@ public void PredictHeadPose() this._YawEstimateorModelFile)) { this._FaceRecognition.CustomHeadPoseEstimator = estimator; + Assert.Equal(this._FaceRecognition.CustomHeadPoseEstimator, estimator); const int pointSize = 2; const double diff = 20.00; @@ -1249,6 +2176,82 @@ public void PredictHeadPose() } } + [Fact] + public void PredictHeadPoseException() + { + if (!File.Exists(this._RollEstimateorModelFile)) + return; + if (!File.Exists(this._PitchEstimateorModelFile)) + return; + if (!File.Exists(this._YawEstimateorModelFile)) + return; + + try + { + new SimpleHeadPoseEstimator("not_found", this._PitchEstimateorModelFile, this._YawEstimateorModelFile); + Assert.True(false, $"{nameof(SimpleHeadPoseEstimator)} method should throw exception."); + } + catch (FileNotFoundException) + { + } + + try + { + new SimpleHeadPoseEstimator(this._RollEstimateorModelFile, null, this._YawEstimateorModelFile); + Assert.True(false, $"{nameof(SimpleHeadPoseEstimator)} method should throw exception."); + } + catch (FileNotFoundException) + { + } + + try + { + new SimpleHeadPoseEstimator(this._RollEstimateorModelFile, this._PitchEstimateorModelFile, null); + Assert.True(false, $"{nameof(SimpleHeadPoseEstimator)} method should throw exception."); + } + catch (FileNotFoundException) + { + } + + try + { + this._FaceRecognition.PredictHeadPose(null); + Assert.True(false, $"{nameof(PredictHeadPose)} method should throw {nameof(ArgumentNullException)}."); + } + catch (ArgumentNullException) + { + } + + var parts = new Dictionary>(); + + try + { + using (var bmp = new Bitmap(100, 100)) + using (var image = FaceRecognition.LoadImage(bmp)) + this._FaceRecognition.PredictHeadPose(parts); + Assert.True(false, $"{nameof(PredictHeadPose)} method should throw {nameof(NotSupportedException)}."); + } + catch (NotSupportedException) + { + } + + try + { + using (var bmp = new Bitmap(100, 100)) + using (var image = FaceRecognition.LoadImage(bmp)) + using (var estimator = new SimpleHeadPoseEstimator(this._RollEstimateorModelFile, this._PitchEstimateorModelFile, this._YawEstimateorModelFile)) + { + this._FaceRecognition.CustomHeadPoseEstimator = estimator; + estimator.Dispose(); + this._FaceRecognition.PredictHeadPose(parts); + } + Assert.True(false, $"{nameof(PredictHeadPose)} method should throw {nameof(ObjectDisposedException)}."); + } + catch (ObjectDisposedException) + { + } + } + [Fact] public void TestBatchedFaceLocations() { @@ -1456,7 +2459,7 @@ public void TestCompareFacesEmptyLists() { var encoding = this._FaceRecognition.FaceEncodings(img).ToArray()[0]; - // empty list + // empty list var facesToCompare = new FaceEncoding[0]; var matchResult = FaceRecognition.CompareFaces(facesToCompare, encoding).ToArray(); @@ -1619,7 +2622,7 @@ public void TestFaceDistanceEmptyLists() { var encoding = this._FaceRecognition.FaceEncodings(img).ToArray()[0]; - // empty list + // empty list var facesToCompare = new FaceEncoding[0]; var distanceResult = FaceRecognition.FaceDistances(facesToCompare, encoding).ToArray(); @@ -1750,8 +2753,8 @@ public void TestLoadImageFile() [Fact] public void TestLoadBitmap() { - Location mono = null; - Location color = null; + Location mono; + Location color; using (var img = FaceRecognition.LoadImageFile(Path.Combine(TestImageDirectory, "obama_8bppIndexed.bmp"), Mode.Greyscale)) mono = this._FaceRecognition.FaceLocations(img).ToArray().FirstOrDefault(); using (var img = FaceRecognition.LoadImageFile(Path.Combine(TestImageDirectory, "obama_24bppRgb.bmp"))) @@ -1761,18 +2764,19 @@ public void TestLoadBitmap() { new { Action = new Func(() => (Bitmap)System.Drawing.Image.FromFile(Path.Combine(TestImageDirectory, "obama_8bppIndexed.bmp"))), Format = PixelFormat.Format8bppIndexed, Expect = mono }, new { Action = new Func(() => (Bitmap)System.Drawing.Image.FromFile(Path.Combine(TestImageDirectory, "obama_24bppRgb.bmp"))), Format = PixelFormat.Format24bppRgb, Expect = color }, - new { Action = new Func(() => (Bitmap)System.Drawing.Image.FromFile(Path.Combine(TestImageDirectory, "obama_32bppArgb.bmp"))), Format = PixelFormat.Format32bppArgb, Expect = color }, - new { Action = new Func(() => - { - using(var tmp = (Bitmap)System.Drawing.Image.FromFile(Path.Combine(TestImageDirectory, "obama_32bppArgb.bmp"))) - { - var bitmap = new Bitmap(tmp.Width,tmp.Height,PixelFormat.Format32bppRgb ); - var rect = new System.Drawing.Rectangle(System.Drawing.Point.Empty, tmp.Size); - using(var g = Graphics.FromImage(bitmap)) - g.DrawImage(tmp, rect,rect, GraphicsUnit.Pixel); - return bitmap; - } - }), Format = PixelFormat.Format32bppRgb, Expect = color } + // linux looks like to not support loading 32Argb + // new { Action = new Func(() => (Bitmap)System.Drawing.Image.FromFile(Path.Combine(TestImageDirectory, "obama_32bppArgb.bmp"))), Format = PixelFormat.Format32bppArgb, Expect = color }, + // new { Action = new Func(() => + // { + // using(var tmp = (Bitmap)System.Drawing.Image.FromFile(Path.Combine(TestImageDirectory, "obama_32bppArgb.bmp"))) + // { + // var bitmap = new Bitmap(tmp.Width,tmp.Height,PixelFormat.Format32bppRgb ); + // var rect = new System.Drawing.Rectangle(System.Drawing.Point.Empty, tmp.Size); + // using(var g = Graphics.FromImage(bitmap)) + // g.DrawImage(tmp, rect,rect, GraphicsUnit.Pixel); + // return bitmap; + // } + // }), Format = PixelFormat.Format32bppRgb, Expect = color } }; foreach (var target in targets) { @@ -1898,7 +2902,7 @@ public void TestRawFaceLocationsBatched() } } - #region Helpers + #region Helpers private static bool AssertAlmostEqual(int actual, int expected, int delta) { @@ -1942,6 +2946,7 @@ private void EyeBlinkDetect(EyeBlinkDetector eyeBlinkDetector, PredictorModel mo try { this._FaceRecognition.CustomEyeBlinkDetector = eyeBlinkDetector; + Assert.Equal(this._FaceRecognition.CustomEyeBlinkDetector, eyeBlinkDetector); var groundTruth = new[] { @@ -2065,10 +3070,10 @@ private void FaceLocation(string testName, int numberOfTimesToUpsample, Model mo } } - private IEnumerable RawFaceLandmarks(Image img, IEnumerable faceLocations = null, PredictorModel model = PredictorModel.Large) + private IEnumerable RawFaceLandmarks(Image img, IEnumerable faceLocations = null, PredictorModel predictorModel = PredictorModel.Large) { var method = this._FaceRecognition.GetType().GetMethod("RawFaceLandmarks", BindingFlags.Instance | BindingFlags.NonPublic); - return method.Invoke(this._FaceRecognition, new object[] { img, faceLocations, model }) as IEnumerable; + return method.Invoke(this._FaceRecognition, new object[] { img, faceLocations, predictorModel, Model.Hog }) as IEnumerable; } private IEnumerable RawFaceLocations(Image img, int numberOfTimesToUpsample = 1, Model model = Model.Hog) @@ -2117,7 +3122,7 @@ private void Dispose(bool disposing) { var array = this.ModelFiles.ToArray(); - // Remove all files + // Remove all files foreach (var file in array) { var path = Path.Combine(ModelTempDirectory, file); diff --git a/test/FaceRecognitionDotNet.Tests/HeadPoseTest.cs b/test/FaceRecognitionDotNet.Tests/HeadPoseTest.cs new file mode 100644 index 0000000..44b7830 --- /dev/null +++ b/test/FaceRecognitionDotNet.Tests/HeadPoseTest.cs @@ -0,0 +1,85 @@ +using System; +using System.Collections.Generic; +using Xunit; + +namespace FaceRecognitionDotNet.Tests +{ + + public class HeadPoseTest + { + + [Fact] + public void Equal() + { + var pose1 = new HeadPose(10, 20, 9); + var pose2 = new HeadPose(10, 20, 9); + Assert.Equal(pose1, pose2); + Assert.True(pose1 == pose2); + Assert.True(pose1.Equals(pose2)); + Assert.False(pose1 != pose2); + } + + [Fact] + public void NotEqual1() + { + var pose1 = new HeadPose(10, 20, 9); + var pose2 = new HeadPose(40, 20, 9); + Assert.NotEqual(pose1, pose2); + Assert.True(pose1 != pose2); + Assert.True(!pose1.Equals(pose2)); + Assert.False(pose1 == pose2); + } + + [Fact] + public void NotEqual2() + { + var pose1 = new HeadPose(40, 10, 9); + var pose2 = new HeadPose(40, 20, 9); + Assert.NotEqual(pose1, pose2); + Assert.True(pose1 != pose2); + Assert.True(!pose1.Equals(pose2)); + Assert.False(pose1 == pose2); + } + + [Fact] + public void NotEqual3() + { + var pose1 = new HeadPose(40, 20, 9); + var pose2 = new HeadPose(40, 20, 0); + Assert.NotEqual(pose1, pose2); + Assert.True(pose1 != pose2); + Assert.True(!pose1.Equals(pose2)); + Assert.False(pose1 == pose2); + } + + [Fact] + public void Hash() + { + var pose1 = new HeadPose(40, 20, 9); + var pose2 = new HeadPose(40, 20, 0); + + var dictionary = new Dictionary(); + dictionary.Add(pose1, dictionary.Count); + + try + { + dictionary.Add(pose2, dictionary.Count); + } + catch + { + Assert.True(false, $"{typeof(HeadPose)} must not throw exception."); + } + + try + { + dictionary.Add(pose2, dictionary.Count); + Assert.True(false, $"{typeof(HeadPose)} must throw exception because key is duplicate."); + } + catch (ArgumentException) + { + } + } + + } + +} \ No newline at end of file diff --git a/test/FaceRecognitionDotNet.Tests/ImageTest.cs b/test/FaceRecognitionDotNet.Tests/ImageTest.cs index 808d777..70c722c 100644 --- a/test/FaceRecognitionDotNet.Tests/ImageTest.cs +++ b/test/FaceRecognitionDotNet.Tests/ImageTest.cs @@ -1,3 +1,4 @@ +using System; using System.IO; using Xunit; @@ -30,7 +31,8 @@ public void Save() using (var img = FaceRecognition.LoadImageFile(Path.Combine(TestImageDirectory, "obama.jpg"))) { var directory = Path.Combine(ResultDirectory, testName); - Directory.CreateDirectory(directory); + if (Directory.Exists((directory))) + Directory.Delete(directory, true); foreach (var target in targets) { @@ -40,6 +42,38 @@ public void Save() } } + [Fact] + public void SaveException() + { + const string testName = nameof(this.SaveException); + + var targets = new[] + { + new { Name = "saved.bmp", Format = ImageFormat.Bmp }, + new { Name = "saved.jpg", Format = ImageFormat.Jpeg }, + new { Name = "saved.png", Format = ImageFormat.Png }, + }; + + using (var img = FaceRecognition.LoadImageFile(Path.Combine(TestImageDirectory, "obama.jpg"))) + { + var directory = Path.Combine(ResultDirectory, testName); + if (Directory.Exists((directory))) + Directory.Delete(directory, true); + + foreach (var target in targets) + { + try + { + img.Save(null, target.Format); + Assert.True(false, $"{nameof(img.Save)} method should throw exception."); + } + catch (ArgumentNullException) + { + } + } + } + } + } } \ No newline at end of file diff --git a/test/FaceRecognitionDotNet.Tests/LocationTest.cs b/test/FaceRecognitionDotNet.Tests/LocationTest.cs index 3e2d882..3550cc9 100644 --- a/test/FaceRecognitionDotNet.Tests/LocationTest.cs +++ b/test/FaceRecognitionDotNet.Tests/LocationTest.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using Xunit; @@ -13,6 +14,7 @@ public void Equal() var location1 = new Location(10, 20, 30, 40); var location2 = new Location(10, 20, 30, 40); Assert.Equal(location1, location2); + Assert.True(location1.Equals(location2)); } [Fact] @@ -21,6 +23,7 @@ public void NotEqual() var location1 = new Location(10, 20, 30, 40); var location2 = new Location(40, 10, 20, 30); Assert.NotEqual(location1, location2); + Assert.True(!location1.Equals(location2)); } [Fact] @@ -46,7 +49,7 @@ public void Hash() dictionary.Add(location2, dictionary.Count); Assert.True(false, $"{typeof(Location)} must throw exception because key is duplicate."); } - catch + catch (ArgumentException) { } } diff --git a/test/FaceRecognitionDotNet.Tests/PointTest.cs b/test/FaceRecognitionDotNet.Tests/PointTest.cs index 5f1f11b..36c3fa6 100644 --- a/test/FaceRecognitionDotNet.Tests/PointTest.cs +++ b/test/FaceRecognitionDotNet.Tests/PointTest.cs @@ -1,5 +1,5 @@ +using System; using System.Collections.Generic; -using System.Drawing; using Xunit; namespace FaceRecognitionDotNet.Tests @@ -15,6 +15,7 @@ public void Equal() var point2 = new Point(10, 20); Assert.Equal(point1, point2); Assert.True(point1 == point2); + Assert.True(point1.Equals(point2)); Assert.False(point1 != point2); } @@ -25,6 +26,7 @@ public void NotEqual() var point2 = new Point(40, 10); Assert.NotEqual(point1, point2); Assert.True(point1 != point2); + Assert.True(!point1.Equals(point2)); Assert.False(point1 == point2); } @@ -51,7 +53,7 @@ public void Hash() dictionary.Add(point2, dictionary.Count); Assert.True(false, $"{typeof(Point)} must throw exception because key is duplicate."); } - catch + catch (ArgumentException) { } } diff --git a/tools/AgeTraining/Program.cs b/tools/AgeTraining/Program.cs index e2bae03..339a709 100644 --- a/tools/AgeTraining/Program.cs +++ b/tools/AgeTraining/Program.cs @@ -9,7 +9,6 @@ using DlibDotNet; using DlibDotNet.Dnn; using Microsoft.Extensions.CommandLineUtils; -using Dlib = DlibDotNet.Dlib; namespace AgeTraining { diff --git a/tools/GenderTraining/Program.cs b/tools/GenderTraining/Program.cs index bb1144f..5ad6425 100644 --- a/tools/GenderTraining/Program.cs +++ b/tools/GenderTraining/Program.cs @@ -8,7 +8,6 @@ using DlibDotNet; using DlibDotNet.Dnn; using Microsoft.Extensions.CommandLineUtils; -using Dlib = DlibDotNet.Dlib; namespace GenderTraining { diff --git a/tools/HelenTraining/Program.cs b/tools/HelenTraining/Program.cs index 81154c4..86e4ab2 100644 --- a/tools/HelenTraining/Program.cs +++ b/tools/HelenTraining/Program.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Drawing; -using System.Drawing.Imaging; using System.Globalization; using System.IO; using System.IO.Compression;