reuse Dockerfile.ubuntu

microsoft · Feb 18, 2022 · 046c015 · 046c015
1 parent 8c74d52
commit 046c015
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 27 deletions.
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
@@ -3,15 +3,15 @@ jobs:
     timeoutInMinutes: 180
     workspace:
       clean: all
-    pool: Linux-TVM-CPU
+    pool: Linux-CPU-2019
     steps:
       - checkout: self
         clean: true
         submodules: recursive
 
       - 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
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
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e -x
+
+PYTHON_EXE=$1
+${PYTHON_EXE} -m pip install decorator scipy