Skip to content

Commit c49143a

Browse files
takuya-takeuchitakuya-takeuchi
committed
Merge branch 'release/1.2.3.14'
2 parents 1d99e43 + c4391aa commit c49143a

File tree

192 files changed

+7503
-557
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+7503
-557
lines changed

‎CONTRIBUTING.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
## Reporting Issues
2+
3+
### Before submitting a issue
4+
5+
- Please check that if is already reported
6+
- Please check whether your issue can be resolved by wiki
7+
8+
### How to submit a issue report
9+
10+
- Please follow the issue template as possible
11+
- Especially, please write your environmental and package name.
12+
13+
## Pull Requests
14+
15+
- Please follow pull request template as possible
16+
- Please select target branch to "develop" branch.

‎ExecuteTest.ps1‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,9 @@ if ([string]::IsNullOrEmpty($token))
1111

1212
Write-Host "Environmental Value 'CODECOV_TOKEN' is ${token}." -ForegroundColor Green
1313

14-
$Current = Get-Location
15-
$CoverageDir = Join-Path $Current CoverageResults
16-
if (!(Test-Path "$CoverageDir"))
17-
{
18-
New-Item "$CoverageDir" -ItemType Directory > $null
19-
}
20-
2114
# install coverlet
2215
dotnet tool install --global coverlet.console --version $CoverletVersion > $null
16+
dotnet add test\FaceRecognitionDotNet.Tests\FaceRecognitionDotNet.Tests.csproj package coverlet.msbuild > $null
2317
# install codecov but it is not used from test project
2418
dotnet add test\FaceRecognitionDotNet.Tests\FaceRecognitionDotNet.Tests.csproj package Codecov --version $CodecovVersion > $null
2519

