Skip to content

Commit

Permalink
1.3.0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
takuya-takeuchi committed Jul 29, 2022
1 parent 07c359d commit a3bab47
Show file tree
Hide file tree
Showing 22 changed files with 241 additions and 51 deletions.
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018-2021 Takuya Takeuchi
Copyright (c) 2018-2022 Takuya Takeuchi

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
77 changes: 77 additions & 0 deletions nuget/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
.DEFAULT_GOAL := help

help: ## print this message
@echo "Example operations by makefile."
@echo ""
@echo "Usage: make SUB_COMMAND argument_name=argument_value"
@echo ""
@echo "Command list:"
@echo ""
@printf "\033[36m%-40s\033[0m %-50s %s\n" "[Sub command]" "[Description]" "[Example]"
@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}'

run-build-centos7-cpu-x64-desktop: ## run build container for centos7 cpu x64 on desktop
@pwsh RunBuildContainer.ps1 cpu 64 desktop centos 7 "/x64"

run-build-centos7-mkl-x64-desktop: ## run build container for centos7 mkl x64 on desktop
@pwsh RunBuildContainer.ps1 mkl 64 desktop centos 7 "/x64"

run-build-ubuntu16-cpu-x64-desktop: ## run build container for ubuntu16 cpu x64 on desktop
@pwsh RunBuildContainer.ps1 cpu 64 desktop ubuntu 16 "/x64"

run-build-ubuntu16-mkl-x64-desktop: ## run build container for ubuntu16 mkl x64 on desktop
@pwsh RunBuildContainer.ps1 mkl 64 desktop ubuntu 16 "/x64"

run-test-centos7-cpu-x64-desktop: ## run build container for centos7 cpu x64 on desktop
@pwsh RunTestContainer.ps1 cpu 64 desktop centos 7 "/x64"

run-test-centos7-mkl-x64-desktop: ## run build container for centos7 mkl x64 on desktop
@pwsh RunTestContainer.ps1 mkl 64 desktop centos 7 "/x64"

run-test-centos7-cu92-x64-desktop: ## run build container for centos7 cuda-92 x64 on desktop
@pwsh RunTestContainer.ps1 cuda 64 desktop centos 7 "92"

run-test-centos7-cu100-x64-desktop: ## run build container for centos7 cuda-100 x64 on desktop
@pwsh RunTestContainer.ps1 cuda 64 desktop centos 7 "100"

run-test-centos7-cu101-x64-desktop: ## run build container for centos7 cuda-101 x64 on desktop
@pwsh RunTestContainer.ps1 cuda 64 desktop centos 7 "101"

run-test-centos7-cu102-x64-desktop: ## run build container for centos7 cuda-102 x64 on desktop
@pwsh RunTestContainer.ps1 cuda 64 desktop centos 7 "102"

run-test-centos7-cu110-x64-desktop: ## run build container for centos7 cuda-110 x64 on desktop
@pwsh RunTestContainer.ps1 cuda 64 desktop centos 7 "110"

run-test-centos7-cu111-x64-desktop: ## run build container for centos7 cuda-111 x64 on desktop
@pwsh RunTestContainer.ps1 cuda 64 desktop centos 7 "111"

run-test-centos7-cu112-x64-desktop: ## run build container for centos7 cuda-112 x64 on desktop
@pwsh RunTestContainer.ps1 cuda 64 desktop centos 7 "112"

run-test-centos7-cpu-x64-desktop: ## run build container for centos7 cpu x64 on desktop
@pwsh RunTestContainer.ps1 cpu 64 desktop ubuntu 16 "/x64"

run-test-ubuntu16-mkl-x64-desktop: ## run build container for ubuntu16 mkl x64 on desktop
@pwsh RunTestContainer.ps1 mkl 64 desktop ubuntu 16 "/x64"

run-test-ubuntu16-cu92-x64-desktop: ## run build container for ubuntu16 cuda-92 x64 on desktop
@pwsh RunTestContainer.ps1 cuda 64 desktop ubuntu 16 "92"

run-test-ubuntu16-cu100-x64-desktop: ## run build container for ubuntu16 cuda-100 x64 on desktop
@pwsh RunTestContainer.ps1 cuda 64 desktop ubuntu 16 "100"

run-test-ubuntu16-cu101-x64-desktop: ## run build container for ubuntu16 cuda-101 x64 on desktop
@pwsh RunTestContainer.ps1 cuda 64 desktop ubuntu 16 "101"

run-test-ubuntu16-cu102-x64-desktop: ## run build container for ubuntu16 cuda-102 x64 on desktop
@pwsh RunTestContainer.ps1 cuda 64 desktop ubuntu 16 "102"

run-test-ubuntu16-cu110-x64-desktop: ## run build container for ubuntu16 cuda-110 x64 on desktop
@pwsh RunTestContainer.ps1 cuda 64 desktop ubuntu 16 "110"

