diff --git a/tools/ci_build/github/azure-pipelines/linux-tvm-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-tvm-ci-pipeline.yml index 7f5e7403c8891..317b8a78bc984 100644 --- a/tools/ci_build/github/azure-pipelines/linux-tvm-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-tvm-ci-pipeline.yml @@ -3,7 +3,7 @@ jobs: timeoutInMinutes: 180 workspace: clean: all - pool: Linux-TVM-CPU + pool: Linux-CPU-2019 steps: - checkout: self clean: true @@ -11,7 +11,7 @@ jobs: - template: templates/get-docker-image-steps.yml parameters: - Dockerfile: tools/ci_build/github/linux/docker/Dockerfile.ubuntu_tvm + Dockerfile: tools/ci_build/github/linux/docker/Dockerfile.ubuntu Context: tools/ci_build/github/linux/docker DockerBuildArgs: "--build-arg BUILD_UID=$( id -u )" Repository: onnxruntimecpubuild @@ -29,16 +29,19 @@ jobs: -e NIGHTLY_BUILD \ -e BUILD_BUILDNUMBER \ onnxruntimecpubuild \ - /opt/python/cp38-cp38/bin/python3 /onnxruntime_src/tools/ci_build/build.py \ - --build_dir /build \ - --config Release \ - --skip_submodule_sync \ - --parallel \ - --enable_pybind \ - --disable_contrib_ops \ - --disable_ml_ops \ - --skip_onnx_tests \ - --use_tvm + /bin/bash -c \ + "/onnxruntime_src/tools/ci_build/github/linux/docker/scripts/install_tvm_test_dependencies.sh \ + /opt/python/cp38-cp38/bin/python3 && \ + /opt/python/cp38-cp38/bin/python3 /onnxruntime_src/tools/ci_build/build.py \ + --build_dir /build \ + --config Release \ + --skip_submodule_sync \ + --parallel \ + --enable_pybind \ + --disable_contrib_ops \ + --disable_ml_ops \ + --skip_onnx_tests \ + --use_tvm" workingDirectory: $(Build.SourcesDirectory) - task: PublishTestResults@2 diff --git a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_tvm b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_tvm deleted file mode 100644 index e8313bc8da01b..0000000000000 --- a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_tvm +++ /dev/null @@ -1,15 +0,0 @@ -FROM ubuntu:20.04 - -ARG PYTHON_VERSION=3.8 - -ADD scripts /tmp/scripts -RUN /tmp/scripts/install_ubuntu.sh -p $PYTHON_VERSION && /tmp/scripts/install_os_deps.sh && /tmp/scripts/install_python_deps.sh -p $PYTHON_VERSION && rm -rf /tmp/scripts -RUN pip install decorator scipy - -WORKDIR /root - -ARG BUILD_UID=1000 -ARG BUILD_USER=onnxruntimedev -RUN adduser --gecos 'onnxruntime Build User' --disabled-password $BUILD_USER --uid $BUILD_UID -WORKDIR /home/$BUILD_USER -USER $BUILD_USER diff --git a/tools/ci_build/github/linux/docker/scripts/install_tvm_test_dependencies.sh b/tools/ci_build/github/linux/docker/scripts/install_tvm_test_dependencies.sh new file mode 100755 index 0000000000000..37bad9916e5de --- /dev/null +++ b/tools/ci_build/github/linux/docker/scripts/install_tvm_test_dependencies.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -e -x + +PYTHON_EXE=$1 +${PYTHON_EXE} -m pip install decorator scipy