From 8f716cb4fc78f783b51dcc10f05b9c7b85e94129 Mon Sep 17 00:00:00 2001 From: Hector Li Date: Tue, 20 Nov 2018 10:31:13 -0800 Subject: [PATCH 1/3] Switch GPU build to use CUDA 9.1 + cudnn 7.0.5 --- tools/ci_build/github/azure-pipelines/azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/azure-pipelines.yml b/tools/ci_build/github/azure-pipelines/azure-pipelines.yml index 94a3e664fcc71..8c52d2bc69057 100644 --- a/tools/ci_build/github/azure-pipelines/azure-pipelines.yml +++ b/tools/ci_build/github/azure-pipelines/azure-pipelines.yml @@ -60,14 +60,14 @@ jobs: pool: Win-GPU variables: - CUDA_VERSION: '9.0' + CUDA_VERSION: '9.1' steps: - task: PowerShell@1 displayName: 'Set CUDA path' inputs: scriptName: 'tools/ci_build/github/windows/set_cuda_path.ps1' - arguments: '-CudaMsbuildPath C:\local\cudaMsbuildIntegration-9.0.176-windows10-x64-2 -CudaVersion $(CUDA_VERSION)' + arguments: '-CudaMsbuildPath C:\local\cudaMsbuildIntegration-9.1.85-windows10-x64-0 -CudaVersion $(CUDA_VERSION)' - task: BatchScript@1 displayName: 'Setup VS2017 env vars' @@ -87,7 +87,7 @@ jobs: - task: BatchScript@1 inputs: filename: build.bat - arguments: ' --enable_onnx_tests --use_cuda --cuda_home="C:\local\cuda-9.0.176-windows10-x64-0" --cudnn_home="C:\local\cudnn-9.0-windows10-x64-v7.0.5-0\cuda"' + arguments: ' --enable_onnx_tests --use_cuda --cuda_home="C:\local\cuda-9.1.85-windows10-x64-0" --cudnn_home="C:\local\cudnn-9.1-windows10-x64-v7\cuda"' workingFolder: "$(Build.SourcesDirectory)" - task: CmdLine@1 From c2d5b7e368b7d2cd1b16b885c71444eb0914b30c Mon Sep 17 00:00:00 2001 From: Hector Li Date: Tue, 20 Nov 2018 11:39:06 -0800 Subject: [PATCH 2/3] update linux gpu to use cuda 9.1 + cudnn 7.1.2 --- .../github/azure-pipelines/azure-pipelines.yml | 2 +- .../github/linux/docker/Dockerfile.ubuntu_gpu | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/azure-pipelines.yml b/tools/ci_build/github/azure-pipelines/azure-pipelines.yml index 8c52d2bc69057..7bfeff5b74416 100644 --- a/tools/ci_build/github/azure-pipelines/azure-pipelines.yml +++ b/tools/ci_build/github/azure-pipelines/azure-pipelines.yml @@ -87,7 +87,7 @@ jobs: - task: BatchScript@1 inputs: filename: build.bat - arguments: ' --enable_onnx_tests --use_cuda --cuda_home="C:\local\cuda-9.1.85-windows10-x64-0" --cudnn_home="C:\local\cudnn-9.1-windows10-x64-v7\cuda"' + arguments: ' --enable_onnx_tests --use_cuda --cuda_home="C:\local\cuda-9.1.85-windows10-x64-0" --cudnn_home="C:\local\cudnn-9.1-windows10-x64-v7.1\cuda"' workingFolder: "$(Build.SourcesDirectory)" - task: CmdLine@1 diff --git a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_gpu b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_gpu index bc8602f8d0bb0..8ecbf627df259 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_gpu +++ b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_gpu @@ -1,12 +1,9 @@ -# Tag: nvidia/cuda:9.0-cudnn7-devel-ubuntu16.04 -# Created: 2017-11-21T06:34:14.675603521Z -# Label: com.nvidia.build.id: 41212533 -# Label: com.nvidia.build.ref: e0edb5359ecb7bd3d86f0c9bfa18c2260b741ebb -# Label: com.nvidia.cuda.version: 9.0.176 -# Label: com.nvidia.cudnn.version: 7.0.4.31 -# Label: com.nvidia.nccl.version: 2.1.2 +# Tag: nvidia/cuda:9.1-cudnn7-devel-ubuntu16.04 +# Label: com.nvidia.cuda.version: 9.1.85 +# Label: com.nvidia.cudnn.version: 7.1.2.21 +# Label: com.nvidia.nccl.version: 2.2.12 # Ubuntu 16.04.5 -FROM nvidia/cuda@sha256:33add9c50ab76b8f3a92187c0418ed600d5bea27690fda40711122fdc28ce2f4 +FROM nvidia/cuda:9.1-cudnn7-devel-ubuntu16.04 ARG PYTHON_VERSION=3.5 From d2a8b0e65b8bdaa17fd496a25b2e2a5f114ac5f8 Mon Sep 17 00:00:00 2001 From: Hector Li Date: Tue, 20 Nov 2018 11:54:32 -0800 Subject: [PATCH 3/3] update the cuda cudnn version information --- tools/ci_build/github/linux/run_build.sh | 2 +- tools/ci_build/github/linux/run_dockerbuild.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ci_build/github/linux/run_build.sh b/tools/ci_build/github/linux/run_build.sh index 8ed87f451c99e..bdfa0f0891b85 100755 --- a/tools/ci_build/github/linux/run_build.sh +++ b/tools/ci_build/github/linux/run_build.sh @@ -28,7 +28,7 @@ if [ $BUILD_DEVICE = "gpu" ]; then --parallel --build_shared_lib \ --use_cuda \ --cuda_home /usr/local/cuda \ - --cudnn_home /usr/local/cudnn-7.0/cuda --build_shared_lib $BUILD_EXTR_PAR + --cudnn_home /usr/local/cudnn-7.1/cuda --build_shared_lib $BUILD_EXTR_PAR /home/onnxruntimedev/Release/onnx_test_runner -e cuda /data/onnx else python3 $SCRIPT_DIR/../../build.py --build_dir /home/onnxruntimedev \ diff --git a/tools/ci_build/github/linux/run_dockerbuild.sh b/tools/ci_build/github/linux/run_dockerbuild.sh index debdb19805cf8..bac014715352e 100755 --- a/tools/ci_build/github/linux/run_dockerbuild.sh +++ b/tools/ci_build/github/linux/run_dockerbuild.sh @@ -25,7 +25,7 @@ echo "bo=$BUILD_OS bd=$BUILD_DEVICE bdir=$BUILD_DIR pv=$PYTHON_VER bex=$BUILD_EX cd $SCRIPT_DIR/docker if [ $BUILD_DEVICE = "gpu" ]; then - IMAGE="ubuntu16.04-cuda9.0-cudnn7.0" + IMAGE="ubuntu16.04-cuda9.1-cudnn7.1" docker build -t "onnxruntime-$IMAGE" --build-arg PYTHON_VERSION=${PYTHON_VER} -f Dockerfile.ubuntu_gpu . else IMAGE="ubuntu16.04"