Skip to content

Commit

Permalink
Merge branch 'release/1.2.3.12'
Browse files Browse the repository at this point in the history
  • Loading branch information
takuya-takeuchi committed May 13, 2019
2 parents 2f06195 + d500cf8 commit 23c8d57
Show file tree
Hide file tree
Showing 34 changed files with 946 additions and 17 deletions.
2 changes: 1 addition & 1 deletion DlibDotNet
Submodule DlibDotNet updated 693 files
10 changes: 10 additions & 0 deletions ExecuteTestNuget.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
set PROJECT=test\FaceRecognitionDotNet.Tests\FaceRecognitionDotNet.Tests
set PACKAGECPU=FaceRecognitionDotNet
set PACKAGECUDA=FaceRecognitionDotNet.CUDA92
set NUGETDIR=%cd%\nuget

dotnet remove %PROJECT%.csproj package %PACKAGECPU%
dotnet remove %PROJECT%.csproj package %PACKAGECUDA%
dotnet add %PROJECT%.csproj package %PACKAGECUDA% --source "%NUGETDIR%"

dotnet test test\FaceRecognitionDotNet.Tests\FaceRecognitionDotNet.Tests.csproj -c Release
14 changes: 14 additions & 0 deletions FaceRecognitionDotNet.sln
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmark", "examples\Bench
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FaceDetection", "examples\FaceDetection\FaceDetection.csproj", "{49ED9EF1-7E3E-4959-B152-52545B973906}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenCVSharpSample", "examples\OpenCVSharpSample\OpenCVSharpSample.csproj", "{3F6F21E5-DEF8-4F1A-BE8F-741A35B528D1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelenTraining", "examples\HelenTraining\HelenTraining.csproj", "{FCCD585F-1D3E-4AFB-9644-DAEC7B8CA6C4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -51,6 +55,14 @@ Global
{49ED9EF1-7E3E-4959-B152-52545B973906}.Debug|Any CPU.Build.0 = Debug|Any CPU
{49ED9EF1-7E3E-4959-B152-52545B973906}.Release|Any CPU.ActiveCfg = Release|Any CPU
{49ED9EF1-7E3E-4959-B152-52545B973906}.Release|Any CPU.Build.0 = Release|Any CPU
{3F6F21E5-DEF8-4F1A-BE8F-741A35B528D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3F6F21E5-DEF8-4F1A-BE8F-741A35B528D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3F6F21E5-DEF8-4F1A-BE8F-741A35B528D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3F6F21E5-DEF8-4F1A-BE8F-741A35B528D1}.Release|Any CPU.Build.0 = Release|Any CPU
{FCCD585F-1D3E-4AFB-9644-DAEC7B8CA6C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FCCD585F-1D3E-4AFB-9644-DAEC7B8CA6C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FCCD585F-1D3E-4AFB-9644-DAEC7B8CA6C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FCCD585F-1D3E-4AFB-9644-DAEC7B8CA6C4}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -62,6 +74,8 @@ Global
{D0CB4212-16D2-4DE5-8A26-83AF5E24C7D3} = {FEEAC07F-70D7-4C12-B92C-153CEE0F2539}
{32599FBF-8E91-43BA-B0B6-38E3C7A02530} = {FEEAC07F-70D7-4C12-B92C-153CEE0F2539}
{49ED9EF1-7E3E-4959-B152-52545B973906} = {FEEAC07F-70D7-4C12-B92C-153CEE0F2539}
{3F6F21E5-DEF8-4F1A-BE8F-741A35B528D1} = {FEEAC07F-70D7-4C12-B92C-153CEE0F2539}
{FCCD585F-1D3E-4AFB-9644-DAEC7B8CA6C4} = {FEEAC07F-70D7-4C12-B92C-153CEE0F2539}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4D44C572-D749-4A76-A199-8C598A08AE8A}
Expand Down
26 changes: 24 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,30 @@ This package supports cross platform, Windows, Linux and MacOSX!!
|Package|Windows|Linux|MacOSX|
|---|---|---|---|
|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)|
|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|
|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|
|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|
|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|

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

## Demo

#### Face Recognition

<img src="images/1.png"/>

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

#### Face Landmark

<img src="images/3.jpg"/>

##### :bulb: NOTE

The above landmark is generated by **Helen dataset**.
Please check http://www.ifp.illinois.edu/~vuongle2/helen/ and create model file by **examples/HelenTraining**.
I will **NOT** provide pretrained model file.

## Dependencies Libraries and Products

#### [face_recognition](https://github.com/ageitgey/face_recognition/)
Expand Down Expand Up @@ -51,4 +64,13 @@ This package supports cross platform, Windows, Linux and MacOSX!!
>
> **Author:** Takuya Takeuchi
>
> **Principal Use:** Use dlib interface via .NET. This library is developed by this owner.
> **Principal Use:** Use dlib interface via .NET. This library is developed by this owner.
#### [OpenCVSharp](https://github.com/shimat/opencvsharp/)

> **License:** The BSD 3-Clause License
>
> **Author:** shimat
>
> **Principal Use:** Loading image data by opencv wrapper for example
15 changes: 15 additions & 0 deletions examples/HelenTraining/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
annotation.zip
helen_1.zip
helen_2.zip
helen_3.zip
helen_4.zip
helen_5.zip

helen/*
dlib_face_recognition_resnet_model_v1.dat
mmod_human_face_detector.dat
shape_predictor_5_face_landmarks.dat
shape_predictor_68_face_landmarks.dat

demo.jpg
white.jpg
28 changes: 28 additions & 0 deletions examples/HelenTraining/Box.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
using System;
using System.Xml.Serialization;

namespace HelenTraining
{

[Serializable]
public sealed class Box
{

[XmlAttribute("top")]
public int Top;

[XmlAttribute("left")]
public int Left;

[XmlAttribute("width")]
public int Width;

[XmlAttribute("height")]
public int Height;

[XmlElement("part")]
public Part[] Part;

}

}
24 changes: 24 additions & 0 deletions examples/HelenTraining/Dataset.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
using System;
using System.Xml.Serialization;

namespace HelenTraining
{

[Serializable]
[XmlRoot(ElementName = "dataset")]
public class Dataset
{

[XmlElement("name")]
public string Name;

[XmlElement("comment")]
public string Comment;

[XmlArray("images")]
[XmlArrayItem("image")]
public Image[] Images;

}

}
18 changes: 18 additions & 0 deletions examples/HelenTraining/HelenTraining.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
<PackageReference Include="System.Drawing.Common" Version="4.5.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\DlibDotNet\src\DlibDotNet\DlibDotNet.csproj" />
<ProjectReference Include="..\..\src\FaceRecognitionDotNet\FaceRecognitionDotNet.csproj" />
</ItemGroup>

</Project>
19 changes: 19 additions & 0 deletions examples/HelenTraining/Image.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using System;
using System.Xml.Serialization;

namespace HelenTraining
{

[Serializable]
public class Image
{

[XmlAttribute("file")]
public string File;

[XmlElement("box")]
public Box Box;

}

}
22 changes: 22 additions & 0 deletions examples/HelenTraining/Part.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
using System;
using System.Xml.Serialization;

namespace HelenTraining
{

[Serializable]
public sealed class Part
{

[XmlAttribute("x")]
public float X;

[XmlAttribute("y")]
public float Y;

[XmlAttribute("name")]
public string Name;

}

}
Loading

0 comments on commit 23c8d57

Please sign in to comment.