Skip to content

Commit a3bab47

Browse files
takuya-takeuchitakuya-takeuchi
committed
1.3.0.7
1 parent 07c359d commit a3bab47

File tree

22 files changed

+241
-51
lines changed

22 files changed

+241
-51
lines changed

‎LICENSE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2018-2021 Takuya Takeuchi
3+
Copyright (c) 2018-2022 Takuya Takeuchi
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎nuget/Makefile‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
.DEFAULT_GOAL := help
2+
3+
help: ## print this message
4+
@echo "Example operations by makefile."
5+
@echo ""
6+
@echo "Usage: make SUB_COMMAND argument_name=argument_value"
7+
@echo ""
8+
@echo "Command list:"
9+
@echo ""
10+
@printf "\033[36m%-40s\033[0m %-50s %s\n" "[Sub command]" "[Description]" "[Example]"
11+
@grep -E '^[/a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | perl -pe 's%^([/a-zA-Z0-9_-]+):.*?(##)%$$1 $$2%' | awk -F " *?## *?" '{printf "\033[36m%-40s\033[0m %-50s %s\n", $$1, $$2, $$3}'
12+
13+
run-build-centos7-cpu-x64-desktop: ## run build container for centos7 cpu x64 on desktop
14+
@pwsh RunBuildContainer.ps1 cpu 64 desktop centos 7 "/x64"
15+
16+
run-build-centos7-mkl-x64-desktop: ## run build container for centos7 mkl x64 on desktop
17+
@pwsh RunBuildContainer.ps1 mkl 64 desktop centos 7 "/x64"
18+
19+
run-build-ubuntu16-cpu-x64-desktop: ## run build container for ubuntu16 cpu x64 on desktop
20+
@pwsh RunBuildContainer.ps1 cpu 64 desktop ubuntu 16 "/x64"
21+
22+
run-build-ubuntu16-mkl-x64-desktop: ## run build container for ubuntu16 mkl x64 on desktop
23+
@pwsh RunBuildContainer.ps1 mkl 64 desktop ubuntu 16 "/x64"
24+
25+
run-test-centos7-cpu-x64-desktop: ## run build container for centos7 cpu x64 on desktop
26+
@pwsh RunTestContainer.ps1 cpu 64 desktop centos 7 "/x64"
27+
28+
run-test-centos7-mkl-x64-desktop: ## run build container for centos7 mkl x64 on desktop
29+
@pwsh RunTestContainer.ps1 mkl 64 desktop centos 7 "/x64"
30+
31+
run-test-centos7-cu92-x64-desktop: ## run build container for centos7 cuda-92 x64 on desktop
32+
@pwsh RunTestContainer.ps1 cuda 64 desktop centos 7 "92"
33+
34+
run-test-centos7-cu100-x64-desktop: ## run build container for centos7 cuda-100 x64 on desktop
35+
@pwsh RunTestContainer.ps1 cuda 64 desktop centos 7 "100"
36+
37+
run-test-centos7-cu101-x64-desktop: ## run build container for centos7 cuda-101 x64 on desktop
38+
@pwsh RunTestContainer.ps1 cuda 64 desktop centos 7 "101"
39+
40+
run-test-centos7-cu102-x64-desktop: ## run build container for centos7 cuda-102 x64 on desktop
41+
@pwsh RunTestContainer.ps1 cuda 64 desktop centos 7 "102"
42+
43+
run-test-centos7-cu110-x64-desktop: ## run build container for centos7 cuda-110 x64 on desktop
44+
@pwsh RunTestContainer.ps1 cuda 64 desktop centos 7 "110"
45+
46+
run-test-centos7-cu111-x64-desktop: ## run build container for centos7 cuda-111 x64 on desktop
47+
@pwsh RunTestContainer.ps1 cuda 64 desktop centos 7 "111"
48+
49+
run-test-centos7-cu112-x64-desktop: ## run build container for centos7 cuda-112 x64 on desktop
50+
@pwsh RunTestContainer.ps1 cuda 64 desktop centos 7 "112"
51+
52+
run-test-centos7-cpu-x64-desktop: ## run build container for centos7 cpu x64 on desktop
53+
@pwsh RunTestContainer.ps1 cpu 64 desktop ubuntu 16 "/x64"
54+
55+
run-test-ubuntu16-mkl-x64-desktop: ## run build container for ubuntu16 mkl x64 on desktop
56+
@pwsh RunTestContainer.ps1 mkl 64 desktop ubuntu 16 "/x64"
57+
58+
run-test-ubuntu16-cu92-x64-desktop: ## run build container for ubuntu16 cuda-92 x64 on desktop
59+
@pwsh RunTestContainer.ps1 cuda 64 desktop ubuntu 16 "92"
60+
61+
run-test-ubuntu16-cu100-x64-desktop: ## run build container for ubuntu16 cuda-100 x64 on desktop
62+
@pwsh RunTestContainer.ps1 cuda 64 desktop ubuntu 16 "100"
63+
64+
run-test-ubuntu16-cu101-x64-desktop: ## run build container for ubuntu16 cuda-101 x64 on desktop
65+
@pwsh RunTestContainer.ps1 cuda 64 desktop ubuntu 16 "101"
66+
67+
run-test-ubuntu16-cu102-x64-desktop: ## run build container for ubuntu16 cuda-102 x64 on desktop
68+
@pwsh RunTestContainer.ps1 cuda 64 desktop ubuntu 16 "102"
69+
70+
run-test-ubuntu16-cu110-x64-desktop: ## run build container for ubuntu16 cuda-110 x64 on desktop
71+
@pwsh RunTestContainer.ps1 cuda 64 desktop ubuntu 16 "110"
72+
73+
run-test-ubuntu16-cu111-x64-desktop: ## run build container for ubuntu16 cuda-111 x64 on desktop
74+
@pwsh RunTestContainer.ps1 cuda 64 desktop ubuntu 16 "111"
75+
76+
run-test-ubuntu16-cu112-x64-desktop: ## run build container for ubuntu16 cuda-112 x64 on desktop
77+
@pwsh RunTestContainer.ps1 cuda 64 desktop ubuntu 16 "112"

‎nuget/RunTestContainer.ps1‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
#***************************************
2+
#Arguments
3+
#%1: Target (cpu/cuda/mkl/arm)
4+
#%2: Architecture (32/64)
5+
#%3: Platform (desktop,android/ios/uwp)
6+
#%4: Optional Argument
7+
# if Target is cuda, CUDA version if Target is cuda [90/91/92/100/101/102/110/111]
8+
# if Target is mkl and Windows, IntelMKL directory path
9+
#***************************************
10+
Param
11+
(
12+
[Parameter(
13+
Mandatory=$True,
14+
Position = 1
15+
)][string]
16+
$Target,
17+
18+
[Parameter(
19+
Mandatory=$True,
20+
Position = 2
21+
)][int]
22+
$Architecture,
23+
24+
[Parameter(
25+
Mandatory=$True,
26+
Position = 3
27+
)][string]
28+
$Platform,
29+
30+
[Parameter(
31+
Mandatory=$True,
32+
Position = 4
33+
)][string]
34+
$Distribution,
35+
36+
[Parameter(
37+
Mandatory=$True,
38+
Position = 5
39+
)][string]
40+
$DistributionVersion,
41+
42+
[Parameter(
43+
Mandatory=$False,
44+
Position = 6
45+
)][string]
46+
$Option
47+
)
48+
49+
$ScriptPath = $PSScriptRoot
50+
$FaceRecognitionDotNetRoot = Split-Path $ScriptPath -Parent
51+
$BuildUtilsPath = Join-Path $FaceRecognitionDotNetRoot "nuget" | `
52+
Join-Path -ChildPath "BuildUtils.ps1"
53+
import-module $BuildUtilsPath -function *
54+
$Config = [Config]::new($FaceRecognitionDotNetRoot, "Release", $Target, $Architecture, $Platform, $Option)
55+
56+
$DataSetRoot = $env:DataSetDir
57+
if (!(Test-Path($DataSetRoot)))
58+
{
59+
Write-Host "${DataSetRoot} is missing. You can specify DataSetDir environmental variable" -ForegroundColor Yellow
60+
$DataSetRoot = $FaceRecognitionDotNetRoot
61+
}
62+
63+
if ($Target -ne "cuda")
64+
{
65+
$postfix = $Option
66+
$cuda = 0
67+
$dockername = "facerecognition/test/$Distribution/$DistributionVersion/$Target" + $postfix
68+
}
69+
else
70+
{
71+
$cudaVersion = ($Option / 10).ToString("0.0")
72+
$cuda = 1
73+
$dockername = "facerecognition/test/$Distribution/$DistributionVersion/$Target/$cudaVersion"
74+
}
75+
76+
if ($cuda -ne 0)
77+
{
78+
$dockerAPIVersion = docker version --format '{{.Server.APIVersion}}'
79+
Write-Host "Docker API Version: $dockerAPIVersion" -ForegroundColor Yellow
80+
if ($dockerAPIVersion -ge 1.40)
81+
{
82+
docker run --gpus all --rm `
83+
--entrypoint="/bin/bash" `
84+
-v "$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet" `
85+
-v "$($DataSetRoot):/opt/data/Dataset" `
86+
-e "LOCAL_UID=$(id -u $env:USER)" `
87+
-e "LOCAL_GID=$(id -g $env:USER)" `
88+
-w /opt/data/FaceRecognitionDotNet `
89+
-it "$dockername"
90+
}
91+
else
92+
{
93+
docker run --runtime=nvidia --rm `
94+
--entrypoint="/bin/bash" `
95+
-v "$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet" `
96+
-v "$($DataSetRoot):/opt/data/Dataset" `
97+
-e "LOCAL_UID=$(id -u $env:USER)" `
98+
-e "LOCAL_GID=$(id -g $env:USER)" `
99+
-w /opt/data/FaceRecognitionDotNet `
100+
-it "$dockername"
101+
}
102+
}
103+
else
104+
{
105+
docker run --rm `
106+
--entrypoint="/bin/bash" `
107+
-v "$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet" `
108+
-v "$($DataSetRoot):/opt/data/Dataset" `
109+
-e "LOCAL_UID=$(id -u $env:USER)" `
110+
-e "LOCAL_GID=$(id -g $env:USER)" `
111+
-w /opt/data/FaceRecognitionDotNet `
112+
-it "$dockername"
113+
}

