Skip to content

Commit a03d925

Browse files
takuya-takeuchitakuya-takeuchi
committed
Merge branch 'release/19.21.0.20220130'
1 parent 8c1cbab commit a03d925

File tree

265 files changed

+15402
-3210
lines changed

Some content is hidden

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

265 files changed

+15402
-3210
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,4 +321,6 @@ src/DlibDotNet.Native.Dnn/build*
321321

322322
nuget/*.nupkg
323323

324-
work
324+
work
325+
326+
.DS_Store

‎.gitlab-ci.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,22 @@ build:win:
2020
paths:
2121
- nuget/artifacts
2222

23-
build:uwp:
24-
stage: build
25-
before_script:
26-
- chcp 65001
27-
- git submodule update --init --recursive
28-
- "Get-ChildItem env:"
29-
script:
30-
- cd nuget
31-
- git clean -fxd .
32-
- pwsh BuildUniversalWindowsPlatform.ps1
33-
tags:
34-
- windows
35-
- cuda
36-
artifacts:
37-
paths:
38-
- nuget/artifacts
23+
# build:uwp:
24+
# stage: build
25+
# before_script:
26+
# - chcp 65001
27+
# - git submodule update --init --recursive
28+
# - "Get-ChildItem env:"
29+
# script:
30+
# - cd nuget
31+
# - git clean -fxd .
32+
# - pwsh BuildUniversalWindowsPlatform.ps1
33+
# tags:
34+
# - windows
35+
# - cuda
36+
# artifacts:
37+
# paths:
38+
# - nuget/artifacts
3939

4040
build:cent:
4141
stage: build
@@ -92,7 +92,7 @@ package:
9292
- windows
9393
dependencies:
9494
- build:win
95-
- build:uwp
95+
# - build:uwp
9696
- build:ubuntu
9797
- build:cent
9898
- build:osx

‎.gitmodules‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
[submodule "dlib"]
22
path = src/dlib
33
url = https://github.com/davisking/dlib
4-
[submodule "src/ios-cmake"]
5-
path = src/ios-cmake
6-
url = https://github.com/leetal/ios-cmake

‎CODE_OF_CONDUCT.md‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, religion, or sexual identity
10+
and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
14+
15+
## Our Standards
16+
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
* Demonstrating empathy and kindness toward other people
21+
* Being respectful of differing opinions, viewpoints, and experiences
22+
* Giving and gracefully accepting constructive feedback
23+
* Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the
26+
overall community
27+
28+
Examples of unacceptable behavior include:
29+
30+
* The use of sexualized language or imagery, and sexual attention or
31+
advances of any kind
32+
* Trolling, insulting or derogatory comments, and personal or political attacks
33+
* Public or private harassment
34+
* Publishing others' private information, such as a physical or email
35+
address, without their explicit permission
36+
* Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
50+
51+
## Scope
52+
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official e-mail address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
58+
59+
## Enforcement
60+
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62+
reported to the community leaders responsible for enforcement at
63+
[email protected].
64+
All complaints will be reviewed and investigated promptly and fairly.
65+
66+
All community leaders are obligated to respect the privacy and security of the
67+
reporter of any incident.
68+
69+
## Enforcement Guidelines
70+
71+
Community leaders will follow these Community Impact Guidelines in determining
72+
the consequences for any action they deem in violation of this Code of Conduct:
73+
74+
### 1. Correction
75+
76+
**Community Impact**: Use of inappropriate language or other behavior deemed
77+
unprofessional or unwelcome in the community.
78+
79+
**Consequence**: A private, written warning from community leaders, providing
80+
clarity around the nature of the violation and an explanation of why the
81+
behavior was inappropriate. A public apology may be requested.
82+
83+
### 2. Warning
84+
85+
**Community Impact**: A violation through a single incident or series
86+
of actions.
87+
88+
**Consequence**: A warning with consequences for continued behavior. No
89+
interaction with the people involved, including unsolicited interaction with
90+
those enforcing the Code of Conduct, for a specified period of time. This
91+
includes avoiding interactions in community spaces as well as external channels
92+
like social media. Violating these terms may lead to a temporary or
93+
permanent ban.
94+
95+
### 3. Temporary Ban
96+
97+
**Community Impact**: A serious violation of community standards, including
98+
sustained inappropriate behavior.
99+
100+
**Consequence**: A temporary ban from any sort of interaction or public
101+
communication with the community for a specified period of time. No public or
102+
private interaction with the people involved, including unsolicited interaction
103+
with those enforcing the Code of Conduct, is allowed during this period.
104+
Violating these terms may lead to a permanent ban.
105+
106+
### 4. Permanent Ban
107+
108+
**Community Impact**: Demonstrating a pattern of violation of community
109+
standards, including sustained inappropriate behavior, harassment of an
110+
individual, or aggression toward or disparagement of classes of individuals.
111+
112+
**Consequence**: A permanent ban from any sort of public interaction within
113+
the community.
114+
115+
## Attribution
116+
117+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118+
version 2.0, available at
119+
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
120+
121+
Community Impact Guidelines were inspired by [Mozilla's code of conduct
122+
enforcement ladder](https://github.com/mozilla/diversity).
123+
124+
[homepage]: https://www.contributor-covenant.org
125+
126+
For answers to common questions about this code of conduct, see the FAQ at
127+
https://www.contributor-covenant.org/faq. Translations are available at
128+
https://www.contributor-covenant.org/translations.

‎DlibDotNet.sln‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FaceDetection.Client", "exa
143143
EndProject
144144
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FaceDetection.Server", "examples\ASP.NET\FaceDetection.Server\FaceDetection.Server.csproj", "{DCD4F84F-91D6-4936-AD45-890127D9EF54}"
145145
EndProject
146+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DlibDotNet.Extensions", "src\DlibDotNet.Extensions\DlibDotNet.Extensions.csproj", "{2273A0B6-E4B7-4D22-A358-08C1315AF09E}"
147+
EndProject
146148
Global
147149
GlobalSection(SolutionConfigurationPlatforms) = preSolution
148150
Debug|Any CPU = Debug|Any CPU
@@ -1087,6 +1089,22 @@ Global
10871089
{DCD4F84F-91D6-4936-AD45-890127D9EF54}.Release|x64.Build.0 = Release|x64
10881090
{DCD4F84F-91D6-4936-AD45-890127D9EF54}.Release|x86.ActiveCfg = Release|Any CPU
10891091
{DCD4F84F-91D6-4936-AD45-890127D9EF54}.Release|x86.Build.0 = Release|Any CPU
1092+
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1093+
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Debug|Any CPU.Build.0 = Debug|Any CPU
1094+
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Debug|ARM.ActiveCfg = Debug|Any CPU
1095+
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Debug|ARM.Build.0 = Debug|Any CPU
1096+
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Debug|x64.ActiveCfg = Debug|Any CPU
1097+
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Debug|x64.Build.0 = Debug|Any CPU
1098+
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Debug|x86.ActiveCfg = Debug|Any CPU
1099+
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Debug|x86.Build.0 = Debug|Any CPU
1100+
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Release|Any CPU.ActiveCfg = Release|Any CPU
1101+
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Release|Any CPU.Build.0 = Release|Any CPU
1102+
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Release|ARM.ActiveCfg = Release|Any CPU
1103+
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Release|ARM.Build.0 = Release|Any CPU
1104+
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Release|x64.ActiveCfg = Release|Any CPU
1105+
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Release|x64.Build.0 = Release|Any CPU
1106+
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Release|x86.ActiveCfg = Release|Any CPU
1107+
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Release|x86.Build.0 = Release|Any CPU
10901108
EndGlobalSection
10911109
GlobalSection(SolutionProperties) = preSolution
10921110
HideSolutionNode = FALSE
@@ -1157,6 +1175,7 @@ Global
11571175
{D2D6D0D7-7544-4730-A34E-DAE2588B55D8} = {19C83FDC-2BC9-42D6-9F51-3A0B822FABAD}
11581176
{EBACC7C9-4376-4D04-BFBB-12D5E7ABCD37} = {D2D6D0D7-7544-4730-A34E-DAE2588B55D8}
11591177
{DCD4F84F-91D6-4936-AD45-890127D9EF54} = {D2D6D0D7-7544-4730-A34E-DAE2588B55D8}
1178+
{2273A0B6-E4B7-4D22-A358-08C1315AF09E} = {A9E3AD0D-91F4-48B4-9509-5C06B54C7374}
11601179
EndGlobalSection
11611180
GlobalSection(ExtensibilityGlobals) = postSolution
11621181
SolutionGuid = {9D3A508A-1F0B-4364-9FEC-16AF376DA11D}

‎README.md‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
# ![Alt text](nuget/ml48.png "DlibDotNet") DlibDotNet [![GitHub license](https://img.shields.io/github/license/mashape/apistatus.svg)]()
1+
![DlibDotNet](https://socialify.git.ci/takuya-takeuchi/DlibDotNet/image?description=1&font=Raleway&language=1&logo=https%3A%2F%2Fgithub.com%2Ftakuya-takeuchi%2FDlibDotNet%2Fraw%2Fmaster%2Fnuget%2Fml128.png&owner=1&pattern=Circuit%20Board&theme=Light)
22

3-
Dlib wrapper written in C++ and C# for Windows, MacOS and Linux
4-
5-
#### DlibDotNet
3+
[![GitHub Stars](https://img.shields.io/github/stars/takuya-takeuchi/dlibdotnet?label=STARS&color=%23DFB317&style=for-the-badge)]() [![GitHub Forks](https://img.shields.io/github/forks/takuya-takeuchi/dlibdotnet?label=FORKS&color=%236ECA00&style=for-the-badge)]() [![GitHub Issues](https://img.shields.io/github/issues/takuya-takeuchi/dlibdotnet?label=ISSUES&color=%23007EC6&style=for-the-badge)]() [![GitHub Lisence](https://img.shields.io/github/license/takuya-takeuchi/dlibdotnet?label=LISENCE&color=%239109BD&style=for-the-badge)]()
64

75
|Package|OS|x86|x64|ARM|ARM64|Nuget|
86
|---|---|---|---|---|---|---|
@@ -30,9 +28,9 @@ Dlib wrapper written in C++ and C# for Windows, MacOS and Linux
3028
|DlibDotNet for Intel MKL|Windows|✓|✓|-|-|[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet.MKL.svg)](https://www.nuget.org/packages/DlibDotNet.MKL)|
3129
||Linux|-|✓|-|-|[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet.MKL.svg)](https://www.nuget.org/packages/DlibDotNet.MKL)|
3230
||OSX|-|✓|-|-|[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet.MKL.svg)](https://www.nuget.org/packages/DlibDotNet.MKL)|
33-
|DlibDotNet for UWP|Windows|✓|✓|✓|✓|[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet.UWP.svg)](https://www.nuget.org/packages/DlibDotNet.UWP)|
34-
||Linux|-|-|-|-|[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet.UWP.svg)](https://www.nuget.org/packages/DlibDotNet.UWP)|
35-
||OSX|-|-|-|-|[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet.UWP.svg)](https://www.nuget.org/packages/DlibDotNet.UWP)|
31+
|DlibDotNet (Xamarin)|UWP|✓|✓|✓|✓|[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet.Xamarin.svg)](https://www.nuget.org/packages/DlibDotNet.Xamarin)|
32+
||Android|-|-|-|-|[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet.Xamarin.svg)](https://www.nuget.org/packages/DlibDotNet.Xamarin)|
33+
||iOS|-|✓|-|✓|[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet.Xamarin.svg)](https://www.nuget.org/packages/DlibDotNet.Xamarin)|
3634
|DlibDotNet for ARM|Windows|-|-|-|-|[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet-ARM.svg)](https://www.nuget.org/packages/DlibDotNet-ARM)|
3735
||Linux|-|-|-|-|[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet-ARM.svg)](https://www.nuget.org/packages/DlibDotNet-ARM)|
3836
||OSX|-|-|-|-|[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet-ARM.svg)](https://www.nuget.org/packages/DlibDotNet-ARM)|

docker/build_devel.ps1 renamed to docker/BuildDevel.ps1

File renamed without changes.

docker/build_runtime.ps1 renamed to docker/BuildRuntime.ps1

File renamed without changes.

‎docker/base/centos/7/cuda/11.2/Dockerfile‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
FROM nvidia/cuda:11.2.1-cudnn8-devel-centos7
2+
LABEL maintainer "Takuya Takeuchi <[email protected]>"
3+
4+
# install package to build
5+
RUN yum update -y --disablerepo=cuda,nvidia-ml && yum install -y \
6+
ca-certificates
7+
RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
8+
RUN yum update -y --disablerepo=cuda,nvidia-ml && yum install -y \
9+
libX11-devel \
10+
lapack-devel \
11+
openblas-devel \
12+
&& yum clean all

‎docker/base/ubuntu/16/cuda/11.2/Dockerfile‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
FROM nvidia/cuda:11.2.1-cudnn8-devel-ubuntu16.04
2+
LABEL maintainer "Takuya Takeuchi <[email protected]>"
3+
4+
# install package to build
5+
RUN apt-get update && apt-get install -y \
6+
libopenblas-dev \
7+
liblapack-dev \
8+
libx11-6 \
9+
&& apt-get clean && rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)