Skip to content

Commit

Permalink
1.3.0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
takuya-takeuchi committed Feb 13, 2022
1 parent 6d5353c commit 07c359d
Show file tree
Hide file tree
Showing 68 changed files with 4,222 additions and 185 deletions.
128 changes: 128 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
# Contributor Covenant Code of Conduct

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
[email protected].
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series
of actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
the community.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.

Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.
26 changes: 24 additions & 2 deletions FaceRecognitionDotNet.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29806.167
# Visual Studio Version 17
VisualStudioVersion = 17.0.32112.339
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2F845E5F-E6B9-46D5-B5D8-52BEE4B463F0}"
EndProject
Expand Down Expand Up @@ -45,7 +45,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HeadPoseEstimationDemo", "e
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BenchmarkEndToEnd", "examples\BenchmarkEndToEnd\BenchmarkEndToEnd.csproj", "{F26A2088-EB8B-43F0-8F78-9A2BCE514367}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmotionTraining", "tools\EmotionTraining\EmotionTraining.csproj", "{269D318D-B37E-4F24-AF9B-30D580439056}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmotionTrainingV2", "tools\EmotionTrainingV2\EmotionTrainingV2.csproj", "{2462DBBC-3902-4C92-B1D3-F1CB09AE0995}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "tools\Shared\Shared.shproj", "{91B27982-5175-48B6-B653-6F5F022F488C}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
tools\Shared\Shared.projitems*{2462dbbc-3902-4c92-b1d3-f1cb09ae0995}*SharedItemsImports = 5
tools\Shared\Shared.projitems*{269d318d-b37e-4f24-af9b-30d580439056}*SharedItemsImports = 5
tools\Shared\Shared.projitems*{91b27982-5175-48b6-b653-6f5f022f488c}*SharedItemsImports = 13
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Expand Down Expand Up @@ -119,6 +130,14 @@ Global
{F26A2088-EB8B-43F0-8F78-9A2BCE514367}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F26A2088-EB8B-43F0-8F78-9A2BCE514367}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F26A2088-EB8B-43F0-8F78-9A2BCE514367}.Release|Any CPU.Build.0 = Release|Any CPU
{269D318D-B37E-4F24-AF9B-30D580439056}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{269D318D-B37E-4F24-AF9B-30D580439056}.Debug|Any CPU.Build.0 = Debug|Any CPU
{269D318D-B37E-4F24-AF9B-30D580439056}.Release|Any CPU.ActiveCfg = Release|Any CPU
{269D318D-B37E-4F24-AF9B-30D580439056}.Release|Any CPU.Build.0 = Release|Any CPU
{2462DBBC-3902-4C92-B1D3-F1CB09AE0995}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2462DBBC-3902-4C92-B1D3-F1CB09AE0995}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2462DBBC-3902-4C92-B1D3-F1CB09AE0995}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2462DBBC-3902-4C92-B1D3-F1CB09AE0995}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -141,6 +160,9 @@ Global
{BB6A1F98-DEF9-475C-A69A-82FE518D1E9E} = {8C8838E0-B002-426F-9B25-4C1F65A6D33D}
{8540B212-5605-4402-BAE4-BEFEBAAD9F97} = {FEEAC07F-70D7-4C12-B92C-153CEE0F2539}
{F26A2088-EB8B-43F0-8F78-9A2BCE514367} = {FEEAC07F-70D7-4C12-B92C-153CEE0F2539}
{269D318D-B37E-4F24-AF9B-30D580439056} = {8C8838E0-B002-426F-9B25-4C1F65A6D33D}
{2462DBBC-3902-4C92-B1D3-F1CB09AE0995} = {8C8838E0-B002-426F-9B25-4C1F65A6D33D}
{91B27982-5175-48B6-B653-6F5F022F488C} = {8C8838E0-B002-426F-9B25-4C1F65A6D33D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4D44C572-D749-4A76-A199-8C598A08AE8A}
Expand Down
12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# ![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)
![FaceRecognitionDotNet](https://socialify.git.ci/takuya-takeuchi/FaceRecognitionDotNet/image?description=1&font=Raleway&language=1&logo=https%3A%2F%2Fgithub.com%2Ftakuya-takeuchi%2FFaceRecognitionDotNet%2Fraw%2Fmaster%2Fnuget%2Fface128.png&owner=1&pattern=Circuit%20Board&theme=Light)

The world's simplest facial recognition api for .NET
This repository is porting https://github.com/ageitgey/face_recognition by C#.
Expand Down Expand Up @@ -55,8 +55,10 @@ This package supports cross platform, Windows, Linux and MacOSX!!
|-|EyeBlinkDetect|Detect person is blinking or not<br>Support Large model and **Helen dataset** :warning:|
|-|LoadImage|From memory data or System.Drawing.Bitmap|
|-|PredictAge|Predict human age.<br>Use **Adience Benchmark Of Unfiltered Faces For Gender And Age Classification dataset** :warning:|
|-|PredictEmotion|Predict emotion for human face.<br>Use **Corrective re-annotation of FER - CK+ - KDEF** :warning:|
|-|PredictGender|Predict human gender.<br>Use **UTKFace dataset** :warning:|
|-|PredictProbabilityAge|Predict probability of human age.<br>Use **Adience Benchmark Of Unfiltered Faces For Gender And Age Classification dataset** :warning:|
|-|PredictProbabilityEmotion|Predict probability of emotion from human face.<br>Use **Corrective re-annotation of FER - CK+ - KDEF** :warning:|
|-|PredictProbabilityGender|Predict probability of human gender.<br>Use **UTKFace dataset** :warning:|
|-|PredictHeadPose|Predict human head pose.<br>Use **300W-LP dataset** :warning:|

Expand All @@ -67,6 +69,8 @@ I will **NOT** provide pretrained model file due to avoiding license issue.
You can check the following examples to train dataset.

* tools/AgeTraining
* tools/EmotionTraining
* tools/EmotionTrainingV2
* tools/GenderTraining
* tools/HeadPoseTraining
* tools/HelenTraining
Expand All @@ -79,9 +83,9 @@ You can check the following examples to train dataset.

#### Other Face Functions

|Face Landmark|Age and Gender Classification|Head Pose Estimation|
|---|---|---|
|<img src="images/3.jpg" width="240"/>|<img src="examples/CustomClassificationDemo/images/result.png" width="240"/>|<img src="images/4.png" width="240"/>|
|Face Landmark|Age and Gender Classification|Head Pose Estimation|Emotion Estimation|
|---|---|---|---|
|<img src="images/3.jpg" width="240"/>|<img src="examples/CustomClassificationDemo/images/result.png" width="240"/>|<img src="images/4.png" width="240"/>|<img src="images/5.jpg" width="240"/>|

## Document

Expand Down
Binary file added images/5.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 8 additions & 3 deletions nuget/BuildUtils.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ class Config
$ConfigurationArray =
@(
"Debug",
"Release"
"Release",
"RelWithDebInfo"
)

$TargetArray =
Expand Down Expand Up @@ -60,24 +61,28 @@ class Config
static $BuildLibraryWindowsHash =
@{
"GenderClassification" = "DlibDotNetNativeDnnGenderClassification.dll";
"EmotionClassification" = "DlibDotNetNativeDnnEmotionClassification.dll";
"AgeClassification" = "DlibDotNetNativeDnnAgeClassification.dll";
}

static $BuildLibraryLinuxHash =
@{
"GenderClassification" = "libDlibDotNetNativeDnnGenderClassification.so";
"EmotionClassification" = "libDlibDotNetNativeDnnEmotionClassification.so";
"AgeClassification" = "libDlibDotNetNativeDnnAgeClassification.so";
}

static $BuildLibraryOSXHash =
@{
"GenderClassification" = "libDlibDotNetNativeDnnGenderClassification.dylib";
"EmotionClassification" = "libDlibDotNetNativeDnnEmotionClassification.dylib";
"AgeClassification" = "libDlibDotNetNativeDnnAgeClassification.dylib";
}

static $BuildLibraryIOSHash =
@{
"GenderClassification" = "libDlibDotNetNativeDnnGenderClassification.a";
"EmotionClassification" = "libDlibDotNetNativeDnnEmotionClassification.a";
"AgeClassification" = "libDlibDotNetNativeDnnAgeClassification.a";
}

Expand All @@ -94,7 +99,7 @@ class Config
#***************************************
# Arguments
# %1: Root directory of DlibDotNet
# %2: Build Configuration (Release/Debug)
# %2: Build Configuration (Release/Debug/RelWithDebInfo)
# %3: Target (cpu/cuda/mkl/arm)
# %4: Architecture (32/64)
# %5: Platform (desktop/android/ios/uwp)
Expand Down Expand Up @@ -918,7 +923,7 @@ 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 .
# git checkout .
Set-Location -Path $currentDir
}