‎nuget/nuspec/FaceRecognitionDotNet.CPU.nuspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>FaceRecognitionDotNet</id>
5-
<version>1.3.0.6</version>
5+
<version>1.3.0.7</version>
66
<title>FaceRecognitionDotNet</title>
77
<authors>Takuya Takeuchi</authors>
88
<owners>Takuya Takeuchi</owners>
@@ -14,17 +14,17 @@
1414

1515
This library is ported from https://github.com/ageitgey/face_recognition by C#.</description>
1616
<releaseNotes></releaseNotes>
17-
<copyright>© Takuya Takeuchi 2018-2021</copyright>
17+
<copyright>© Takuya Takeuchi 2018-2022</copyright>
1818
<tags>.net machinelearning face-recognition</tags>
1919
<serviceable>true</serviceable>
2020

2121
<dependencies>
2222
<group targetFramework="net461">
23-
<dependency id="DlibDotNet" version="19.21.0.20210302" />
23+
<dependency id="DlibDotNet" version="19.21.0.20220724" />
2424
</group>
2525
<group targetFramework="netstandard2.0">
2626
<dependency id="System.Drawing.Common" version="5.0.1" />
27-
<dependency id="DlibDotNet" version="19.21.0.20210302" />
27+
<dependency id="DlibDotNet" version="19.21.0.20220724" />
2828
</group>
2929
</dependencies>
3030
<frameworkAssemblies>