run-test-ubuntu16-cu111-x64-desktop: ## run build container for ubuntu16 cuda-111 x64 on desktop
@pwsh RunTestContainer.ps1 cuda 64 desktop ubuntu 16 "111"

run-test-ubuntu16-cu112-x64-desktop: ## run build container for ubuntu16 cuda-112 x64 on desktop
@pwsh RunTestContainer.ps1 cuda 64 desktop ubuntu 16 "112"
113 changes: 113 additions & 0 deletions nuget/RunTestContainer.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
#***************************************
#Arguments
#%1: Target (cpu/cuda/mkl/arm)
#%2: Architecture (32/64)
#%3: Platform (desktop,android/ios/uwp)
#%4: Optional Argument
# if Target is cuda, CUDA version if Target is cuda [90/91/92/100/101/102/110/111]
# if Target is mkl and Windows, IntelMKL directory path
#***************************************
Param
(
[Parameter(
Mandatory=$True,
Position = 1
)][string]
$Target,

[Parameter(
Mandatory=$True,
Position = 2
)][int]
$Architecture,

[Parameter(
Mandatory=$True,
Position = 3
)][string]
$Platform,

[Parameter(
Mandatory=$True,
Position = 4
)][string]
$Distribution,

[Parameter(
Mandatory=$True,
Position = 5
)][string]
$DistributionVersion,

[Parameter(
Mandatory=$False,
Position = 6
)][string]
$Option
)

$ScriptPath = $PSScriptRoot
$FaceRecognitionDotNetRoot = Split-Path $ScriptPath -Parent
$BuildUtilsPath = Join-Path $FaceRecognitionDotNetRoot "nuget" | `
Join-Path -ChildPath "BuildUtils.ps1"
import-module $BuildUtilsPath -function *
$Config = [Config]::new($FaceRecognitionDotNetRoot, "Release", $Target, $Architecture, $Platform, $Option)

$DataSetRoot = $env:DataSetDir
if (!(Test-Path($DataSetRoot)))
{
Write-Host "${DataSetRoot} is missing. You can specify DataSetDir environmental variable" -ForegroundColor Yellow
$DataSetRoot = $FaceRecognitionDotNetRoot
}

if ($Target -ne "cuda")
{
$postfix = $Option
$cuda = 0
$dockername = "facerecognition/test/$Distribution/$DistributionVersion/$Target" + $postfix
}
else
{
$cudaVersion = ($Option / 10).ToString("0.0")
$cuda = 1
$dockername = "facerecognition/test/$Distribution/$DistributionVersion/$Target/$cudaVersion"
}

if ($cuda -ne 0)
{
$dockerAPIVersion = docker version --format '{{.Server.APIVersion}}'
Write-Host "Docker API Version: $dockerAPIVersion" -ForegroundColor Yellow
if ($dockerAPIVersion -ge 1.40)
{
docker run --gpus all --rm `
--entrypoint="/bin/bash" `
-v "$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet" `
-v "$($DataSetRoot):/opt/data/Dataset" `
-e "LOCAL_UID=$(id -u $env:USER)" `
-e "LOCAL_GID=$(id -g $env:USER)" `
-w /opt/data/FaceRecognitionDotNet `
-it "$dockername"
}
else
{
docker run --runtime=nvidia --rm `
--entrypoint="/bin/bash" `
-v "$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet" `
-v "$($DataSetRoot):/opt/data/Dataset" `
-e "LOCAL_UID=$(id -u $env:USER)" `
-e "LOCAL_GID=$(id -g $env:USER)" `
-w /opt/data/FaceRecognitionDotNet `
-it "$dockername"
}
}
else
{
docker run --rm `
--entrypoint="/bin/bash" `
-v "$($FaceRecognitionDotNetRoot):/opt/data/FaceRecognitionDotNet" `
-v "$($DataSetRoot):/opt/data/Dataset" `
-e "LOCAL_UID=$(id -u $env:USER)" `
-e "LOCAL_GID=$(id -g $env:USER)" `
-w /opt/data/FaceRecognitionDotNet `
-it "$dockername"
}
8 changes: 4 additions & 4 deletions 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.6</version>
<version>1.3.0.7</version>
<title>FaceRecognitionDotNet</title>
<authors>Takuya Takeuchi</authors>
<owners>Takuya Takeuchi</owners>
Expand All @@ -14,17 +14,17 @@

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

<dependencies>
<group targetFramework="net461">
<dependency id="DlibDotNet" version="19.21.0.20210302" />
<dependency id="DlibDotNet" version="19.21.0.20220724" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="System.Drawing.Common" version="5.0.1" />
<dependency id="DlibDotNet" version="19.21.0.20210302" />
<dependency id="DlibDotNet" version="19.21.0.20220724" />
</group>
</dependencies>
<frameworkAssemblies>
Expand Down
8 changes: 4 additions & 4 deletions 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.6</version>
<version>1.3.0.7</version>
<title>FaceRecognitionDotNet for CUDA 10.0</title>
<authors>Takuya Takeuchi</authors>
<owners>Takuya Takeuchi</owners>
Expand All @@ -14,17 +14,17 @@

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

