From 1e59b6f1c2c8ec6bb2d3012341764aa86a93db41 Mon Sep 17 00:00:00 2001 From: Raymond Yang Date: Mon, 3 Dec 2018 17:35:23 -0800 Subject: [PATCH] Minor fixes to CI definitions (#80) * Align win gpu ci parameters with vsts definition * Fix linux CI script to avoid docker name conflict --- tools/ci_build/github/azure-pipelines/azure-pipelines.yml | 2 +- tools/ci_build/github/linux/run_dockerbuild.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/azure-pipelines.yml b/tools/ci_build/github/azure-pipelines/azure-pipelines.yml index 047e0cda91..2904e6223c 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.1\cuda"' + arguments: ' --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/run_dockerbuild.sh b/tools/ci_build/github/linux/run_dockerbuild.sh index bac0147153..5be453555f 100755 --- a/tools/ci_build/github/linux/run_dockerbuild.sh +++ b/tools/ci_build/github/linux/run_dockerbuild.sh @@ -35,7 +35,7 @@ fi set +e if [ $BUILD_DEVICE = "cpu" ]; then - docker rm -f $HOSTNAME || true + docker rm -f "onnxruntime-$BUILD_DEVICE" || true docker run -h $HOSTNAME \ --rm -e AZURE_BLOB_KEY \ --name "onnxruntime-$BUILD_DEVICE" \ @@ -45,6 +45,7 @@ if [ $BUILD_DEVICE = "cpu" ]; then /bin/bash /onnxruntime_src/tools/ci_build/github/linux/run_build.sh \ -d $BUILD_DEVICE -x "$BUILD_EXTR_PAR" & else + docker rm -f "onnxruntime-$BUILD_DEVICE" || true nvidia-docker run --rm -h $HOSTNAME \ --rm -e AZURE_BLOB_KEY \ --name "onnxruntime-$BUILD_DEVICE" \