From 0327606d2de6ad100b0bcae58d01024a97afe383 Mon Sep 17 00:00:00 2001 From: Chi Lo <54722500+chilo-ms@users.noreply.github.com> Date: Tue, 29 Nov 2022 13:15:27 -0800 Subject: [PATCH] Revert TRT EP Linux CI to run unit tests in container (#13766) Revert TRT EP Linux CI to old behavior that code build and unit tests are both executing in container. So that we don't have to update the VM image for native Ubuntu to include latest TRT libraries every time newer version of TRT is introduced. --- .../linux-gpu-tensorrt-ci-pipeline.yml | 68 +------------------ 1 file changed, 3 insertions(+), 65 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/linux-gpu-tensorrt-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-gpu-tensorrt-ci-pipeline.yml index 77a541f05c..3a4b95fb53 100644 --- a/tools/ci_build/github/azure-pipelines/linux-gpu-tensorrt-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-gpu-tensorrt-ci-pipeline.yml @@ -14,7 +14,7 @@ jobs: ALLOW_RELEASED_ONNX_OPSET_ONLY: '1' workspace: clean: all - pool: Linux-CPU-2019 + pool: onnxruntime-tensorrt-linuxbuild-T4 steps: - checkout: self clean: true @@ -30,7 +30,7 @@ jobs: - task: CmdLine@2 inputs: script: | - docker run -e CC=/opt/rh/devtoolset-11/root/usr/bin/cc -e CXX=/opt/rh/devtoolset-11/root/usr/bin/c++ -e CFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -fstack-clash-protection -fcf-protection -O3 -Wl,--strip-all" -e CXXFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -fstack-clash-protection -fcf-protection -O3 -Wl,--strip-all" --rm \ + docker run --gpus all -e CC=/opt/rh/devtoolset-11/root/usr/bin/cc -e CXX=/opt/rh/devtoolset-11/root/usr/bin/c++ -e CFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -fstack-clash-protection -fcf-protection -O3 -Wl,--strip-all" -e CXXFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -fstack-clash-protection -fcf-protection -O3 -Wl,--strip-all" --rm \ --volume /data/onnx:/data/onnx:ro \ --volume $(Build.SourcesDirectory):/onnxruntime_src \ --volume $(Build.BinariesDirectory):/build \ @@ -42,7 +42,7 @@ jobs: onnxruntimetensorrt84gpubuild \ /opt/python/cp38-cp38/bin/python3 /onnxruntime_src/tools/ci_build/build.py \ --build_dir /build --cmake_generator Ninja \ - --config Release --update --build \ + --config Release \ --skip_submodule_sync \ --build_shared_lib \ --parallel \ @@ -53,19 +53,6 @@ jobs: --cmake_extra_defines CMAKE_CUDA_HOST_COMPILER=/opt/rh/devtoolset-11/root/usr/bin/cc CMAKE_CUDA_ARCHITECTURES=75 workingDirectory: $(Build.SourcesDirectory) - - task: CmdLine@2 - inputs: - script: | - rm -rf $(Build.BinariesDirectory)/Release/onnxruntime $(Build.BinariesDirectory)/Release/pybind11 $(Build.BinariesDirectory)/Release/models $(Build.BinariesDirectory)/Release/_deps $(Build.BinariesDirectory)/Release/CMakeFiles - cd $(Build.BinariesDirectory)/Release - find -executable -type f > $(Build.BinariesDirectory)/Release/perms.txt - - - task: PublishPipelineArtifact@0 - displayName: 'Publish Pipeline Artifact' - inputs: - artifactName: 'drop-linux' - targetPath: '$(Build.BinariesDirectory)/Release' - - task: PublishTestResults@2 displayName: 'Publish unit test results' inputs: @@ -75,52 +62,3 @@ jobs: condition: succeededOrFailed() - template: templates/clean-agent-build-directory-step.yml - -- job: Linux_Test - timeoutInMinutes: 120 - variables: - skipComponentGovernanceDetection: true - workspace: - clean: all - pool: onnxruntime-tensorrt-linuxbuild-T4 - dependsOn: - - Linux_Build - steps: - - task: DownloadPipelineArtifact@2 - displayName: 'Download Pipeline Artifact' - inputs: - buildType: 'current' - artifactName: 'drop-linux' - targetPath: '$(Build.BinariesDirectory)/Release' - - - task: CmdLine@2 - inputs: - script: | - set -e -x - # We assume the machine doesn't have gcc and python development header files - sudo rm -f /build /onnxruntime_src - sudo ln -s $(Build.SourcesDirectory) /onnxruntime_src - python3 -m pip uninstall -y ort-nightly-gpu ort-nightly onnxruntime onnxruntime-gpu onnxruntime-training onnxruntime-directml ort-nightly-directml onnx -qq - cp $(Build.SourcesDirectory)/tools/ci_build/github/linux/docker/scripts/manylinux/requirements.txt $(Build.BinariesDirectory)/requirements.txt - # Test ORT with the latest ONNX release. - sed -i "s/git+http:\/\/github\.com\/onnx\/onnx.*/onnx/" $(Build.BinariesDirectory)/requirements.txt - python3 -m pip install -r $(Build.BinariesDirectory)/requirements.txt - python3 -m pip install $(Build.BinariesDirectory)/Release/dist/*.whl - ln -s /data/models $(Build.BinariesDirectory) - cd $(Build.BinariesDirectory)/Release - # Restore file permissions - xargs -a $(Build.BinariesDirectory)/Release/perms.txt chmod a+x - cd /tmp - python3 $(Build.SourcesDirectory)/tools/ci_build/build.py \ - --build_dir $(Build.BinariesDirectory) --cmake_generator Ninja \ - --config Release --test \ - --skip_submodule_sync \ - --build_shared_lib \ - --parallel \ - --build_wheel \ - --enable_onnx_tests --use_cuda --cuda_version=11.6 --cuda_home=/usr/local/cuda-11.6 --cudnn_home=/usr/local/cuda-11.6 \ - --enable_pybind --build_java \ - --use_tensorrt --tensorrt_placeholder_builder --tensorrt_home /usr --ctest_path '' \ - --cmake_extra_defines CMAKE_CUDA_HOST_COMPILER=/opt/rh/devtoolset-11/root/usr/bin/cc CMAKE_CUDA_ARCHITECTURES=75 - - - template: templates/clean-agent-build-directory-step.yml