‎nuget/nuspec/FaceRecognitionDotNet.CUDA100.nuspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>FaceRecognitionDotNet.CUDA100</id>
5-
<version>1.3.0.6</version>
5+
<version>1.3.0.7</version>
66
<title>FaceRecognitionDotNet for CUDA 10.0</title>
77
<authors>Takuya Takeuchi</authors>
88
<owners>Takuya Takeuchi</owners>
@@ -14,17 +14,17 @@
1414

1515
This library is ported from https://github.com/ageitgey/face_recognition by C#.</description>
1616
<releaseNotes></releaseNotes>
17-
<copyright>© Takuya Takeuchi 2018-2021</copyright>
17+
<copyright>© Takuya Takeuchi 2018-2022</copyright>
1818
<tags>.net machinelearning face-recognition</tags>
1919
<serviceable>true</serviceable>
2020

2121
<dependencies>
2222
<group targetFramework="net461">
23-
<dependency id="DlibDotNet.CUDA100" version="19.21.0.20210302" />
23+
<dependency id="DlibDotNet.CUDA100" version="19.21.0.20220724" />
2424
</group>
2525
<group targetFramework="netstandard2.0">
2626
<dependency id="System.Drawing.Common" version="5.0.1" />
27-
<dependency id="DlibDotNet.CUDA100" version="19.21.0.20210302" />
27+
<dependency id="DlibDotNet.CUDA100" version="19.21.0.20220724" />
2828
</group>
2929
</dependencies>
3030
<frameworkAssemblies>