Expand Down
7 changes: 6 additions & 1 deletion nuget/nuspec/FaceRecognitionDotNet.CPU.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package>
<metadata>
<id>FaceRecognitionDotNet</id>
<version>1.3.0.5</version>
<version>1.3.0.6</version>
<title>FaceRecognitionDotNet</title>
<authors>Takuya Takeuchi</authors>
<owners>Takuya Takeuchi</owners>
Expand Down Expand Up @@ -49,14 +49,19 @@ This library is ported from https://github.com/ageitgey/face_recognition by C#.<

<!-- Age and Gender classification -->
<file src="..\artifacts\cpu\runtimes\win-x64\native\DlibDotNetNativeDnnAgeClassification.dll" target="runtimes\win-x64\native\DlibDotNetNativeDnnAgeClassification.dll" />
<file src="..\artifacts\cpu\runtimes\win-x64\native\DlibDotNetNativeDnnEmotionClassification.dll" target="runtimes\win-x64\native\DlibDotNetNativeDnnEmotionClassification.dll" />
<file src="..\artifacts\cpu\runtimes\win-x64\native\DlibDotNetNativeDnnGenderClassification.dll" target="runtimes\win-x64\native\DlibDotNetNativeDnnGenderClassification.dll" />
<file src="..\artifacts\cpu\runtimes\win-x86\native\DlibDotNetNativeDnnAgeClassification.dll" target="runtimes\win-x86\native\DlibDotNetNativeDnnAgeClassification.dll" />
<file src="..\artifacts\cpu\runtimes\win-x86\native\DlibDotNetNativeDnnEmotionClassification.dll" target="runtimes\win-x86\native\DlibDotNetNativeDnnEmotionClassification.dll" />
<file src="..\artifacts\cpu\runtimes\win-x86\native\DlibDotNetNativeDnnGenderClassification.dll" target="runtimes\win-x86\native\DlibDotNetNativeDnnGenderClassification.dll" />
<file src="..\artifacts\cpu\runtimes\linux-x64\native\libDlibDotNetNativeDnnAgeClassification.so" target="runtimes\linux-x64\native\libDlibDotNetNativeDnnAgeClassification.so" />
<file src="..\artifacts\cpu\runtimes\linux-x64\native\libDlibDotNetNativeDnnEmotionClassification.so" target="runtimes\linux-x64\native\libDlibDotNetNativeDnnEmotionClassification.so" />
<file src="..\artifacts\cpu\runtimes\linux-x64\native\libDlibDotNetNativeDnnGenderClassification.so" target="runtimes\linux-x64\native\libDlibDotNetNativeDnnGenderClassification.so" />
<file src="..\artifacts\cpu\runtimes\centos-x64\native\libDlibDotNetNativeDnnAgeClassification.so" target="runtimes\centos-x64\native\libDlibDotNetNativeDnnAgeClassification.so" />
<file src="..\artifacts\cpu\runtimes\centos-x64\native\libDlibDotNetNativeDnnEmotionClassification.so" target="runtimes\centos-x64\native\libDlibDotNetNativeDnnEmotionClassification.so" />
<file src="..\artifacts\cpu\runtimes\centos-x64\native\libDlibDotNetNativeDnnGenderClassification.so" target="runtimes\centos-x64\native\libDlibDotNetNativeDnnGenderClassification.so" />
<file src="..\artifacts\cpu\runtimes\osx-x64\native\libDlibDotNetNativeDnnAgeClassification.dylib" target="runtimes\osx-x64\native\libDlibDotNetNativeDnnAgeClassification.dylib" />
<file src="..\artifacts\cpu\runtimes\osx-x64\native\libDlibDotNetNativeDnnEmotionClassification.dylib" target="runtimes\osx-x64\native\libDlibDotNetNativeDnnEmotionClassification.dylib" />
<file src="..\artifacts\cpu\runtimes\osx-x64\native\libDlibDotNetNativeDnnGenderClassification.dylib" target="runtimes\osx-x64\native\libDlibDotNetNativeDnnGenderClassification.dylib" />

