You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tvm.apache.org by ar...@apache.org on 2022/07/01 18:26:22 UTC
[tvm] 01/02: fixup! unify python installation script
This is an automated email from the ASF dual-hosted git repository.
areusch pushed a commit to branch areusch/freeze-dependencies
in repository https://gitbox.apache.org/repos/asf/tvm.git
commit 78cd989ca403578e4cd8572cee942433f4d1b312
Author: Andrew Reusch <ar...@gmail.com>
AuthorDate: Fri Jul 1 10:55:15 2022 -0700
fixup! unify python installation script
---
docker/Dockerfile.ci_hexagon | 2 +-
docker/Dockerfile.ci_lint | 2 +-
docker/Dockerfile.ci_wasm | 4 ++--
docker/Dockerfile.demo_android | 4 ++--
docker/Dockerfile.demo_rocm | 4 ++--
docker/Dockerfile.docs | 4 ++--
docker/install/ubuntu_install_python.sh | 3 +--
7 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/docker/Dockerfile.ci_hexagon b/docker/Dockerfile.ci_hexagon
index 7f0355a20d..109ebc3edd 100644
--- a/docker/Dockerfile.ci_hexagon
+++ b/docker/Dockerfile.ci_hexagon
@@ -34,7 +34,7 @@ RUN bash /install/ubuntu_install_googletest.sh
ENV TVM_VENV /venv/apache-tvm-py3.8
COPY python/bootstrap/lockfiles /install/python/bootstrap/lockfiles
-COPY install/ubuntu_install_python.sh /install/ubuntu2004_install_python.sh
+COPY install/ubuntu_install_python.sh /install/ubuntu_install_python.sh
RUN bash /install/ubuntu_install_python.sh
ENV PATH ${TVM_VENV}/bin:$PATH
diff --git a/docker/Dockerfile.ci_lint b/docker/Dockerfile.ci_lint
index c5d32f48a1..1c865fcd1f 100644
--- a/docker/Dockerfile.ci_lint
+++ b/docker/Dockerfile.ci_lint
@@ -22,7 +22,7 @@ FROM ubuntu:18.04
COPY utils/apt-install-and-clear.sh /usr/local/bin/apt-install-and-clear
-RUN apt-get update --fix-missing && apt-install-and-clear -y wget git sudo make parallel
+RUN apt-get update --fix-missing && apt-install-and-clear -y wget git lsb-core make parallel sudo
ENV TVM_VENV /venv/apache-tvm-py3.7
COPY python/bootstrap/lockfiles /install/python/bootstrap/lockfiles
diff --git a/docker/Dockerfile.ci_wasm b/docker/Dockerfile.ci_wasm
index b4558bde61..6dc737bffa 100644
--- a/docker/Dockerfile.ci_wasm
+++ b/docker/Dockerfile.ci_wasm
@@ -26,8 +26,8 @@ RUN bash /install/ubuntu_install_googletest.sh
ENV TVM_VENV /venv/apache-tvm-py3.7
COPY python/bootstrap/lockfiles /install/python/bootstrap/lockfiles
-COPY install/ubuntu1804_install_python.sh /install/ubuntu1804_install_python.sh
-RUN bash /install/ubuntu1804_install_python.sh
+COPY install/ubuntu_install_python.sh /install/ubuntu_install_python.sh
+RUN bash /install/ubuntu_install_python.sh
ENV PATH ${TVM_VENV}/bin:$PATH
COPY python/build/pyproject.toml /install/python/pyproject.toml
diff --git a/docker/Dockerfile.demo_android b/docker/Dockerfile.demo_android
index e66fb3aa3c..057a29ab9a 100644
--- a/docker/Dockerfile.demo_android
+++ b/docker/Dockerfile.demo_android
@@ -25,8 +25,8 @@ RUN apt-get update --fix-missing
COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh
RUN bash /install/ubuntu_install_core.sh
-COPY install/ubuntu_install_python.sh /install/ubuntu1804_install_python.sh
-RUN bash /install/ubuntu1804_install_python.sh
+COPY install/ubuntu_install_python.sh /install/ubuntu_install_python.sh
+RUN bash /install/ubuntu_install_python.sh
COPY install/ubuntu_install_python_package.sh /install/ubuntu_install_python_package.sh
RUN bash /install/ubuntu_install_python_package.sh
diff --git a/docker/Dockerfile.demo_rocm b/docker/Dockerfile.demo_rocm
index 1dd7d1bf11..f7d06dc7de 100644
--- a/docker/Dockerfile.demo_rocm
+++ b/docker/Dockerfile.demo_rocm
@@ -23,8 +23,8 @@ COPY utils/apt-install-and-clear.sh /usr/local/bin/apt-install-and-clear
COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh
RUN bash /install/ubuntu_install_core.sh
-COPY install/ubuntu1804_install_python.sh /install/ubuntu1804_install_python.sh
-RUN bash /install/ubuntu1804_install_python.sh
+COPY install/ubuntu_install_python.sh /install/ubuntu_install_python.sh
+RUN bash /install/ubuntu_install_python.sh
COPY install/ubuntu_install_python_package.sh /install/ubuntu_install_python_package.sh
RUN bash /install/ubuntu_install_python_package.sh
diff --git a/docker/Dockerfile.docs b/docker/Dockerfile.docs
index 9fe90a7302..305a025524 100644
--- a/docker/Dockerfile.docs
+++ b/docker/Dockerfile.docs
@@ -26,8 +26,8 @@ RUN apt-get update --fix-missing
COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh
RUN bash /install/ubuntu_install_core.sh
-COPY install/ubuntu1804_install_python.sh /install/ubuntu1804_install_python.sh
-RUN bash /install/ubuntu1804_install_python.sh
+COPY install/ubuntu_install_python.sh /install/ubuntu_install_python.sh
+RUN bash /install/ubuntu_install_python.sh
# Globally disable pip cache
RUN pip config set global.no-cache-dir false
diff --git a/docker/install/ubuntu_install_python.sh b/docker/install/ubuntu_install_python.sh
index f617e5872d..4d8465a6ed 100755
--- a/docker/install/ubuntu_install_python.sh
+++ b/docker/install/ubuntu_install_python.sh
@@ -54,5 +54,4 @@ pip3 config set global.no-cache-dir false
# Now install the remaining base packages.
pip3 install \
--require-hashes \
- -r /install/python/bootstrap/lockfiles/requirements-${PYTHON_VERSION}.txt \
- -c /install/python/bootstrap/lockfiles/constraints-${PYTHON_VERSION}.txt
+ -r /install/python/bootstrap/lockfiles/constraints-${PYTHON_VERSION}.txt