‎nuget/nuspec/FaceRecognitionDotNet.CUDA101.nuspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>FaceRecognitionDotNet.CUDA101</id>
5-
<version>1.3.0.6</version>
5+
<version>1.3.0.7</version>
66
<title>FaceRecognitionDotNet for CUDA 10.1</title>
77
<authors>Takuya Takeuchi</authors>
88
<owners>Takuya Takeuchi</owners>
@@ -14,17 +14,17 @@
1414

1515
This library is ported from https://github.com/ageitgey/face_recognition by C#.</description>
1616
<releaseNotes></releaseNotes>
17-
<copyright>© Takuya Takeuchi 2018-2021</copyright>
17+
<copyright>© Takuya Takeuchi 2018-2022</copyright>
1818
<tags>.net machinelearning face-recognition</tags>
1919
<serviceable>true</serviceable>
2020

2121
<dependencies>
2222
<group targetFramework="net461">
23-
<dependency id="DlibDotNet.CUDA101" version="19.21.0.20210302" />
23+
<dependency id="DlibDotNet.CUDA101" version="19.21.0.20220724" />
2424
</group>
2525
<group targetFramework="netstandard2.0">
2626
<dependency id="System.Drawing.Common" version="5.0.1" />
27-
<dependency id="DlibDotNet.CUDA101" version="19.21.0.20210302" />
27+
<dependency id="DlibDotNet.CUDA101" version="19.21.0.20220724" />
2828
</group>
2929
</dependencies>
3030
<frameworkAssemblies>

‎nuget/nuspec/FaceRecognitionDotNet.CUDA102.nuspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>FaceRecognitionDotNet.CUDA102</id>
5-
<version>1.3.0.6</version>
5+
<version>1.3.0.7</version>
66
<title>FaceRecognitionDotNet for CUDA 10.2</title>
77
<authors>Takuya Takeuchi</authors>
88
<owners>Takuya Takeuchi</owners>
@@ -14,17 +14,17 @@
1414

1515
This library is ported from https://github.com/ageitgey/face_recognition by C#.</description>
1616
<releaseNotes></releaseNotes>
17-
<copyright>© Takuya Takeuchi 2018-2021</copyright>
17+
<copyright>© Takuya Takeuchi 2018-2022</copyright>
1818
<tags>.net machinelearning face-recognition</tags>
1919
<serviceable>true</serviceable>
2020

