Skip to content

Commit 23c8d57

Browse files
takuya-takeuchitakuya-takeuchi
committed
Merge branch 'release/1.2.3.12'
2 parents 2f06195 + d500cf8 commit 23c8d57

34 files changed

+946
-17
lines changed

‎DlibDotNet‎

Submodule DlibDotNet updated 693 files

‎ExecuteTestNuget.bat‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
set PROJECT=test\FaceRecognitionDotNet.Tests\FaceRecognitionDotNet.Tests
2+
set PACKAGECPU=FaceRecognitionDotNet
3+
set PACKAGECUDA=FaceRecognitionDotNet.CUDA92
4+
set NUGETDIR=%cd%\nuget
5+
6+
dotnet remove %PROJECT%.csproj package %PACKAGECPU%
7+
dotnet remove %PROJECT%.csproj package %PACKAGECUDA%
8+
dotnet add %PROJECT%.csproj package %PACKAGECUDA% --source "%NUGETDIR%"
9+
10+
dotnet test test\FaceRecognitionDotNet.Tests\FaceRecognitionDotNet.Tests.csproj -c Release

‎FaceRecognitionDotNet.sln‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmark", "examples\Bench
2121
EndProject
2222
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FaceDetection", "examples\FaceDetection\FaceDetection.csproj", "{49ED9EF1-7E3E-4959-B152-52545B973906}"
2323
EndProject
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenCVSharpSample", "examples\OpenCVSharpSample\OpenCVSharpSample.csproj", "{3F6F21E5-DEF8-4F1A-BE8F-741A35B528D1}"
25+
EndProject
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelenTraining", "examples\HelenTraining\HelenTraining.csproj", "{FCCD585F-1D3E-4AFB-9644-DAEC7B8CA6C4}"
27+
EndProject
2428
Global
2529
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2630
Debug|Any CPU = Debug|Any CPU
@@ -51,6 +55,14 @@ Global
5155
{49ED9EF1-7E3E-4959-B152-52545B973906}.Debug|Any CPU.Build.0 = Debug|Any CPU
5256
{49ED9EF1-7E3E-4959-B152-52545B973906}.Release|Any CPU.ActiveCfg = Release|Any CPU
5357
{49ED9EF1-7E3E-4959-B152-52545B973906}.Release|Any CPU.Build.0 = Release|Any CPU
58+
{3F6F21E5-DEF8-4F1A-BE8F-741A35B528D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
59+
{3F6F21E5-DEF8-4F1A-BE8F-741A35B528D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
60+
{3F6F21E5-DEF8-4F1A-BE8F-741A35B528D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
61+
{3F6F21E5-DEF8-4F1A-BE8F-741A35B528D1}.Release|Any CPU.Build.0 = Release|Any CPU
62+
{FCCD585F-1D3E-4AFB-9644-DAEC7B8CA6C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
63+
{FCCD585F-1D3E-4AFB-9644-DAEC7B8CA6C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
64+
{FCCD585F-1D3E-4AFB-9644-DAEC7B8CA6C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
65+
{FCCD585F-1D3E-4AFB-9644-DAEC7B8CA6C4}.Release|Any CPU.Build.0 = Release|Any CPU
5466
EndGlobalSection
5567
GlobalSection(SolutionProperties) = preSolution
5668
HideSolutionNode = FALSE
@@ -62,6 +74,8 @@ Global
6274
{D0CB4212-16D2-4DE5-8A26-83AF5E24C7D3} = {FEEAC07F-70D7-4C12-B92C-153CEE0F2539}
6375
{32599FBF-8E91-43BA-B0B6-38E3C7A02530} = {FEEAC07F-70D7-4C12-B92C-153CEE0F2539}
6476
{49ED9EF1-7E3E-4959-B152-52545B973906} = {FEEAC07F-70D7-4C12-B92C-153CEE0F2539}
77+
{3F6F21E5-DEF8-4F1A-BE8F-741A35B528D1} = {FEEAC07F-70D7-4C12-B92C-153CEE0F2539}
78+
{FCCD585F-1D3E-4AFB-9644-DAEC7B8CA6C4} = {FEEAC07F-70D7-4C12-B92C-153CEE0F2539}
6579
EndGlobalSection
6680
GlobalSection(ExtensibilityGlobals) = postSolution
6781
SolutionGuid = {4D44C572-D749-4A76-A199-8C598A08AE8A}

‎README.md‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,30 @@ This package supports cross platform, Windows, Linux and MacOSX!!
88
|Package|Windows|Linux|MacOSX|
99
|---|---|---|---|
1010
|FaceRecognitionDotNet|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet)|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet)|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet)|
11-
|FaceRecognitionDotNet With CUDA|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet-WithCUDA.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet-WithCUDA)|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet-WithCUDA.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet-WithCUDA)|N/A|
11+
|FaceRecognitionDotNet for CUDA 9.2|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.CUDA92.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet.CUDA92)|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.CUDA92.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet.CUDA92)|N/A|
12+
|FaceRecognitionDotNet for CUDA 10.0|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.CUDA100.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet.CUDA100)|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.CUDA100.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet.CUDA100)|N/A|
1213
|FaceRecognitionDotNet for ARM|N/A|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet-ARM.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet-ARM)|N/A|
1314