‎FaceRecognitionDotNet.sln‎

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27703.2000
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29806.167
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2F845E5F-E6B9-46D5-B5D8-52BEE4B463F0}"
77
EndProject
@@ -11,8 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DlibDotNet", "src\DlibDotNe
1111
EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{501D0145-416F-42A7-B636-02A4F783C97C}"
1313
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FaceRecognitionDotNet.Tests", "test\FaceRecognitionDotNet.Tests\FaceRecognitionDotNet.Tests.csproj", "{EB355E8B-8070-4221-9CB9-7BD0655DC9A8}"
15-
EndProject
1614
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{FEEAC07F-70D7-4C12-B92C-153CEE0F2539}"
1715
EndProject
1816
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FaceEncodingPerformance", "examples\FaceEncodingPerformance\FaceEncodingPerformance.csproj", "{D0CB4212-16D2-4DE5-8A26-83AF5E24C7D3}"
@@ -27,6 +25,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelenTraining", "examples\H
2725
EndProject
2826
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FindFacesInBatches", "examples\FindFacesInBatches\FindFacesInBatches.csproj", "{5F7CB2DF-54E3-461F-9FA9-F8B4BAFC54AC}"
2927
EndProject
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GenderTraining", "examples\GenderTraining\GenderTraining.csproj", "{EAB3D0C4-D2E0-4F6A-A663-041B5584FF1F}"
29+
EndProject
30+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgeTraining", "examples\AgeTraining\AgeTraining.csproj", "{8595BAC7-7EEC-49E6-9D78-01AFB15A30FD}"
31+
EndProject
32+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FaceRecognitionDotNet.Tests", "test\FaceRecognitionDotNet.Tests\FaceRecognitionDotNet.Tests.csproj", "{28A36B74-6D83-47B4-9AD6-A252902DBC99}"
33+
EndProject
34+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomClassificationDemo", "examples\CustomClassificationDemo\CustomClassificationDemo.csproj", "{F4092804-340D-4553-B9E5-7C6555D317B7}"
35+
EndProject
3036
Global
3137
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3238
Debug|Any CPU = Debug|Any CPU
@@ -41,10 +47,6 @@ Global
4147
{BC72B97F-9631-4550-8DAC-5F96FF7DE9EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
4248
{BC72B97F-9631-4550-8DAC-5F96FF7DE9EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
4349
{BC72B97F-9631-4550-8DAC-5F96FF7DE9EB}.Release|Any CPU.Build.0 = Release|Any CPU
44-
{EB355E8B-8070-4221-9CB9-7BD0655DC9A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45-
{EB355E8B-8070-4221-9CB9-7BD0655DC9A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
46-
{EB355E8B-8070-4221-9CB9-7BD0655DC9A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
47-
{EB355E8B-8070-4221-9CB9-7BD0655DC9A8}.Release|Any CPU.Build.0 = Release|Any CPU
4850
{D0CB4212-16D2-4DE5-8A26-83AF5E24C7D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4951
{D0CB4212-16D2-4DE5-8A26-83AF5E24C7D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
5052
{D0CB4212-16D2-4DE5-8A26-83AF5E24C7D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -69,20 +71,39 @@ Global
6971
{5F7CB2DF-54E3-461F-9FA9-F8B4BAFC54AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
7072
{5F7CB2DF-54E3-461F-9FA9-F8B4BAFC54AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
7173
{5F7CB2DF-54E3-461F-9FA9-F8B4BAFC54AC}.Release|Any CPU.Build.0 = Release|Any CPU
74+
{EAB3D0C4-D2E0-4F6A-A663-041B5584FF1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
75+
{EAB3D0C4-D2E0-4F6A-A663-041B5584FF1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
76+
{EAB3D0C4-D2E0-4F6A-A663-041B5584FF1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
77+
{EAB3D0C4-D2E0-4F6A-A663-041B5584FF1F}.Release|Any CPU.Build.0 = Release|Any CPU
78+
{8595BAC7-7EEC-49E6-9D78-01AFB15A30FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
79+
{8595BAC7-7EEC-49E6-9D78-01AFB15A30FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
80+
{8595BAC7-7EEC-49E6-9D78-01AFB15A30FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
81+
{8595BAC7-7EEC-49E6-9D78-01AFB15A30FD}.Release|Any CPU.Build.0 = Release|Any CPU
82+
{28A36B74-6D83-47B4-9AD6-A252902DBC99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
83+
{28A36B74-6D83-47B4-9AD6-A252902DBC99}.Debug|Any CPU.Build.0 = Debug|Any CPU
84+
{28A36B74-6D83-47B4-9AD6-A252902DBC99}.Release|Any CPU.ActiveCfg = Release|Any CPU
85+
{28A36B74-6D83-47B4-9AD6-A252902DBC99}.Release|Any CPU.Build.0 = Release|Any CPU
86+
{F4092804-340D-4553-B9E5-7C6555D317B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
87+
{F4092804-340D-4553-B9E5-7C6555D317B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
88+
{F4092804-340D-4553-B9E5-7C6555D317B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
89+
{F4092804-340D-4553-B9E5-7C6555D317B7}.Release|Any CPU.Build.0 = Release|Any CPU
7290
EndGlobalSection
7391
GlobalSection(SolutionProperties) = preSolution
7492
HideSolutionNode = FALSE
7593
EndGlobalSection
7694
GlobalSection(NestedProjects) = preSolution
7795
{85AB4F26-48B7-4A21-A6C7-14EA6608B539} = {2F845E5F-E6B9-46D5-B5D8-52BEE4B463F0}
7896
{BC72B97F-9631-4550-8DAC-5F96FF7DE9EB} = {2F845E5F-E6B9-46D5-B5D8-52BEE4B463F0}
79-
{EB355E8B-8070-4221-9CB9-7BD0655DC9A8} = {501D0145-416F-42A7-B636-02A4F783C97C}
8097
{D0CB4212-16D2-4DE5-8A26-83AF5E24C7D3} = {FEEAC07F-70D7-4C12-B92C-153CEE0F2539}
8198
{32599FBF-8E91-43BA-B0B6-38E3C7A02530} = {FEEAC07F-70D7-4C12-B92C-153CEE0F2539}
8299
{49ED9EF1-7E3E-4959-B152-52545B973906} = {FEEAC07F-70D7-4C12-B92C-153CEE0F2539}
83100
{3F6F21E5-DEF8-4F1A-BE8F-741A35B528D1} = {FEEAC07F-70D7-4C12-B92C-153CEE0F2539}
84101
{FCCD585F-1D3E-4AFB-9644-DAEC7B8CA6C4} = {FEEAC07F-70D7-4C12-B92C-153CEE0F2539}
85102
{5F7CB2DF-54E3-461F-9FA9-F8B4BAFC54AC} = {FEEAC07F-70D7-4C12-B92C-153CEE0F2539}
103+
{EAB3D0C4-D2E0-4F6A-A663-041B5584FF1F} = {FEEAC07F-70D7-4C12-B92C-153CEE0F2539}
104+
{8595BAC7-7EEC-49E6-9D78-01AFB15A30FD} = {FEEAC07F-70D7-4C12-B92C-153CEE0F2539}
105+
{28A36B74-6D83-47B4-9AD6-A252902DBC99} = {501D0145-416F-42A7-B636-02A4F783C97C}
106+
{F4092804-340D-4553-B9E5-7C6555D317B7} = {FEEAC07F-70D7-4C12-B92C-153CEE0F2539}
86107
EndGlobalSection
87108
GlobalSection(ExtensibilityGlobals) = postSolution
88109
SolutionGuid = {4D44C572-D749-4A76-A199-8C598A08AE8A}

‎LICENSE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2018-2019 Takuya Takeuchi
3+
Copyright (c) 2018-2020 Takuya Takeuchi
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md‎

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# ![Alt text](nuget/face48.png "FaceRecognition.Net") FaceRecognition.Net [![GitHub license](https://img.shields.io/github/license/mashape/apistatus.svg)]() [![codecov](https://codecov.io/gh/takuya-takeuchi/FaceRecognitionDotNet/branch/master/graph/badge.svg)](https://codecov.io/gh/takuya-takeuchi/FaceRecognitionDotNet)
1+
# ![Alt text](nuget/face48.png "FaceRecognitionDotNet") FaceRecognitionDotNet [![GitHub license](https://img.shields.io/github/license/mashape/apistatus.svg)]() [![codecov](https://codecov.io/gh/takuya-takeuchi/FaceRecognitionDotNet/branch/master/graph/badge.svg)](https://codecov.io/gh/takuya-takeuchi/FaceRecognitionDotNet)
22

33
The world's simplest facial recognition api for .NET
44
This repository is porting https://github.com/ageitgey/face_recognition by C#.
@@ -28,23 +28,48 @@ This package supports cross platform, Windows, Linux and MacOSX!!
2828

2929
##### :warning: FaceRecognitionDotNet for ARM is not tested yet
3030

31+
## Support API
32+
33+
|face_recognition API|Corresponding API|Note|
34+
|----|----|:----|
35+
|batch_face_locations|BatchFaceLocations||
36+
|compare_faces|CompareFaces||
37+
|face_distance|FaceDistance||
38+
|face_encodings|FaceEncodings||
39+
|face_landmarks|FaceLandmarks|And support **Helen dataset** :warning:|
40+
|face_locations|FaceLocations||
41+
|load_image_file|LoadImageFile||
42+
|-|LoadImage|From memory data|
43+
|-|PredictAge|Use **Adience Benchmark Of Unfiltered Faces For Gender And Age Classification dataset** :warning:|
44+
|-|PredictGender|Use **UTKFace dataset** :warning:|
45+
|-|PredictProbabilityAge|Use **Adience Benchmark Of Unfiltered Faces For Gender And Age Classification dataset** :warning:|
46+
|-|PredictProbabilityGender|Use **UTKFace dataset** :warning:|
47+
48+
##### :warning: Warning
49+
50+
You must train dataset by yourself.
51+
I will **NOT** provide pretrained model file due to avoiding license issue.
52+
You can check the following examples to train dataset.
53+
54+
* examples/AgeTraining
55+
* examples/GenderTraining
56+
* examples/HelenTraining
57+
3158
## Demo
3259

3360
#### Face Recognition
3461

35-
<img src="images/1.png"/>
62+
<img src="images/1.png" width="480"/>
3663

37-
<img src="images/2.png"/>
64+
<img src="images/2.png" width="480"/>
3865

3966
#### Face Landmark
4067

41-
<img src="images/3.jpg"/>
68+
<img src="images/3.jpg" width="240"/>
4269

43-
##### :bulb: NOTE
70+
#### Age and Gender Classification
4471

45-
The above landmark is generated by **Helen dataset**.
46-
Please check http://www.ifp.illinois.edu/~vuongle2/helen/ and create model file by **examples/HelenTraining**.
47-
I will **NOT** provide pretrained model file.
72+
<img src="examples/CustomClassificationDemo/images/result.png" width="240"/>
4873

4974
## Dependencies Libraries and Products
5075

‎examples/AgeTraining/.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Adience*/
2+
adience-age-network*
3+
shape_predictor_5_face_landmarks.dat

‎examples/AgeTraining/AgeTraining.csproj‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<Authors>Takuya Takeuchi</Authors>
7+
<Description>Example of FaceRecognitionDotNet</Description>
8+
<Company />
9+
<Configurations>Debug;Release</Configurations>
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<Compile Include="..\..\src\FaceRecognitionDotNet\PInvoke\Dnn\AgeClassification\Loss\LossMulticlassLog.cs" Link="LossMulticlassLog.cs" />
14+
</ItemGroup>
15+
16+
<ItemGroup>
17+
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
18+
</ItemGroup>
19+
20+
<ItemGroup>
21+
<ProjectReference Include="..\..\src\DlibDotNet\src\DlibDotNet\DlibDotNet.csproj" />
22+
</ItemGroup>
23+
24+
</Project>

0 commit comments

Comments
 (0)