Skip to content

Commit 8c1cbab

Browse files
Merge branch 'release/19.21.0.20210302'
2 parents 3c64e6e + cfd5258 commit 8c1cbab

33 files changed

+598
-598
lines changed

CreateSymlink.ps1

+171
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,171 @@
1+
#***************************************
2+
#Arguments
3+
#%1: CUDA (92,100,101,102,110,111)
4+
#***************************************
5+
Param([Parameter(
6+
Mandatory=$True,
7+
Position = 1
8+
)][string]
9+
$CUDA
10+
)
11+
12+
Set-StrictMode -Version Latest
13+
14+
# For windows
15+
16+
# For DlibDotNet.CUDA92
17+
$tmp92 = New-Object 'System.Collections.Generic.List[string]'
18+
$tmp92.Add("$env:CUDA_PATH_V9_2\bin\cublas64_92.dll")
19+
$tmp92.Add("$env:CUDA_PATH_V9_2\bin\cudnn64_7.dll")
20+
$tmp92.Add("$env:CUDA_PATH_V9_2\bin\curand64_92.dll")
21+
$tmp92.Add("$env:CUDA_PATH_V9_2\bin\cusolver64_92.dll")
22+
23+
# For DlibDotNet.CUDA100
24+
$tmp100 = New-Object 'System.Collections.Generic.List[string]'
25+
$tmp100.Add("$env:CUDA_PATH_V10_0\bin\cublas64_100.dll")
26+
$tmp100.Add("$env:CUDA_PATH_V10_0\bin\cudnn64_7.dll")
27+
$tmp100.Add("$env:CUDA_PATH_V10_0\bin\curand64_100.dll")
28+
$tmp100.Add("$env:CUDA_PATH_V10_0\bin\cusolver64_100.dll")
29+
30+
# For DlibDotNet.CUDA101
31+
$tmp101 = New-Object 'System.Collections.Generic.List[string]'
32+
$tmp101.Add("$env:CUDA_PATH_V10_1\bin\cublas64_10.dll")
33+
$tmp101.Add("$env:CUDA_PATH_V10_1\bin\cudnn64_7.dll")
34+
$tmp101.Add("$env:CUDA_PATH_V10_1\bin\curand64_10.dll")
35+
$tmp101.Add("$env:CUDA_PATH_V10_1\bin\cusolver64_10.dll")
36+
37+
# For DlibDotNet.CUDA102
38+
$tmp102 = New-Object 'System.Collections.Generic.List[string]'
39+
$tmp102.Add("$env:CUDA_PATH_V10_2\bin\cublas64_10.dll")
40+
$tmp102.Add("$env:CUDA_PATH_V10_2\bin\cudnn64_7.dll")
41+
$tmp102.Add("$env:CUDA_PATH_V10_2\bin\curand64_10.dll")
42+
$tmp102.Add("$env:CUDA_PATH_V10_2\bin\cusolver64_10.dll")
43+
44+
# For DlibDotNet.CUDA110
45+
$tmp110 = New-Object 'System.Collections.Generic.List[string]'
46+
$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cublas64_11.dll")
47+
$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cublasLt64_11.dll")
48+
$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cudnn_adv_infer64_8.dll")
49+
$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cudnn_adv_train64_8.dll")
50+
$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cudnn_cnn_infer64_8.dll")
51+
$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cudnn_cnn_train64_8.dll")
52+
$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cudnn_ops_infer64_8.dll")
53+
$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cudnn_ops_train64_8.dll")
54+
$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cudnn64_8.dll")
55+
$tmp110.Add("$env:CUDA_PATH_V11_0\bin\curand64_10.dll")
56+
$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cusolver64_10.dll")
57+
58+
# For DlibDotNet.CUDA111
59+
$tmp111 = New-Object 'System.Collections.Generic.List[string]'
60+
$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cublas64_11.dll")
61+
$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cublasLt64_11.dll")
62+
$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cudnn_adv_infer64_8.dll")
63+
$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cudnn_adv_train64_8.dll")
64+
$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cudnn_cnn_infer64_8.dll")
65+
$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cudnn_cnn_train64_8.dll")
66+
$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cudnn_ops_infer64_8.dll")
67+
$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cudnn_ops_train64_8.dll")
68+
$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cudnn64_8.dll")
69+
$tmp111.Add("$env:CUDA_PATH_V11_1\bin\curand64_10.dll")
70+
$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cusolver64_11.dll")
71+
72+
$BuildTargets = @()
73+
$BuildTargets += New-Object PSObject -Property @{Package = "92"; Dependencies = $tmp92 }
74+
$BuildTargets += New-Object PSObject -Property @{Package = "100"; Dependencies = $tmp100 }
75+
$BuildTargets += New-Object PSObject -Property @{Package = "101"; Dependencies = $tmp101 }
76+
$BuildTargets += New-Object PSObject -Property @{Package = "102"; Dependencies = $tmp102 }
77+
$BuildTargets += New-Object PSObject -Property @{Package = "110"; Dependencies = $tmp110 }
78+
$BuildTargets += New-Object PSObject -Property @{Package = "111"; Dependencies = $tmp111 }
79+
80+
# Store current directory
81+
$DlibDotNetRoot = $PSScriptRoot
82+
83+
$Libraries = $Null
84+
foreach ($Target in $BuildTargets)
85+
{
86+
if ($Target.Package -eq $CUDA)
87+
{
88+
$Libraries = $Target.Dependencies
89+
break
90+
}
91+
}
92+
93+
if ($Libraries -eq $Null)
94+
{
95+
Write-Host "${CUDA} is invalid parameter" -ForegroundColor Red
96+
exit
97+
}
98+
99+
$BuildConfiguration = "Release"
100+
101+
$BuildLibraryWindowsHash =
102+
@{
103+
"DlibDotNet.Native" = (Join-Path $BuildConfiguration "DlibDotNetNative.dll");
104+
"DlibDotNet.Native.Dnn" = (Join-Path $BuildConfiguration "DlibDotNetNativeDnn.dll")
105+
}
106+
107+
$SourceDir = Join-Path $DlibDotNetRoot src
108+
$BuildDir = "build_win_desktop_cuda-${CUDA}_x64"
109+
110+
$Files = Get-ChildItem -Recurse -Name -include *.csproj
111+
112+
$re = New-Object regex("<TargetFramework>(?<Version>[^<]+)</TargetFramework>")
113+
foreach ($File in $Files)
114+
{
115+
$ProjectRoot = Split-Path ${file} -Parent
116+
$ProjectRoot = Join-Path ${DlibDotNetRoot} ${ProjectRoot}
117+
118+
# check framework version
119+
$ProjectFile = Get-Content ${file}
120+
$Match = $re.Matches(${ProjectFile})
121+
if ($Match -ne $Null)
122+
{
123+
$Version = $Match.Groups[1].Value
124+
125+
$Configurations = @( "Release", "Debug" )
126+
foreach ($Configuration in $Configurations)
127+
{
128+
$TargetDir = Join-Path $ProjectRoot bin | `
129+
Join-Path -ChildPath $Configuration | `
130+
Join-Path -ChildPath $Version
131+
132+
if (!(Test-Path $TargetDir))
133+
{
134+
New-Item $TargetDir -ItemType Directory | Out-Null
135+
}
136+
137+
foreach ($Library in $Libraries)
138+
{
139+
$FileName = Split-Path $Library -Leaf
140+
$FilePath = Join-Path $TargetDir $FileName
141+
142+
if ((Test-Path $FilePath))
143+
{
144+
Remove-Item $FilePath
145+
}
146+
147+
New-Item -Value "$Library" -Path "$TargetDir" -Name "$FileName" -ItemType SymbolicLink > $null
148+
}
149+
150+
foreach ($key in $BuildLibraryWindowsHash.keys)
151+
{
152+
$SrcDir = Join-Path $SourceDir $key | `
153+
Join-Path -ChildPath $BuildDir
154+
$Dll = $BuildLibraryWindowsHash[$key]
155+
$FileName = Split-Path $Dll -Leaf
156+
$FilePath = Join-Path $TargetDir $FileName
157+
$Library = Join-Path $SrcDir $Dll
158+
159+
if ((Test-Path $FilePath))
160+
{
161+
Remove-Item $FilePath
162+
}
163+
164+
New-Item -Value "$Library" -Path "$TargetDir" -Name "$FileName" -ItemType SymbolicLink > $null
165+
}
166+
}
167+
}
168+
}
169+
170+
# Move to Root directory
171+
Set-Location -Path $DlibDotNetRoot

DlibDotNet.json

-24
This file was deleted.

DlibDotNet.sln

-38
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "3DPointCloud", "examples\3D
3939
EndProject
4040
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Surf", "examples\Surf\Surf.csproj", "{6E027771-5500-4555-822C-C7FE6AC8709D}"
4141
EndProject
42-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DlibDotNet.Extensions", "src\DlibDotNet.Extensions\DlibDotNet.Extensions.csproj", "{D3BFF103-53CB-46DC-A0E8-05A01E11099B}"
43-
EndProject
4442
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WinForms", "WinForms", "{4082257D-FC8E-4D37-8489-89AAFC9D4A38}"
4543
EndProject
4644
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FaceDetection", "examples\WinForms\FaceDetection\FaceDetection.csproj", "{1523DA42-DB7E-47B5-8AE6-305100F3891A}"
@@ -53,8 +51,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FaceLandmarkDetection", "ex
5351
EndProject
5452
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FaceLandmarkDetection", "examples\WPF\FaceLandmarkDetection\FaceLandmarkDetection.csproj", "{9575AC94-3760-483F-9403-A77E7CFE8F47}"
5553
EndProject
56-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DlibDotNet.Extensions.Tests", "test\DlibDotNet.Extensions.Tests\DlibDotNet.Extensions.Tests.csproj", "{2A75C8B3-5122-4E7E-A0CF-A0AD5FFA60B2}"
57-
EndProject
5854
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DnnFaceRecognition", "examples\DnnFaceRecognition\DnnFaceRecognition.csproj", "{C6EFE2AC-63BD-4574-B4A1-9AC80CA5AD2E}"
5955
EndProject
6056
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DnnMmodFaceDetection", "examples\DnnMmodFaceDetection\DnnMmodFaceDetection.csproj", "{A6302463-CC32-4060-B8DF-466479046038}"
@@ -383,22 +379,6 @@ Global
383379
{6E027771-5500-4555-822C-C7FE6AC8709D}.Release|x64.Build.0 = Release|Any CPU
384380
{6E027771-5500-4555-822C-C7FE6AC8709D}.Release|x86.ActiveCfg = Release|Any CPU
385381
{6E027771-5500-4555-822C-C7FE6AC8709D}.Release|x86.Build.0 = Release|Any CPU
386-
{D3BFF103-53CB-46DC-A0E8-05A01E11099B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
387-
{D3BFF103-53CB-46DC-A0E8-05A01E11099B}.Debug|Any CPU.Build.0 = Debug|Any CPU
388-
{D3BFF103-53CB-46DC-A0E8-05A01E11099B}.Debug|ARM.ActiveCfg = Debug|Any CPU
389-
{D3BFF103-53CB-46DC-A0E8-05A01E11099B}.Debug|ARM.Build.0 = Debug|Any CPU
390-
{D3BFF103-53CB-46DC-A0E8-05A01E11099B}.Debug|x64.ActiveCfg = Debug|Any CPU
391-
{D3BFF103-53CB-46DC-A0E8-05A01E11099B}.Debug|x64.Build.0 = Debug|Any CPU
392-
{D3BFF103-53CB-46DC-A0E8-05A01E11099B}.Debug|x86.ActiveCfg = Debug|Any CPU
393-
{D3BFF103-53CB-46DC-A0E8-05A01E11099B}.Debug|x86.Build.0 = Debug|Any CPU
394-
{D3BFF103-53CB-46DC-A0E8-05A01E11099B}.Release|Any CPU.ActiveCfg = Release|Any CPU
395-
{D3BFF103-53CB-46DC-A0E8-05A01E11099B}.Release|Any CPU.Build.0 = Release|Any CPU
396-
{D3BFF103-53CB-46DC-A0E8-05A01E11099B}.Release|ARM.ActiveCfg = Release|Any CPU
397-
{D3BFF103-53CB-46DC-A0E8-05A01E11099B}.Release|ARM.Build.0 = Release|Any CPU
398-
{D3BFF103-53CB-46DC-A0E8-05A01E11099B}.Release|x64.ActiveCfg = Release|Any CPU
399-
{D3BFF103-53CB-46DC-A0E8-05A01E11099B}.Release|x64.Build.0 = Release|Any CPU
400-
{D3BFF103-53CB-46DC-A0E8-05A01E11099B}.Release|x86.ActiveCfg = Release|Any CPU
401-
{D3BFF103-53CB-46DC-A0E8-05A01E11099B}.Release|x86.Build.0 = Release|Any CPU
402382
{1523DA42-DB7E-47B5-8AE6-305100F3891A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
403383
{1523DA42-DB7E-47B5-8AE6-305100F3891A}.Debug|Any CPU.Build.0 = Debug|Any CPU
404384
{1523DA42-DB7E-47B5-8AE6-305100F3891A}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -463,22 +443,6 @@ Global
463443
{9575AC94-3760-483F-9403-A77E7CFE8F47}.Release|x64.Build.0 = Release|Any CPU
464444
{9575AC94-3760-483F-9403-A77E7CFE8F47}.Release|x86.ActiveCfg = Release|Any CPU
465445
{9575AC94-3760-483F-9403-A77E7CFE8F47}.Release|x86.Build.0 = Release|Any CPU
466-
{2A75C8B3-5122-4E7E-A0CF-A0AD5FFA60B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
467-
{2A75C8B3-5122-4E7E-A0CF-A0AD5FFA60B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
468-
{2A75C8B3-5122-4E7E-A0CF-A0AD5FFA60B2}.Debug|ARM.ActiveCfg = Debug|Any CPU
469-
{2A75C8B3-5122-4E7E-A0CF-A0AD5FFA60B2}.Debug|ARM.Build.0 = Debug|Any CPU
470-
{2A75C8B3-5122-4E7E-A0CF-A0AD5FFA60B2}.Debug|x64.ActiveCfg = Debug|Any CPU
471-
{2A75C8B3-5122-4E7E-A0CF-A0AD5FFA60B2}.Debug|x64.Build.0 = Debug|Any CPU
472-
{2A75C8B3-5122-4E7E-A0CF-A0AD5FFA60B2}.Debug|x86.ActiveCfg = Debug|Any CPU
473-
{2A75C8B3-5122-4E7E-A0CF-A0AD5FFA60B2}.Debug|x86.Build.0 = Debug|Any CPU
474-
{2A75C8B3-5122-4E7E-A0CF-A0AD5FFA60B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
475-
{2A75C8B3-5122-4E7E-A0CF-A0AD5FFA60B2}.Release|Any CPU.Build.0 = Release|Any CPU
476-
{2A75C8B3-5122-4E7E-A0CF-A0AD5FFA60B2}.Release|ARM.ActiveCfg = Release|Any CPU
477-
{2A75C8B3-5122-4E7E-A0CF-A0AD5FFA60B2}.Release|ARM.Build.0 = Release|Any CPU
478-
{2A75C8B3-5122-4E7E-A0CF-A0AD5FFA60B2}.Release|x64.ActiveCfg = Release|Any CPU
479-
{2A75C8B3-5122-4E7E-A0CF-A0AD5FFA60B2}.Release|x64.Build.0 = Release|Any CPU
480-
{2A75C8B3-5122-4E7E-A0CF-A0AD5FFA60B2}.Release|x86.ActiveCfg = Release|Any CPU
481-
{2A75C8B3-5122-4E7E-A0CF-A0AD5FFA60B2}.Release|x86.Build.0 = Release|Any CPU
482446
{C6EFE2AC-63BD-4574-B4A1-9AC80CA5AD2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
483447
{C6EFE2AC-63BD-4574-B4A1-9AC80CA5AD2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
484448
{C6EFE2AC-63BD-4574-B4A1-9AC80CA5AD2E}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1142,14 +1106,12 @@ Global
11421106
{7945CA45-B9C6-4EDF-9794-6B3B9DD9EE5E} = {19C83FDC-2BC9-42D6-9F51-3A0B822FABAD}
11431107
{B16B534A-75FA-4299-9EF9-F4DF801266A0} = {19C83FDC-2BC9-42D6-9F51-3A0B822FABAD}
11441108
{6E027771-5500-4555-822C-C7FE6AC8709D} = {19C83FDC-2BC9-42D6-9F51-3A0B822FABAD}
1145-
{D3BFF103-53CB-46DC-A0E8-05A01E11099B} = {A9E3AD0D-91F4-48B4-9509-5C06B54C7374}
11461109
{4082257D-FC8E-4D37-8489-89AAFC9D4A38} = {19C83FDC-2BC9-42D6-9F51-3A0B822FABAD}
11471110
{1523DA42-DB7E-47B5-8AE6-305100F3891A} = {4082257D-FC8E-4D37-8489-89AAFC9D4A38}
11481111
{5452AAEA-A679-4056-A2F7-8B6F8137CCAC} = {19C83FDC-2BC9-42D6-9F51-3A0B822FABAD}
11491112
{9575AC94-3760-483F-9403-A77E7CFE8F46} = {5452AAEA-A679-4056-A2F7-8B6F8137CCAC}
11501113
{1523DA42-DB7E-47B5-8AE6-305100F3891B} = {4082257D-FC8E-4D37-8489-89AAFC9D4A38}
11511114
{9575AC94-3760-483F-9403-A77E7CFE8F47} = {5452AAEA-A679-4056-A2F7-8B6F8137CCAC}
1152-
{2A75C8B3-5122-4E7E-A0CF-A0AD5FFA60B2} = {44730D39-C672-4CC0-B983-26CC9D7E59C1}
11531115
{C6EFE2AC-63BD-4574-B4A1-9AC80CA5AD2E} = {19C83FDC-2BC9-42D6-9F51-3A0B822FABAD}
11541116
{A6302463-CC32-4060-B8DF-466479046038} = {19C83FDC-2BC9-42D6-9F51-3A0B822FABAD}
11551117
{4DF84F72-0995-44ED-AC0A-A07327F078A2} = {19C83FDC-2BC9-42D6-9F51-3A0B822FABAD}

0 commit comments

Comments
 (0)