Skip to content

Commit

Permalink
Merge branch 'release/19.21.0.20220130'
Browse files Browse the repository at this point in the history
  • Loading branch information
takuya-takeuchi committed Feb 1, 2022
1 parent 8c1cbab commit a03d925
Show file tree
Hide file tree
Showing 265 changed files with 15,402 additions and 3,210 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -321,4 +321,6 @@ src/DlibDotNet.Native.Dnn/build*

nuget/*.nupkg

work
work

.DS_Store
34 changes: 17 additions & 17 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@ build:win:
paths:
- nuget/artifacts

build:uwp:
stage: build
before_script:
- chcp 65001
- git submodule update --init --recursive
- "Get-ChildItem env:"
script:
- cd nuget
- git clean -fxd .
- pwsh BuildUniversalWindowsPlatform.ps1
tags:
- windows
- cuda
artifacts:
paths:
- nuget/artifacts
# build:uwp:
# stage: build
# before_script:
# - chcp 65001
# - git submodule update --init --recursive
# - "Get-ChildItem env:"
# script:
# - cd nuget
# - git clean -fxd .
# - pwsh BuildUniversalWindowsPlatform.ps1
# tags:
# - windows
# - cuda
# artifacts:
# paths:
# - nuget/artifacts

build:cent:
stage: build
Expand Down Expand Up @@ -92,7 +92,7 @@ package:
- windows
dependencies:
- build:win
- build:uwp
# - build:uwp
- build:ubuntu
- build:cent
- build:osx
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "dlib"]
path = src/dlib
url = https://github.com/davisking/dlib
[submodule "src/ios-cmake"]
path = src/ios-cmake
url = https://github.com/leetal/ios-cmake
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.
19 changes: 19 additions & 0 deletions DlibDotNet.sln
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FaceDetection.Client", "exa
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FaceDetection.Server", "examples\ASP.NET\FaceDetection.Server\FaceDetection.Server.csproj", "{DCD4F84F-91D6-4936-AD45-890127D9EF54}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DlibDotNet.Extensions", "src\DlibDotNet.Extensions\DlibDotNet.Extensions.csproj", "{2273A0B6-E4B7-4D22-A358-08C1315AF09E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1087,6 +1089,22 @@ Global
{DCD4F84F-91D6-4936-AD45-890127D9EF54}.Release|x64.Build.0 = Release|x64
{DCD4F84F-91D6-4936-AD45-890127D9EF54}.Release|x86.ActiveCfg = Release|Any CPU
{DCD4F84F-91D6-4936-AD45-890127D9EF54}.Release|x86.Build.0 = Release|Any CPU
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Debug|ARM.ActiveCfg = Debug|Any CPU
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Debug|ARM.Build.0 = Debug|Any CPU
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Debug|x64.ActiveCfg = Debug|Any CPU
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Debug|x64.Build.0 = Debug|Any CPU
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Debug|x86.ActiveCfg = Debug|Any CPU
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Debug|x86.Build.0 = Debug|Any CPU
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Release|Any CPU.Build.0 = Release|Any CPU
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Release|ARM.ActiveCfg = Release|Any CPU
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Release|ARM.Build.0 = Release|Any CPU
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Release|x64.ActiveCfg = Release|Any CPU
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Release|x64.Build.0 = Release|Any CPU
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Release|x86.ActiveCfg = Release|Any CPU
{2273A0B6-E4B7-4D22-A358-08C1315AF09E}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1157,6 +1175,7 @@ Global
{D2D6D0D7-7544-4730-A34E-DAE2588B55D8} = {19C83FDC-2BC9-42D6-9F51-3A0B822FABAD}
{EBACC7C9-4376-4D04-BFBB-12D5E7ABCD37} = {D2D6D0D7-7544-4730-A34E-DAE2588B55D8}
{DCD4F84F-91D6-4936-AD45-890127D9EF54} = {D2D6D0D7-7544-4730-A34E-DAE2588B55D8}
{2273A0B6-E4B7-4D22-A358-08C1315AF09E} = {A9E3AD0D-91F4-48B4-9509-5C06B54C7374}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9D3A508A-1F0B-4364-9FEC-16AF376DA11D}
Expand Down
12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# ![Alt text](nuget/ml48.png "DlibDotNet") DlibDotNet [![GitHub license](https://img.shields.io/github/license/mashape/apistatus.svg)]()
![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)

Dlib wrapper written in C++ and C# for Windows, MacOS and Linux

#### DlibDotNet
[![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)]()

|Package|OS|x86|x64|ARM|ARM64|Nuget|
|---|---|---|---|---|---|---|
Expand Down Expand Up @@ -30,9 +28,9 @@ Dlib wrapper written in C++ and C# for Windows, MacOS and Linux
|DlibDotNet for Intel MKL|Windows|||-|-|[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet.MKL.svg)](https://www.nuget.org/packages/DlibDotNet.MKL)|
||Linux|-||-|-|[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet.MKL.svg)](https://www.nuget.org/packages/DlibDotNet.MKL)|
||OSX|-||-|-|[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet.MKL.svg)](https://www.nuget.org/packages/DlibDotNet.MKL)|
|DlibDotNet for UWP|Windows|||||[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet.UWP.svg)](https://www.nuget.org/packages/DlibDotNet.UWP)|
||Linux|-|-|-|-|[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet.UWP.svg)](https://www.nuget.org/packages/DlibDotNet.UWP)|
||OSX|-|-|-|-|[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet.UWP.svg)](https://www.nuget.org/packages/DlibDotNet.UWP)|
|DlibDotNet (Xamarin)|UWP|||||[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet.Xamarin.svg)](https://www.nuget.org/packages/DlibDotNet.Xamarin)|
||Android|-|-|-|-|[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet.Xamarin.svg)](https://www.nuget.org/packages/DlibDotNet.Xamarin)|
||iOS|-||-||[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet.Xamarin.svg)](https://www.nuget.org/packages/DlibDotNet.Xamarin)|
|DlibDotNet for ARM|Windows|-|-|-|-|[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet-ARM.svg)](https://www.nuget.org/packages/DlibDotNet-ARM)|
||Linux|-|-|-|-|[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet-ARM.svg)](https://www.nuget.org/packages/DlibDotNet-ARM)|
||OSX|-|-|-|-|[![NuGet version](https://img.shields.io/nuget/v/DlibDotNet-ARM.svg)](https://www.nuget.org/packages/DlibDotNet-ARM)|
Expand Down
File renamed without changes.
File renamed without changes.
12 changes: 12 additions & 0 deletions docker/base/centos/7/cuda/11.2/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
FROM nvidia/cuda:11.2.1-cudnn8-devel-centos7
LABEL maintainer "Takuya Takeuchi <[email protected]>"

# install package to build
RUN yum update -y --disablerepo=cuda,nvidia-ml && yum install -y \
ca-certificates
RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
RUN yum update -y --disablerepo=cuda,nvidia-ml && yum install -y \
libX11-devel \
lapack-devel \
openblas-devel \
&& yum clean all
9 changes: 9 additions & 0 deletions docker/base/ubuntu/16/cuda/11.2/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM nvidia/cuda:11.2.1-cudnn8-devel-ubuntu16.04
LABEL maintainer "Takuya Takeuchi <[email protected]>"

# install package to build
RUN apt-get update && apt-get install -y \
libopenblas-dev \
liblapack-dev \
libx11-6 \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
47 changes: 47 additions & 0 deletions docker/devel/centos/7/cuda/11.2/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
FROM nvidia/cuda:11.2.1-cudnn8-devel-centos7
LABEL maintainer "Takuya Takeuchi <[email protected]>"

# install package to build
RUN yum update -y --disablerepo=cuda,nvidia-ml && yum install -y \
ca-certificates
RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
RUN yum update -y --disablerepo=cuda,nvidia-ml && yum install -y \
libX11-devel \
lapack-devel \
openblas-devel \
cmake3
RUN yum groupinstall -y "Development Tools"

# set compiler
ENV CMAKE_C_COMPILER=/usr/bin/gcc
ENV CMAKE_CXX_COMPILER=/usr/bin/g++

# set env to build by using CUDA
ENV CUDA_PATH /usr/local/cuda
ENV PATH $CUDA_PATH/bin:$PATH
ENV CPATH $CUDA_PATH/include:$CPATH
ENV LD_LIBRARY_PATH $CUDA_PATH/lib64:$LD_LIBRARY_PATH
ENV NCCL_ROOT /usr/local/nccl
ENV CPATH $NCCL_ROOT/include:$CPATH
ENV LD_LIBRARY_PATH $NCCL_ROOT/lib/:$LD_LIBRARY_PATH
ENV LIBRARY_PATH $NCCL_ROOT/lib/:$LIBRARY_PATH

# Register Microsoft key and feed
RUN yum update -y --disablerepo=cuda,nvidia-ml && yum install -y \
curl
RUN curl https://packages.microsoft.com/config/rhel/7/prod.repo > /etc/yum.repos.d/microsoft.repo
RUN yum update -y --disablerepo=cuda,nvidia-ml && yum install -y \
powershell \
&& yum clean all

# user cmake 3 instead of cmake 2
RUN alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake 10 \
--slave /usr/local/bin/ctest ctest /usr/bin/ctest \
--slave /usr/local/bin/cpack cpack /usr/bin/cpack \
--slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake \
--family cmake
RUN alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake3 20 \
--slave /usr/local/bin/ctest ctest /usr/bin/ctest3 \
--slave /usr/local/bin/cpack cpack /usr/bin/cpack3 \
--slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake3 \
--family cmake
Loading

0 comments on commit a03d925

Please sign in to comment.