Support 19.21 (#221)

* feat: Add LoadPng from png buffer * feat; Support CUDA 110 and 111 * feat: Update to dlib 19.21
takuya-takeuchi · Nov 22, 2020 · 7cac6c3 · 7cac6c3
1 parent 240b794
commit 7cac6c3
Show file tree

Hide file tree

Showing 45 changed files with 393 additions and 47 deletions.
diff --git a/...ase/centos/7/cuda/11.0/Dockerfile.ignored → docker/base/centos/7/cuda/11.0/Dockerfile b/...ase/centos/7/cuda/11.0/Dockerfile.ignored → docker/base/centos/7/cuda/11.0/Dockerfile
diff --git a/docker/base/centos/7/cuda/11.1/Dockerfile b/docker/base/centos/7/cuda/11.1/Dockerfile
@@ -0,0 +1,12 @@
+FROM nvidia/cuda:11.1-cudnn8-devel-centos7
+LABEL maintainer "Takuya Takeuchi <takuya.takeuchi.dev@gmail.com>"
+
+# install package to build
+RUN yum update -y && 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 && yum install -y \
+    libX11-devel \
+    lapack-devel \
+    openblas-devel \
+ && yum clean all
diff --git a/docker/base/ubuntu/16/cuda/11.1/Dockerfile b/docker/base/ubuntu/16/cuda/11.1/Dockerfile
@@ -0,0 +1,9 @@
+FROM nvidia/cuda:11.1-cudnn8-devel-ubuntu16.04
+LABEL maintainer "Takuya Takeuchi <takuya.takeuchi.dev@gmail.com>"
+
+# 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/*
diff --git a/...vel/centos/7/cuda/11.0/Dockerfile.ignored → docker/devel/centos/7/cuda/11.0/Dockerfile b/...vel/centos/7/cuda/11.0/Dockerfile.ignored → docker/devel/centos/7/cuda/11.0/Dockerfile
diff --git a/docker/devel/centos/7/cuda/11.1/Dockerfile b/docker/devel/centos/7/cuda/11.1/Dockerfile
@@ -0,0 +1,47 @@
+FROM nvidia/cuda:11.1-cudnn8-devel-centos7
+LABEL maintainer "Takuya Takeuchi <takuya.takeuchi.dev@gmail.com>"
+
+# install package to build
+RUN yum update -y && 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 && 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 && 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 && 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
diff --git a/docker/devel/ubuntu/16/cuda/11.1/Dockerfile b/docker/devel/ubuntu/16/cuda/11.1/Dockerfile
@@ -0,0 +1,35 @@
+FROM nvidia/cuda:11.1-cudnn8-devel-ubuntu16.04
+LABEL maintainer "Takuya Takeuchi <takuya.takeuchi.dev@gmail.com>"
+
+# install package to build
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    libopenblas-dev \
+    liblapack-dev \
+    libx11-dev \
+    cmake \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# 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 apt-get update && apt-get install -y \
+    wget \
+    apt-transport-https
+RUN wget -q https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb
+RUN dpkg -i packages-microsoft-prod.deb && rm packages-microsoft-prod.deb
+RUN apt-get update && apt-get install -y \
+    powershell \
+ && apt-get clean && rm -rf /var/lib/apt/lists/*
diff --git a/nuget/BuildCentOS7.ps1 b/nuget/BuildCentOS7.ps1
@@ -37,6 +37,7 @@ $BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target =
 $BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = "";     RID = "$OperatingSystem-x64";   CUDA = 101 }
 $BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = "";     RID = "$OperatingSystem-x64";   CUDA = 102 }
 $BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = "";     RID = "$OperatingSystem-x64";   CUDA = 110 }
+$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = "";     RID = "$OperatingSystem-x64";   CUDA = 111 }
 #$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "arm";  Architecture = 64; Postfix = "64";   RID = "$OperatingSystem-arm64"; CUDA = 0   }
 #$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "arm";  Architecture = 32; Postfix = "";     RID = "$OperatingSystem-arm";   CUDA = 0   }
 

diff --git a/nuget/BuildUbuntu16.ps1 b/nuget/BuildUbuntu16.ps1
@@ -37,6 +37,7 @@ $BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target =
 $BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = "";     RID = "$OperatingSystem-x64";   CUDA = 101 }
 $BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = "";     RID = "$OperatingSystem-x64";   CUDA = 102 }
 $BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = "";     RID = "$OperatingSystem-x64";   CUDA = 110 }
+$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "cuda"; Architecture = 64; Postfix = "";     RID = "$OperatingSystem-x64";   CUDA = 111 }
 #$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "arm";  Architecture = 64; Postfix = "64";   RID = "$OperatingSystem-arm64"; CUDA = 0   }
 #$BuildTargets += New-Object PSObject -Property @{ Platform = "desktop"; Target = "arm";  Architecture = 32; Postfix = "";     RID = "$OperatingSystem-arm";   CUDA = 0   }
 

diff --git a/nuget/BuildUtils.ps1 b/nuget/BuildUtils.ps1
@@ -37,7 +37,8 @@ class Config
       100,
       101,
       102,
-      110
+      110,
+      111
    )
 
    $CudaVersionHash =
@@ -48,7 +49,8 @@ class Config
       100 = "CUDA_PATH_V10_0";
       101 = "CUDA_PATH_V10_1";
       102 = "CUDA_PATH_V10_2";
-      110 = "CUDA_PATH_V11_0"
+      110 = "CUDA_PATH_V11_0";
+      111 = "CUDA_PATH_V11_1";
    }
 
    $VisualStudio = "Visual Studio 15 2017"

diff --git a/nuget/BuildWindows.ps1 b/nuget/BuildWindows.ps1
@@ -39,6 +39,7 @@ $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture =
 $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; RID = "$OperatingSystem-x64";   CUDA = 101 }
 $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; RID = "$OperatingSystem-x64";   CUDA = 102 }
 $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; RID = "$OperatingSystem-x64";   CUDA = 110 }
+$BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; RID = "$OperatingSystem-x64";   CUDA = 111 }
 
 foreach ($BuildTarget in $BuildTargets)
 {

diff --git a/nuget/CreateAllPackage.bat b/nuget/CreateAllPackage.bat
@@ -6,6 +6,8 @@ pwsh CreatePackage.ps1 CUDA-92
 pwsh CreatePackage.ps1 CUDA-100
 pwsh CreatePackage.ps1 CUDA-101
 pwsh CreatePackage.ps1 CUDA-102
+pwsh CreatePackage.ps1 CUDA-110
+pwsh CreatePackage.ps1 CUDA-111
 pwsh CreatePackage.ps1 MKL
 pwsh CreatePackage.ps1 UWP
 

diff --git a/nuget/Publish.bat b/nuget/Publish.bat
@@ -1,4 +1,6 @@
 dotnet nuget push DlibDotNet.MKL.%1.nupkg -k %2 -s https://api.nuget.org/v3/index.json
+dotnet nuget push DlibDotNet.CUDA111.%1.nupkg -k %2 -s https://api.nuget.org/v3/index.json
+dotnet nuget push DlibDotNet.CUDA110.%1.nupkg -k %2 -s https://api.nuget.org/v3/index.json
 dotnet nuget push DlibDotNet.CUDA102.%1.nupkg -k %2 -s https://api.nuget.org/v3/index.json
 dotnet nuget push DlibDotNet.CUDA101.%1.nupkg -k %2 -s https://api.nuget.org/v3/index.json
 dotnet nuget push DlibDotNet.CUDA100.%1.nupkg -k %2 -s https://api.nuget.org/v3/index.json

diff --git a/nuget/TestPackage.ps1 b/nuget/TestPackage.ps1
@@ -96,8 +96,7 @@ function RunTest($BuildTargets)
       # Copy Dependencies
       $OutDir = Join-Path $TargetDir bin | `
                   Join-Path -ChildPath Release | `
-                  Join-Path -ChildPath netcoreapp2.0 | `
-                  Join-Path -ChildPath $RuntimeIdentifier
+                  Join-Path -ChildPath netcoreapp2.0
       if (!(Test-Path "$OutDir")) {
          New-Item "$OutDir" -ItemType Directory > $null
       }
@@ -108,7 +107,8 @@ function RunTest($BuildTargets)
          {
             foreach($Dependency in $BuildTarget.Dependencies)
             {
-               Copy-Item "$Dependency" "$OutDir"
+               $FileName = [System.IO.Path]::GetFileName("$Dependency")
+               New-Item -Value "$Dependency" -Path "$OutDir" -Name "$FileName" -ItemType SymbolicLink > $null
             }
          }
       }
@@ -214,11 +214,32 @@ $tmp102.Add("$env:CUDA_PATH_V10_2\bin\curand64_10.dll")
 $tmp102.Add("$env:CUDA_PATH_V10_2\bin\cusolver64_10.dll")
 
 # For DlibDotNet.CUDA110
-$tmp102 = New-Object 'System.Collections.Generic.List[string]'
-$tmp102.Add("$env:CUDA_PATH_V10_2\bin\cublas64_11.dll")
-$tmp102.Add("$env:CUDA_PATH_V10_2\bin\cudnn64_8.dll")
-$tmp102.Add("$env:CUDA_PATH_V10_2\bin\curand64_10.dll")
-$tmp102.Add("$env:CUDA_PATH_V10_2\bin\cusolver64_10.dll")
+$tmp110 = New-Object 'System.Collections.Generic.List[string]'
+$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cublas64_11.dll")
+$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cublasLt64_11.dll")
+$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cudnn_adv_infer64_8.dll")
+$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cudnn_adv_train64_8.dll")
+$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cudnn_cnn_infer64_8.dll")
+$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cudnn_cnn_train64_8.dll")
+$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cudnn_ops_infer64_8.dll")
+$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cudnn_ops_train64_8.dll")
+$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cudnn64_8.dll")
+$tmp110.Add("$env:CUDA_PATH_V11_0\bin\curand64_10.dll")
+$tmp110.Add("$env:CUDA_PATH_V11_0\bin\cusolver64_10.dll")
+
+# For DlibDotNet.CUDA111
+$tmp111 = New-Object 'System.Collections.Generic.List[string]'
+$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cublas64_11.dll")
+$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cublasLt64_11.dll")
+$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cudnn_adv_infer64_8.dll")
+$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cudnn_adv_train64_8.dll")
+$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cudnn_cnn_infer64_8.dll")
+$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cudnn_cnn_train64_8.dll")
+$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cudnn_ops_infer64_8.dll")
+$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cudnn_ops_train64_8.dll")
+$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cudnn64_8.dll")
+$tmp111.Add("$env:CUDA_PATH_V11_1\bin\curand64_10.dll")
+$tmp111.Add("$env:CUDA_PATH_V11_1\bin\cusolver64_11.dll")
 
 $BuildTargets = @()
 $BuildTargets += New-Object PSObject -Property @{PlatformTarget = "x64"; Architecture = 64; Package = "DlibDotNet";         Dependencies = $null     }
@@ -230,6 +251,7 @@ $BuildTargets += New-Object PSObject -Property @{PlatformTarget = "x64"; Archite
 $BuildTargets += New-Object PSObject -Property @{PlatformTarget = "x64"; Architecture = 64; Package = "DlibDotNet.CUDA101"; Dependencies = $tmp101   }
 $BuildTargets += New-Object PSObject -Property @{PlatformTarget = "x64"; Architecture = 64; Package = "DlibDotNet.CUDA102"; Dependencies = $tmp102   }
 $BuildTargets += New-Object PSObject -Property @{PlatformTarget = "x64"; Architecture = 64; Package = "DlibDotNet.CUDA110"; Dependencies = $tmp110   }
+$BuildTargets += New-Object PSObject -Property @{PlatformTarget = "x64"; Architecture = 64; Package = "DlibDotNet.CUDA111"; Dependencies = $tmp111   }
 $BuildTargets += New-Object PSObject -Property @{PlatformTarget = "x64"; Architecture = 64; Package = "DlibDotNet.MKL";     Dependencies = $null     }
 $BuildTargets += New-Object PSObject -Property @{PlatformTarget = "x86"; Architecture = 32; Package = "DlibDotNet.MKL";     Dependencies = $null     }
 $BuildTargets += New-Object PSObject -Property @{PlatformTarget = "arm"; Architecture = 32; Package = "DlibDotNet.ARM";     Dependencies = $null     }

diff --git a/nuget/TestPackageCentOS7.ps1 b/nuget/TestPackageCentOS7.ps1
@@ -37,7 +37,8 @@ $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture =
 $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 100; Package = "DlibDotNet.CUDA100"; PlatformTarget="x64"; Postfix = "";     RID = "$RidOperatingSystem-x64"; }
 $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 101; Package = "DlibDotNet.CUDA101"; PlatformTarget="x64"; Postfix = "";     RID = "$RidOperatingSystem-x64"; }
 $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 102; Package = "DlibDotNet.CUDA102"; PlatformTarget="x64"; Postfix = "";     RID = "$RidOperatingSystem-x64"; }
-$BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 102; Package = "DlibDotNet.CUDA110"; PlatformTarget="x64"; Postfix = "";     RID = "$RidOperatingSystem-x64"; }
+$BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 110; Package = "DlibDotNet.CUDA110"; PlatformTarget="x64"; Postfix = "";     RID = "$RidOperatingSystem-x64"; }
+$BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 111; Package = "DlibDotNet.CUDA111"; PlatformTarget="x64"; Postfix = "";     RID = "$RidOperatingSystem-x64"; }
 
 foreach($BuildTarget in $BuildTargets)
 {
@@ -76,7 +77,7 @@ foreach($BuildTarget in $BuildTargets)
       Write-Host "Docker API Version: $dockerAPIVersion" -ForegroundColor Yellow
       if ($dockerAPIVersion -ge 1.40)
       {
-         Write-Host "Start docker run --gpus all --rm -v ""$($DlibDotNetRoot):/opt/data/DlibDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t ""$dockername"" $Version $package $OperatingSystem $OperatingSystemVersion" -ForegroundColor Green
+         Write-Host "Start docker run --gpus all --rm -v ""$($DlibDotNetRoot):/opt/data/DlibDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t ""$dockername"" $Version $package $platformTarget $rid" -ForegroundColor Green
          docker run --gpus all --rm `
                      -v "$($DlibDotNetRoot):/opt/data/DlibDotNet" `
                      -e "LOCAL_UID=$(id -u $env:USER)" `
@@ -85,7 +86,7 @@ foreach($BuildTarget in $BuildTargets)
       }
       else
       {
-         Write-Host "Start docker run --runtime=nvidia --rm -v ""$($DlibDotNetRoot):/opt/data/DlibDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t ""$dockername"" $Version $package $OperatingSystem $OperatingSystemVersion" -ForegroundColor Green
+         Write-Host "Start docker run --runtime=nvidia --rm -v ""$($DlibDotNetRoot):/opt/data/DlibDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t ""$dockername"" $Version $package $platformTarget $rid" -ForegroundColor Green
          docker run --runtime=nvidia --rm `
                      -v "$($DlibDotNetRoot):/opt/data/DlibDotNet" `
                      -e "LOCAL_UID=$(id -u $env:USER)" `
@@ -95,7 +96,7 @@ foreach($BuildTarget in $BuildTargets)
    }
    else
    {
-      Write-Host "Start docker run --rm -v ""$($DlibDotNetRoot):/opt/data/DlibDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t ""$dockername"" $Version $package $OperatingSystem $OperatingSystemVersion" -ForegroundColor Green
+      Write-Host "Start docker run --rm -v ""$($DlibDotNetRoot):/opt/data/DlibDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t ""$dockername"" $Version $package $platformTarget $rid" -ForegroundColor Green
       docker run --rm `
                   -v "$($DlibDotNetRoot):/opt/data/DlibDotNet" `
                   -e "LOCAL_UID=$(id -u $env:USER)" `

diff --git a/nuget/TestPackageUbuntu16.ps1 b/nuget/TestPackageUbuntu16.ps1
@@ -37,7 +37,8 @@ $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture =
 $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 100; Package = "DlibDotNet.CUDA100"; PlatformTarget="x64"; Postfix = "";     RID = "$RidOperatingSystem-x64"; }
 $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 101; Package = "DlibDotNet.CUDA101"; PlatformTarget="x64"; Postfix = "";     RID = "$RidOperatingSystem-x64"; }
 $BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 102; Package = "DlibDotNet.CUDA102"; PlatformTarget="x64"; Postfix = "";     RID = "$RidOperatingSystem-x64"; }
-$BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 102; Package = "DlibDotNet.CUDA110"; PlatformTarget="x64"; Postfix = "";     RID = "$RidOperatingSystem-x64"; }
+$BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 110; Package = "DlibDotNet.CUDA110"; PlatformTarget="x64"; Postfix = "";     RID = "$RidOperatingSystem-x64"; }
+$BuildTargets += New-Object PSObject -Property @{Target = "cuda"; Architecture = 64; CUDA = 111; Package = "DlibDotNet.CUDA111"; PlatformTarget="x64"; Postfix = "";     RID = "$RidOperatingSystem-x64"; }
 
 foreach($BuildTarget in $BuildTargets)
 {
@@ -76,7 +77,7 @@ foreach($BuildTarget in $BuildTargets)
       Write-Host "Docker API Version: $dockerAPIVersion" -ForegroundColor Yellow
       if ($dockerAPIVersion -ge 1.40)
       {
-         Write-Host "Start docker run --gpus all --rm -v ""$($DlibDotNetRoot):/opt/data/DlibDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t ""$dockername"" $Version $package $OperatingSystem $OperatingSystemVersion" -ForegroundColor Green
+         Write-Host "Start docker run --gpus all --rm -v ""$($DlibDotNetRoot):/opt/data/DlibDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t ""$dockername"" $Version $package $platformTarget $rid" -ForegroundColor Green
          docker run --gpus all --rm `
                      -v "$($DlibDotNetRoot):/opt/data/DlibDotNet" `
                      -e "LOCAL_UID=$(id -u $env:USER)" `
@@ -85,7 +86,7 @@ foreach($BuildTarget in $BuildTargets)
       }
       else
       {
-         Write-Host "Start docker run --runtime=nvidia --rm -v ""$($DlibDotNetRoot):/opt/data/DlibDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t ""$dockername"" $Version $package $OperatingSystem $OperatingSystemVersion" -ForegroundColor Green
+         Write-Host "Start docker run --runtime=nvidia --rm -v ""$($DlibDotNetRoot):/opt/data/DlibDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t ""$dockername"" $Version $package $platformTarget $rid" -ForegroundColor Green
          docker run --runtime=nvidia --rm `
                      -v "$($DlibDotNetRoot):/opt/data/DlibDotNet" `
                      -e "LOCAL_UID=$(id -u $env:USER)" `
@@ -95,7 +96,7 @@ foreach($BuildTarget in $BuildTargets)
    }
    else
    {
-      Write-Host "Start docker run --rm -v ""$($DlibDotNetRoot):/opt/data/DlibDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t ""$dockername"" $Version $package $OperatingSystem $OperatingSystemVersion" -ForegroundColor Green
+      Write-Host "Start docker run --rm -v ""$($DlibDotNetRoot):/opt/data/DlibDotNet"" -e LOCAL_UID=$(id -u $env:USER) -e LOCAL_GID=$(id -g $env:USER) -t ""$dockername"" $Version $package $platformTarget $rid" -ForegroundColor Green
       docker run --rm `
                   -v "$($DlibDotNetRoot):/opt/data/DlibDotNet" `
                   -e "LOCAL_UID=$(id -u $env:USER)" `