<!-- license -->
Expand Down
5 changes: 4 additions & 1 deletion nuget/nuspec/FaceRecognitionDotNet.CUDA100.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package>
<metadata>
<id>FaceRecognitionDotNet.CUDA100</id>
<version>1.3.0.5</version>
<version>1.3.0.6</version>
<title>FaceRecognitionDotNet for CUDA 10.0</title>
<authors>Takuya Takeuchi</authors>
<owners>Takuya Takeuchi</owners>
Expand Down Expand Up @@ -49,10 +49,13 @@ This library is ported from https://github.com/ageitgey/face_recognition by C#.<

<!-- Age and Gender classification -->
<file src="..\artifacts\cuda-100\runtimes\win-x64\native\DlibDotNetNativeDnnAgeClassification.dll" target="runtimes\win-x64\native\DlibDotNetNativeDnnAgeClassification.dll" />
<file src="..\artifacts\cuda-100\runtimes\win-x64\native\DlibDotNetNativeDnnEmotionClassification.dll" target="runtimes\win-x64\native\DlibDotNetNativeDnnEmotionClassification.dll" />
<file src="..\artifacts\cuda-100\runtimes\win-x64\native\DlibDotNetNativeDnnGenderClassification.dll" target="runtimes\win-x64\native\DlibDotNetNativeDnnGenderClassification.dll" />
<file src="..\artifacts\cuda-100\runtimes\linux-x64\native\libDlibDotNetNativeDnnAgeClassification.so" target="runtimes\linux-x64\native\libDlibDotNetNativeDnnAgeClassification.so" />
<file src="..\artifacts\cuda-100\runtimes\linux-x64\native\libDlibDotNetNativeDnnEmotionClassification.so" target="runtimes\linux-x64\native\libDlibDotNetNativeDnnEmotionClassification.so" />
<file src="..\artifacts\cuda-100\runtimes\linux-x64\native\libDlibDotNetNativeDnnGenderClassification.so" target="runtimes\linux-x64\native\libDlibDotNetNativeDnnGenderClassification.so" />
<file src="..\artifacts\cuda-100\runtimes\centos-x64\native\libDlibDotNetNativeDnnAgeClassification.so" target="runtimes\centos-x64\native\libDlibDotNetNativeDnnAgeClassification.so" />
<file src="..\artifacts\cuda-100\runtimes\centos-x64\native\libDlibDotNetNativeDnnEmotionClassification.so" target="runtimes\centos-x64\native\libDlibDotNetNativeDnnEmotionClassification.so" />
<file src="..\artifacts\cuda-100\runtimes\centos-x64\native\libDlibDotNetNativeDnnGenderClassification.so" target="runtimes\centos-x64\native\libDlibDotNetNativeDnnGenderClassification.so" />

<!-- license -->
Expand Down
Loading

0 comments on commit 07c359d

Please sign in to comment.