2121
<dependencies>
2222
<group targetFramework="net461">
23-
<dependency id="DlibDotNet.CUDA102" version="19.21.0.20210302" />
23+
<dependency id="DlibDotNet.CUDA102" version="19.21.0.20220724" />
2424
</group>
2525
<group targetFramework="netstandard2.0">
2626
<dependency id="System.Drawing.Common" version="5.0.1" />
27-
<dependency id="DlibDotNet.CUDA102" version="19.21.0.20210302" />
27+
<dependency id="DlibDotNet.CUDA102" version="19.21.0.20220724" />
2828
</group>
2929
</dependencies>
3030
<frameworkAssemblies>

‎nuget/nuspec/FaceRecognitionDotNet.CUDA110.nuspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>FaceRecognitionDotNet.CUDA110</id>
5-
<version>1.3.0.6</version>
5+
<version>1.3.0.7</version>
66
<title>FaceRecognitionDotNet for CUDA 11.0</title>
77
<authors>Takuya Takeuchi</authors>
88
<owners>Takuya Takeuchi</owners>
@@ -14,17 +14,17 @@
1414

1515
This library is ported from https://github.com/ageitgey/face_recognition by C#.</description>
1616
<releaseNotes></releaseNotes>
17-
<copyright>© Takuya Takeuchi 2018-2021</copyright>
17+
<copyright>© Takuya Takeuchi 2018-2022</copyright>
1818
<tags>.net machinelearning face-recognition</tags>
1919
<serviceable>true</serviceable>
2020

2121
<dependencies>
2222
<group targetFramework="net461">
23-
<dependency id="DlibDotNet.CUDA110" version="19.21.0.20210302" />
23+
<dependency id="DlibDotNet.CUDA110" version="19.21.0.20220724" />
2424
</group>
2525
<group targetFramework="netstandard2.0">
2626
<dependency id="System.Drawing.Common" version="5.0.1" />
27-
<dependency id="DlibDotNet.CUDA110" version="19.21.0.20210302" />
27+
<dependency id="DlibDotNet.CUDA110" version="19.21.0.20220724" />
2828
</group>
2929
</dependencies>
3030
<frameworkAssemblies>

‎nuget/nuspec/FaceRecognitionDotNet.CUDA111.nuspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>FaceRecognitionDotNet.CUDA111</id>
5-
<version>1.3.0.6</version>
5+
<version>1.3.0.7</version>
66
<title>FaceRecognitionDotNet for CUDA 11.1</title>
77
<authors>Takuya Takeuchi</authors>
88
<owners>Takuya Takeuchi</owners>
@@ -14,17 +14,17 @@
1414

1515
This library is ported from https://github.com/ageitgey/face_recognition by C#.</description>
1616
<releaseNotes></releaseNotes>
17-
<copyright>© Takuya Takeuchi 2018-2021</copyright>
17+
<copyright>© Takuya Takeuchi 2018-2022</copyright>
1818
<tags>.net machinelearning face-recognition</tags>
1919
<serviceable>true</serviceable>
2020

2121
<dependencies>
2222
<group targetFramework="net461">
23-
<dependency id="DlibDotNet.CUDA111" version="19.21.0.20210302" />
23+
<dependency id="DlibDotNet.CUDA111" version="19.21.0.20220724" />
2424
</group>
2525
<group targetFramework="netstandard2.0">
2626
<dependency id="System.Drawing.Common" version="5.0.1" />
27-
<dependency id="DlibDotNet.CUDA111" version="19.21.0.20210302" />
27+
<dependency id="DlibDotNet.CUDA111" version="19.21.0.20220724" />
2828
</group>
2929
</dependencies>
3030
<frameworkAssemblies>

0 commit comments

Comments
 (0)