Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hecli/cuda9.1 #10

Merged
merged 3 commits into from
Nov 20, 2018
Merged

Hecli/cuda9.1 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f716cb
Switch GPU build to use CUDA 9.1 + cudnn 7.0.5
HectorSVC Nov 20, 2018
c2d5b7e
update linux gpu to use cuda 9.1 + cudnn 7.1.2
HectorSVC Nov 20, 2018
d2a8b0e
update the cuda cudnn version information
HectorSVC Nov 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tools/ci_build/github/azure-pipelines/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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.1\cuda"'
workingFolder: "$(Build.SourcesDirectory)"

- task: CmdLine@1
Expand Down
13 changes: 5 additions & 8 deletions tools/ci_build/github/linux/docker/Dockerfile.ubuntu_gpu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/linux/run_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/linux/run_dockerbuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down