<dependencies>
<group targetFramework="net461">
<dependency id="DlibDotNet.CUDA100" version="19.21.0.20210302" />
<dependency id="DlibDotNet.CUDA100" version="19.21.0.20220724" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="System.Drawing.Common" version="5.0.1" />
<dependency id="DlibDotNet.CUDA100" version="19.21.0.20210302" />
<dependency id="DlibDotNet.CUDA100" version="19.21.0.20220724" />
</group>
</dependencies>
<frameworkAssemblies>
Expand Down
8 changes: 4 additions & 4 deletions nuget/nuspec/FaceRecognitionDotNet.CUDA101.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package>
<metadata>
<id>FaceRecognitionDotNet.CUDA101</id>
<version>1.3.0.6</version>
<version>1.3.0.7</version>
<title>FaceRecognitionDotNet for CUDA 10.1</title>
<authors>Takuya Takeuchi</authors>
<owners>Takuya Takeuchi</owners>
Expand All @@ -14,17 +14,17 @@

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

<dependencies>
<group targetFramework="net461">
<dependency id="DlibDotNet.CUDA101" version="19.21.0.20210302" />
<dependency id="DlibDotNet.CUDA101" version="19.21.0.20220724" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="System.Drawing.Common" version="5.0.1" />
<dependency id="DlibDotNet.CUDA101" version="19.21.0.20210302" />
<dependency id="DlibDotNet.CUDA101" version="19.21.0.20220724" />
</group>
</dependencies>
<frameworkAssemblies>
Expand Down
8 changes: 4 additions & 4 deletions nuget/nuspec/FaceRecognitionDotNet.CUDA102.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package>
<metadata>
<id>FaceRecognitionDotNet.CUDA102</id>
<version>1.3.0.6</version>
<version>1.3.0.7</version>
<title>FaceRecognitionDotNet for CUDA 10.2</title>
<authors>Takuya Takeuchi</authors>
<owners>Takuya Takeuchi</owners>
Expand All @@ -14,17 +14,17 @@

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

<dependencies>
<group targetFramework="net461">
<dependency id="DlibDotNet.CUDA102" version="19.21.0.20210302" />
<dependency id="DlibDotNet.CUDA102" version="19.21.0.20220724" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="System.Drawing.Common" version="5.0.1" />
<dependency id="DlibDotNet.CUDA102" version="19.21.0.20210302" />
<dependency id="DlibDotNet.CUDA102" version="19.21.0.20220724" />
</group>
</dependencies>
<frameworkAssemblies>
Expand Down
8 changes: 4 additions & 4 deletions nuget/nuspec/FaceRecognitionDotNet.CUDA110.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package>
<metadata>
<id>FaceRecognitionDotNet.CUDA110</id>
<version>1.3.0.6</version>
<version>1.3.0.7</version>
<title>FaceRecognitionDotNet for CUDA 11.0</title>
<authors>Takuya Takeuchi</authors>
<owners>Takuya Takeuchi</owners>
Expand All @@ -14,17 +14,17 @@

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

<dependencies>
<group targetFramework="net461">
<dependency id="DlibDotNet.CUDA110" version="19.21.0.20210302" />
<dependency id="DlibDotNet.CUDA110" version="19.21.0.20220724" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="System.Drawing.Common" version="5.0.1" />
<dependency id="DlibDotNet.CUDA110" version="19.21.0.20210302" />
<dependency id="DlibDotNet.CUDA110" version="19.21.0.20220724" />
</group>
</dependencies>
<frameworkAssemblies>
Expand Down
8 changes: 4 additions & 4 deletions nuget/nuspec/FaceRecognitionDotNet.CUDA111.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package>
<metadata>
<id>FaceRecognitionDotNet.CUDA111</id>
<version>1.3.0.6</version>
<version>1.3.0.7</version>
<title>FaceRecognitionDotNet for CUDA 11.1</title>
<authors>Takuya Takeuchi</authors>
<owners>Takuya Takeuchi</owners>
Expand All @@ -14,17 +14,17 @@

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

<dependencies>
<group targetFramework="net461">
<dependency id="DlibDotNet.CUDA111" version="19.21.0.20210302" />
<dependency id="DlibDotNet.CUDA111" version="19.21.0.20220724" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="System.Drawing.Common" version="5.0.1" />
<dependency id="DlibDotNet.CUDA111" version="19.21.0.20210302" />
<dependency id="DlibDotNet.CUDA111" version="19.21.0.20220724" />
</group>
</dependencies>
<frameworkAssemblies>
Expand Down
Loading

0 comments on commit a3bab47

Please sign in to comment.