Merge branch 'release/19.21.0.20210230'

.gitlab-ci.yml

@@ -0,0 +1,172 @@
+stages:
+  - build
+  - package
+  - test
+
+build:win:
+  stage: build
+  before_script:
+    - chcp 65001
+    - git submodule update --init --recursive
+    - "Get-ChildItem env:"
+  script:
+    - cd nuget
+    - git clean -fxd .
+    - pwsh BuildWindows.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
+  before_script:
+    - git submodule update --init --recursive
+    - export
+  script:
+    - cd nuget
+    - pwsh BuildCentOS7.ps1
+  tags:
+    - linux
+    - cuda
+  artifacts:
+    paths:
+      - nuget/artifacts
+
+build:ubuntu:
+  stage: build
+  before_script:
+    - git submodule update --init --recursive
+    - export
+  script:
+    - cd nuget
+    - pwsh BuildUbuntu16.ps1
+  tags:
+    - linux
+    - cuda
+  artifacts:
+    paths:
+      - nuget/artifacts
+
+build:osx:
+  stage: build
+  before_script:
+    - git submodule update --init --recursive
+    - export
+  script:
+    - cd nuget
+    - pwsh BuildOSX.ps1
+  tags:
+    - osx
+  artifacts:
+    paths:
+      - nuget/artifacts
+
+package:
+  stage: package
+  before_script:
+    - chcp 65001
+  script:
+    - cd nuget
+    - pwsh CreateAllPackage.ps1
+  tags:
+    - windows
+  dependencies:
+    - build:win
+    - build:uwp
+    - build:ubuntu
+    - build:cent
+    - build:osx
+  artifacts:
+    paths:
+      - nuget/*.nupkg
+
+test:win:
+  stage: test
+  before_script:
+    - chcp 65001
+  script:
+    - cd nuget
+    - pwsh TestPackageWindows.ps1
+  tags:
+    - windows
+  dependencies:
+    - package
+  artifacts:
+    paths:
+      - nuget/artifacts/test
+
+# test:uwp:
+#   stage: test
+#   before_script:
+#     - chcp 65001
+#   script:
+#     - cd nuget
+#     - pwsh TestPackageUniversalWindowsPlatform.ps1
+#   tags:
+#     - windows
+#   dependencies:
+#     - package
+#   artifacts:
+#     paths:
+#       - nuget/artifacts/test
+
+test:cent:
+  stage: test
+  script:
+    - cd nuget
+    - pwsh TestPackageCentOS7.ps1
+  tags:
+    - linux
+    - cuda
+  dependencies:
+    - package
+  artifacts:
+    paths:
+      - nuget/artifacts/test
+
+test:ubuntu:
+  stage: test
+  script:
+    - cd nuget
+    - pwsh TestPackageUbuntu16.ps1
+  tags:
+    - linux
+    - cuda
+  dependencies:
+    - package
+  artifacts:
+    paths:
+      - nuget/artifacts/test
+
+test:osx:
+  stage: test
+  script:
+    - cd nuget
+    - pwsh TestPackageOSX.ps1
+  tags:
+    - osx
+  dependencies:
+    - package
+  artifacts:
+    paths:
+      - nuget/artifacts/test

docker/base/centos/7/mkl/x64/Dockerfile

@@ -15,5 +15,7 @@ RUN yum update -y && yum install -y \
     libX11-devel \
     lapack-devel \
     openblas-devell \
-    intel-mkl-64bit-2019.0-045 \
+    intel-mkl-64bit-2020.0.088
+RUN yum update -y && yum install -y \
+    intel-mkl-64bit-2020.0-088 \
  && yum clean all

docker/base/ubuntu/16/mkl/x64/Dockerfile

@@ -9,7 +9,7 @@ RUN apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
 RUN sh -c 'echo deb https://apt.repos.intel.com/mkl all main > /etc/apt/sources.list.d/intel-mkl.list'
 
 # install package to build
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --allow-unauthenticated \
     libx11-6 \
-    intel-mkl-64bit-2019.0-045 \
+    intel-mkl-64bit-2020.0.088 \
     && apt-get clean && rm -rf /var/lib/apt/lists/*

docker/base/ubuntu/16/mkl/x86/Dockerfile

@@ -12,7 +12,7 @@ RUN sh -c 'echo deb https://apt.repos.intel.com/mkl all main > /etc/apt/sources.
 RUN dpkg --add-architecture i386 && dpkg --print-foreign-architectures
 
 # install package to build
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --allow-unauthenticated \
     libx11-6:i386 \
-    intel-mkl-32bit-2019.0-045 \
+    intel-mkl-32bit-2020.0-088 \
     && apt-get clean && rm -rf /var/lib/apt/lists/*

docker/devel/centos/7/mkl/x64/Dockerfile

@@ -15,8 +15,9 @@ RUN yum update -y && yum install -y \
     libX11-devel \
     lapack-devel \
     openblas-devel \
-    cmake3 \
-    intel-mkl-64bit-2019.0-045
+    cmake3
+RUN yum update -y && yum install -y \
+    intel-mkl-64bit-2020.0-088
 RUN yum groupinstall -y "Development Tools"
 
 # set compiler

docker/devel/ubuntu/16/mkl/x64/Dockerfile

@@ -9,10 +9,10 @@ RUN apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
 RUN sh -c 'echo deb https://apt.repos.intel.com/mkl all main > /etc/apt/sources.list.d/intel-mkl.list'
 
 # install package to build
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --allow-unauthenticated \
     build-essential \
     libx11-dev \
-    intel-mkl-64bit-2019.0-045 \
+    intel-mkl-64bit-2020.0.088 \
     cmake
 
 # set compiler

docker/devel/ubuntu/16/mkl/x86/Dockerfile

@@ -34,8 +34,9 @@ RUN apt-get update && apt-get install -y \
     g++-multilib:i386
 
 # install package to build
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    intel-mkl-32bit-2019.0-045
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ACFA9FC57E6C5DBE
+RUN apt-get update && apt-get install -y --no-install-recommends --allow-unauthenticated \
+    intel-mkl-32bit-2020.0.088
 
 # set compiler
 ENV CMAKE_C_COMPILER=/usr/bin/gcc

nuget/BuildCentOS7.ps1

@@ -15,7 +15,7 @@ $DistributionVersion="7"
 $Current = Get-Location
 $DlibDotNetRoot = (Split-Path (Get-Location) -Parent)
 $DlibDotNetSourceRoot = Join-Path $DlibDotNetRoot src
-$DockerDir = Join-Path $Current docker
+$DockerDir = Join-Path $DlibDotNetRoot docker
 
 Set-Location -Path $DockerDir
 
@@ -83,11 +83,26 @@ foreach($BuildTarget in $BuildTargets)
    foreach ($key in $BuildSourceHash.keys)
    {
       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'" -ForegroundColor Green
-      docker run --rm `
-                  -v "$($DlibDotNetRoot):/opt/data/DlibDotNet" `
-                  -e "LOCAL_UID=$(id -u $env:USER)" `
-                  -e "LOCAL_GID=$(id -g $env:USER)" `
-                  -t "$dockername" $key $target $architecture $platform $option
+      if ($Config.HasStoreDriectory())
+      {
+         $storeDirecotry = $Config.GetRootStoreDriectory()
+         docker run --rm `
+                     -v "$($storeDirecotry):/opt/data/builds" `
+                     -v "$($DlibDotNetRoot):/opt/data/DlibDotNet" `
+                     -e "LOCAL_UID=$(id -u $env:USER)" `
+                     -e "LOCAL_GID=$(id -g $env:USER)" `
+                     -e "CIBuildDir=/opt/data/builds" `
+                     -t "$dockername" $key $target $architecture $platform $option
+      }
+      else
+      {
+         docker run --rm `
+                     -v "$($DlibDotNetRoot):/opt/data/DlibDotNet" `
+                     -e "LOCAL_UID=$(id -u $env:USER)" `
+                     -e "LOCAL_GID=$(id -g $env:USER)" `
+                     -t "$dockername" $key $target $architecture $platform $option
+      }
+
 
       if ($lastexitcode -ne 0)
       {
@@ -100,6 +115,8 @@ foreach($BuildTarget in $BuildTargets)
    foreach ($key in $BuildSourceHash.keys)
    {
       $srcDir = Join-Path $DlibDotNetSourceRoot $key
+      $srcDir = $Config.GetStoreDriectory($srcDir)
+
       $dll = $BuildSourceHash[$key]
       $dstDir = Join-Path $Current $libraryDir
 

nuget/BuildOSX.ps1

@@ -57,6 +57,8 @@ foreach($BuildTarget in $BuildTargets)
    foreach ($key in $BuildSourceHash.keys)
    {
       $srcDir = Join-Path $DlibDotNetSourceRoot $key
+      $srcDir = $Config.GetStoreDriectory($srcDir)
+
       $dll = $BuildSourceHash[$key]
       $dstDir = Join-Path $Current $libraryDir
 

nuget/BuildUbuntu16.ps1

@@ -15,7 +15,7 @@ $DistributionVersion="16"
 $Current = Get-Location
 $DlibDotNetRoot = (Split-Path (Get-Location) -Parent)
 $DlibDotNetSourceRoot = Join-Path $DlibDotNetRoot src
-$DockerDir = Join-Path $Current docker
+$DockerDir = Join-Path $DlibDotNetRoot docker
 
 Set-Location -Path $DockerDir
 
@@ -83,11 +83,25 @@ foreach($BuildTarget in $BuildTargets)
    foreach ($key in $BuildSourceHash.keys)
    {
       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'" -ForegroundColor Green
-      docker run --rm `
-                  -v "$($DlibDotNetRoot):/opt/data/DlibDotNet" `
-                  -e "LOCAL_UID=$(id -u $env:USER)" `
-                  -e "LOCAL_GID=$(id -g $env:USER)" `
-                  -t "$dockername" $key $target $architecture $platform $option
+      if ($Config.HasStoreDriectory())
+      {
+         $storeDirecotry = $Config.GetRootStoreDriectory()
+         docker run --rm `
+                     -v "$($storeDirecotry):/opt/data/builds" `
+                     -v "$($DlibDotNetRoot):/opt/data/DlibDotNet" `
+                     -e "LOCAL_UID=$(id -u $env:USER)" `
+                     -e "LOCAL_GID=$(id -g $env:USER)" `
+                     -e "CIBuildDir=/opt/data/builds" `
+                     -t "$dockername" $key $target $architecture $platform $option
+      }
+      else
+      {
+         docker run --rm `
+                     -v "$($DlibDotNetRoot):/opt/data/DlibDotNet" `
+                     -e "LOCAL_UID=$(id -u $env:USER)" `
+                     -e "LOCAL_GID=$(id -g $env:USER)" `
+                     -t "$dockername" $key $target $architecture $platform $option
+      }
 
       if ($lastexitcode -ne 0)
       {
@@ -100,6 +114,8 @@ foreach($BuildTarget in $BuildTargets)
    foreach ($key in $BuildSourceHash.keys)
    {
       $srcDir = Join-Path $DlibDotNetSourceRoot $key
+      $srcDir = $Config.GetStoreDriectory($srcDir)
+
       $dll = $BuildSourceHash[$key]
       $dstDir = Join-Path $Current $libraryDir
 

nuget/BuildUniversalWindowsPlatform.ps1

@@ -56,6 +56,8 @@ foreach ($BuildTarget in $BuildTargets)
    foreach ($key in $BuildSourceHash.keys)
    {
       $srcDir = Join-Path $DlibDotNetSourceRoot $key
+      $srcDir = $Config.GetStoreDriectory($srcDir)
+
       $dll = $BuildSourceHash[$key]
       $dstDir = Join-Path $Current $libraryDir