1415
##### :warning: FaceRecognitionDotNet for ARM is not tested yet
1516

1617
## Demo
1718

19+
#### Face Recognition
20+
1821
<img src="images/1.png"/>
1922

2023
<img src="images/2.png"/>
2124

25+
#### Face Landmark
26+
27+
<img src="images/3.jpg"/>
28+
29+
##### :bulb: NOTE
30+
31+
The above landmark is generated by **Helen dataset**.
32+
Please check http://www.ifp.illinois.edu/~vuongle2/helen/ and create model file by **examples/HelenTraining**.
33+
I will **NOT** provide pretrained model file.
34+
2235
## Dependencies Libraries and Products
2336

2437
#### [face_recognition](https://github.com/ageitgey/face_recognition/)
@@ -51,4 +64,13 @@ This package supports cross platform, Windows, Linux and MacOSX!!
5164
>
5265
> **Author:** Takuya Takeuchi
5366
>
54-
> **Principal Use:** Use dlib interface via .NET. This library is developed by this owner.
67+
> **Principal Use:** Use dlib interface via .NET. This library is developed by this owner.
68+
69+
#### [OpenCVSharp](https://github.com/shimat/opencvsharp/)
70+
71+
> **License:** The BSD 3-Clause License
72+
>
73+
> **Author:** shimat
74+
>
75+
> **Principal Use:** Loading image data by opencv wrapper for example
76+

‎examples/HelenTraining/.gitignore‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
annotation.zip
2+
helen_1.zip
3+
helen_2.zip
4+
helen_3.zip
5+
helen_4.zip
6+
helen_5.zip
7+
8+
helen/*
9+
dlib_face_recognition_resnet_model_v1.dat
10+
mmod_human_face_detector.dat
11+
shape_predictor_5_face_landmarks.dat
12+
shape_predictor_68_face_landmarks.dat
13+
14+
demo.jpg
15+
white.jpg

‎examples/HelenTraining/Box.cs‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
using System;
2+
using System.Xml.Serialization;
3+
4+
namespace HelenTraining
5+
{
6+
7+
[Serializable]
8+
public sealed class Box
9+
{
10+
11+
[XmlAttribute("top")]
12+
public int Top;
13+
14+
[XmlAttribute("left")]
15+
public int Left;
16+
17+
[XmlAttribute("width")]
18+
public int Width;
19+
20+
[XmlAttribute("height")]
21+
public int Height;
22+
23+
[XmlElement("part")]
24+
public Part[] Part;
25+
26+
}
27+
28+
}

‎examples/HelenTraining/Dataset.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
using System;
2+
using System.Xml.Serialization;
3+
4+
namespace HelenTraining
5+
{
6+
7+
[Serializable]
8+
[XmlRoot(ElementName = "dataset")]
9+
public class Dataset
10+
{
11+
12+
[XmlElement("name")]
13+
public string Name;
14+
15+
[XmlElement("comment")]
16+
public string Comment;
17+
18+
[XmlArray("images")]
19+
[XmlArrayItem("image")]
20+
public Image[] Images;
21+
22+
}
23+
24+
}

‎examples/HelenTraining/HelenTraining.csproj‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
10+
<PackageReference Include="System.Drawing.Common" Version="4.5.1" />
11+
</ItemGroup>
12+
13+
<ItemGroup>
14+
<ProjectReference Include="..\..\DlibDotNet\src\DlibDotNet\DlibDotNet.csproj" />
15+
<ProjectReference Include="..\..\src\FaceRecognitionDotNet\FaceRecognitionDotNet.csproj" />
16+
</ItemGroup>
17+
18+
</Project>

‎examples/HelenTraining/Image.cs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
using System;
2+
using System.Xml.Serialization;
3+
4+
namespace HelenTraining
5+
{
6+
7+
[Serializable]
8+
public class Image
9+
{
10+
11+
[XmlAttribute("file")]
12+
public string File;
13+
14+
[XmlElement("box")]
15+
public Box Box;
16+
17+
}
18+
19+
}

‎examples/HelenTraining/Part.cs‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
using System;
2+
using System.Xml.Serialization;
3+
4+
namespace HelenTraining
5+
{
6+
7+
[Serializable]
8+
public sealed class Part
9+
{
10+
11+
[XmlAttribute("x")]
12+
public float X;
13+
14+
[XmlAttribute("y")]
15+
public float Y;
16+
17+
[XmlAttribute("name")]
18+
public string Name;
19+
20+
}
21+
22+
}

0 commit comments

Comments
 (0)