From 38ed935e43e195406019049494ed8599d984ac2f Mon Sep 17 00:00:00 2001 From: Mehrdad Hessar Date: Fri, 6 Jan 2023 15:02:23 -0800 Subject: [PATCH 1/8] Update nrfjprog script and LLVM script --- docker/Dockerfile.ci_cortexm | 6 ++--- docker/install/ubuntu2004_install_llvm.sh | 28 +++++++++++++++++++++++ docker/install/ubuntu_install_nrfjprog.sh | 19 +++++++++------ 3 files changed, 43 insertions(+), 10 deletions(-) create mode 100755 docker/install/ubuntu2004_install_llvm.sh diff --git a/docker/Dockerfile.ci_cortexm b/docker/Dockerfile.ci_cortexm index 29a19454a9ee..346c24c9df53 100644 --- a/docker/Dockerfile.ci_cortexm +++ b/docker/Dockerfile.ci_cortexm @@ -17,7 +17,7 @@ # CI docker CPU env # tag: v0.62 -FROM ubuntu:18.04 +FROM ubuntu:20.04 COPY utils/apt-install-and-clear.sh /usr/local/bin/apt-install-and-clear @@ -45,8 +45,8 @@ ENV PYTHONNOUSERSITE 1 # Disable .local directory from affecting CI. COPY install/ubuntu_install_python_package.sh /install/ubuntu_install_python_package.sh RUN bash /install/ubuntu_install_python_package.sh -COPY install/ubuntu1804_install_llvm.sh /install/ubuntu1804_install_llvm.sh -RUN bash /install/ubuntu1804_install_llvm.sh +COPY install/ubuntu2004_install_llvm.sh /install/ubuntu2004_install_llvm.sh +RUN bash /install/ubuntu2004_install_llvm.sh # Rust env (build early; takes a while) COPY install/ubuntu_install_rust.sh /install/ubuntu_install_rust.sh diff --git a/docker/install/ubuntu2004_install_llvm.sh b/docker/install/ubuntu2004_install_llvm.sh new file mode 100755 index 000000000000..4743f9e87d4c --- /dev/null +++ b/docker/install/ubuntu2004_install_llvm.sh @@ -0,0 +1,28 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -euxo pipefail + +wget https://apt.llvm.org/llvm.sh +chmod +x llvm.sh + +./llvm.sh 9 +./llvm.sh 10 +./llvm.sh 11 +./llvm.sh 12 +./llvm.sh 13 diff --git a/docker/install/ubuntu_install_nrfjprog.sh b/docker/install/ubuntu_install_nrfjprog.sh index 1a82f057a950..6c23d547aa50 100755 --- a/docker/install/ubuntu_install_nrfjprog.sh +++ b/docker/install/ubuntu_install_nrfjprog.sh @@ -21,19 +21,24 @@ set -u set -o pipefail set -x +TEMP_PATH_NAME="nrfjprog_tmp_path" + +# Install JLink NRF_COMMANDLINE_TOOLS_FILE=nRFCommandLineToolsLinuxamd64.tar.gz -NRF_COMMANDLINE_TOOLS_URL=https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-command-line-tools/sw/versions-10-x-x/10-12-1/nrfcommandlinetools10121linuxamd64.tar.gz -NRF_COMMANDLINE_TOOLS_INSTALLER=nRF-Command-Line-Tools_10_12_1_Linux-amd64.deb -JLINK_LINUX_INSTALLER=JLink_Linux_V688a_x86_64.deb +NRF_COMMANDLINE_TOOLS_URL=https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-command-line-tools/sw/versions-10-x-x/10-18-1/nrf-command-line-tools-10.18.1_linux-amd64.tar.gz +JLINK_LINUX_INSTALLER=JLink_Linux_V780c_x86_64.deb cd ~ -mkdir -p nrfjprog +mkdir -p ${TEMP_PATH_NAME} wget --no-verbose -O $NRF_COMMANDLINE_TOOLS_FILE $NRF_COMMANDLINE_TOOLS_URL -cd nrfjprog +cd ${TEMP_PATH_NAME} tar -xzvf "../${NRF_COMMANDLINE_TOOLS_FILE}" apt-install-and-clear -y "./${JLINK_LINUX_INSTALLER}" -apt-install-and-clear -y "./${NRF_COMMANDLINE_TOOLS_INSTALLER}" + +# Install nrfjprog +wget --no-verbose https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-command-line-tools/sw/versions-10-x-x/10-18-1/nrf-command-line-tools_10.18.1_amd64.deb +apt-install-and-clear -y ./nrf-command-line-tools_10.18.1_amd64.deb cd .. -rm -rf nrfjprog "${NRF_COMMANDLINE_TOOLS_FILE}" +rm -rf ${TEMP_PATH_NAME} "${NRF_COMMANDLINE_TOOLS_FILE}" From c484dbac722e4e9d7b16c39d31c4e9fdb5cc6ed3 Mon Sep 17 00:00:00 2001 From: Mehrdad Hessar Date: Fri, 6 Jan 2023 15:06:20 -0800 Subject: [PATCH 2/8] cleanup --- docker/install/ubuntu2004_install_llvm.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/install/ubuntu2004_install_llvm.sh b/docker/install/ubuntu2004_install_llvm.sh index 4743f9e87d4c..a255c51d6d7e 100755 --- a/docker/install/ubuntu2004_install_llvm.sh +++ b/docker/install/ubuntu2004_install_llvm.sh @@ -26,3 +26,5 @@ chmod +x llvm.sh ./llvm.sh 11 ./llvm.sh 12 ./llvm.sh 13 + +rm llvm.sh From 3488fa96f330d79c404ea7920283a995f5620475 Mon Sep 17 00:00:00 2001 From: Mehrdad Hessar Date: Mon, 9 Jan 2023 10:30:15 -0800 Subject: [PATCH 3/8] change llvm install to apt --- docker/install/ubuntu2004_install_llvm.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/docker/install/ubuntu2004_install_llvm.sh b/docker/install/ubuntu2004_install_llvm.sh index a255c51d6d7e..c924cdddf1f9 100755 --- a/docker/install/ubuntu2004_install_llvm.sh +++ b/docker/install/ubuntu2004_install_llvm.sh @@ -18,13 +18,16 @@ set -euxo pipefail -wget https://apt.llvm.org/llvm.sh -chmod +x llvm.sh +echo deb http://apt.llvm.org/focal/ llvm-toolchain-focal main\ + >> /etc/apt/sources.list.d/llvm.list -./llvm.sh 9 -./llvm.sh 10 -./llvm.sh 11 -./llvm.sh 12 -./llvm.sh 13 +echo deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main\ + >> /etc/apt/sources.list.d/llvm.list -rm llvm.sh +apt-get update && apt-install-and-clear -y \ + llvm-9 llvm-10 llvm-11 llvm-12 llvm-13 \ + clang-9 libclang-9-dev \ + clang-10 libclang-10-dev \ + clang-11 libclang-11-dev \ + clang-12 libclang-12-dev \ + clang-13 libclang-13-dev From 6599e3ca51c25324f2bb2050c831ec5064578641 Mon Sep 17 00:00:00 2001 From: Mehrdad Hessar Date: Mon, 9 Jan 2023 10:36:49 -0800 Subject: [PATCH 4/8] add SHA to nrfjprog installation script --- docker/install/ubuntu_install_nrfjprog.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docker/install/ubuntu_install_nrfjprog.sh b/docker/install/ubuntu_install_nrfjprog.sh index 6c23d547aa50..7baedf54fb3b 100755 --- a/docker/install/ubuntu_install_nrfjprog.sh +++ b/docker/install/ubuntu_install_nrfjprog.sh @@ -27,18 +27,23 @@ TEMP_PATH_NAME="nrfjprog_tmp_path" NRF_COMMANDLINE_TOOLS_FILE=nRFCommandLineToolsLinuxamd64.tar.gz NRF_COMMANDLINE_TOOLS_URL=https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-command-line-tools/sw/versions-10-x-x/10-18-1/nrf-command-line-tools-10.18.1_linux-amd64.tar.gz JLINK_LINUX_INSTALLER=JLink_Linux_V780c_x86_64.deb +NRF_COMMANDLINE_TOOLS_SHA=5611536ca3377d64131ccd51232f9e33cde6d289b03ea33db0581a1288be8b0b10f995e2d60fdd4a3ce5a5c7b12bc85ddc672b282c9af8c5808707ab41543a7d cd ~ mkdir -p ${TEMP_PATH_NAME} wget --no-verbose -O $NRF_COMMANDLINE_TOOLS_FILE $NRF_COMMANDLINE_TOOLS_URL +echo "$NRF_COMMANDLINE_TOOLS_SHA $NRF_COMMANDLINE_TOOLS_FILE" | sha512sum --check cd ${TEMP_PATH_NAME} tar -xzvf "../${NRF_COMMANDLINE_TOOLS_FILE}" apt-install-and-clear -y "./${JLINK_LINUX_INSTALLER}" # Install nrfjprog -wget --no-verbose https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-command-line-tools/sw/versions-10-x-x/10-18-1/nrf-command-line-tools_10.18.1_amd64.deb -apt-install-and-clear -y ./nrf-command-line-tools_10.18.1_amd64.deb +NRF_DEB_FILE=nrf-command-line-tools_amd64.deb +NRF_DEB_FILE_SHA=1f0339e16d50345ddde9757c2a4211361bcc78ff7371aac09decfffa809d86329001f5bc135f33dd154000a8f0da8bee4a0e80d3865ceff229f63ff9ace5ea95 +wget --no-verbose -O $NRF_DEB_FILE https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-command-line-tools/sw/versions-10-x-x/10-18-1/nrf-command-line-tools_10.18.1_amd64.deb +echo "$NRF_DEB_FILE_SHA $NRF_DEB_FILE" | sha512sum --check +apt-install-and-clear -y ./$NRF_DEB_FILE cd .. rm -rf ${TEMP_PATH_NAME} "${NRF_COMMANDLINE_TOOLS_FILE}" From b819d5d7442311ca5afb7687904a4af837ae5f25 Mon Sep 17 00:00:00 2001 From: Mehrdad Hessar Date: Mon, 9 Jan 2023 11:06:46 -0800 Subject: [PATCH 5/8] trigger From c1456ae3ee61820d14eb5b24e137fdff493c2a0a Mon Sep 17 00:00:00 2001 From: Mehrdad Hessar Date: Mon, 9 Jan 2023 11:58:15 -0800 Subject: [PATCH 6/8] fix key --- docker/install/ubuntu2004_install_llvm.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/install/ubuntu2004_install_llvm.sh b/docker/install/ubuntu2004_install_llvm.sh index c924cdddf1f9..92e4b7aca886 100755 --- a/docker/install/ubuntu2004_install_llvm.sh +++ b/docker/install/ubuntu2004_install_llvm.sh @@ -24,6 +24,8 @@ echo deb http://apt.llvm.org/focal/ llvm-toolchain-focal main\ echo deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main\ >> /etc/apt/sources.list.d/llvm.list +wget -q -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - + apt-get update && apt-install-and-clear -y \ llvm-9 llvm-10 llvm-11 llvm-12 llvm-13 \ clang-9 libclang-9-dev \ From 3901fab191c41a3ce037b6740c9d9aea1d39b02f Mon Sep 17 00:00:00 2001 From: Mehrdad Hessar Date: Tue, 10 Jan 2023 09:50:33 -0800 Subject: [PATCH 7/8] update apt key for llvm --- docker/install/ubuntu2004_install_llvm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/install/ubuntu2004_install_llvm.sh b/docker/install/ubuntu2004_install_llvm.sh index 92e4b7aca886..a0c4c8e73183 100755 --- a/docker/install/ubuntu2004_install_llvm.sh +++ b/docker/install/ubuntu2004_install_llvm.sh @@ -24,7 +24,7 @@ echo deb http://apt.llvm.org/focal/ llvm-toolchain-focal main\ echo deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main\ >> /etc/apt/sources.list.d/llvm.list -wget -q -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - +apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 15CF4D18AF4F7421 apt-get update && apt-install-and-clear -y \ llvm-9 llvm-10 llvm-11 llvm-12 llvm-13 \ From 08ce7f8086d6fa6ec3281eab9b28663d269f0cbb Mon Sep 17 00:00:00 2001 From: Mehrdad Hessar Date: Tue, 10 Jan 2023 15:06:17 -0800 Subject: [PATCH 8/8] add python3.7 install option to script --- .../base-box/base_box_setup_common.sh | 2 +- docker/Dockerfile.ci_arm | 2 +- docker/Dockerfile.ci_cortexm | 2 +- docker/Dockerfile.ci_cpu | 2 +- docker/Dockerfile.ci_gpu | 2 +- docker/Dockerfile.ci_hexagon | 2 +- docker/Dockerfile.ci_i386 | 2 +- docker/Dockerfile.ci_lint | 2 +- docker/Dockerfile.ci_minimal | 2 +- docker/Dockerfile.ci_riscv | 2 +- docker/Dockerfile.ci_wasm | 2 +- docker/Dockerfile.demo_android | 2 +- docker/Dockerfile.demo_rocm | 2 +- docker/Dockerfile.demo_vitis_ai | 2 +- docker/install/ubuntu_install_python.sh | 23 ++++++++++++++++--- 15 files changed, 34 insertions(+), 17 deletions(-) diff --git a/apps/microtvm/reference-vm/base-box/base_box_setup_common.sh b/apps/microtvm/reference-vm/base-box/base_box_setup_common.sh index f0c1d2c6bef0..c0d8c892f764 100755 --- a/apps/microtvm/reference-vm/base-box/base_box_setup_common.sh +++ b/apps/microtvm/reference-vm/base-box/base_box_setup_common.sh @@ -46,7 +46,7 @@ sudo apt-install-and-clear -y --no-install-recommends \ cmake=3.22.2-0kitware1ubuntu18.04.1 cmake-data=3.22.2-0kitware1ubuntu18.04.1 \ # Python -sudo ~/ubuntu_install_python.sh +sudo ~/ubuntu_install_python.sh 3.7 rm -f ~/ubuntu_install_python.sh # Poetry deps diff --git a/docker/Dockerfile.ci_arm b/docker/Dockerfile.ci_arm index 9bb34589b5f9..bd2b2d8fb145 100644 --- a/docker/Dockerfile.ci_arm +++ b/docker/Dockerfile.ci_arm @@ -56,7 +56,7 @@ RUN bash /install/ubuntu_install_llvm.sh ENV TVM_VENV /venv/apache-tvm-py3.7 COPY python/bootstrap/lockfiles /install/python/bootstrap/lockfiles COPY install/ubuntu_install_python.sh /install/ubuntu_install_python.sh -RUN bash /install/ubuntu_install_python.sh +RUN bash /install/ubuntu_install_python.sh 3.7 ENV PATH ${TVM_VENV}/bin:$PATH ENV PYTHONNOUSERSITE 1 # Disable .local directory from affecting CI. diff --git a/docker/Dockerfile.ci_cortexm b/docker/Dockerfile.ci_cortexm index 346c24c9df53..50062d9dea35 100644 --- a/docker/Dockerfile.ci_cortexm +++ b/docker/Dockerfile.ci_cortexm @@ -38,7 +38,7 @@ 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/ubuntu_install_python.sh /install/ubuntu_install_python.sh -RUN bash /install/ubuntu_install_python.sh +RUN bash /install/ubuntu_install_python.sh 3.7 ENV PATH ${TVM_VENV}/bin:$PATH ENV PYTHONNOUSERSITE 1 # Disable .local directory from affecting CI. diff --git a/docker/Dockerfile.ci_cpu b/docker/Dockerfile.ci_cpu index 9436f1758e14..74e90670ab23 100644 --- a/docker/Dockerfile.ci_cpu +++ b/docker/Dockerfile.ci_cpu @@ -37,7 +37,7 @@ 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/ubuntu_install_python.sh /install/ubuntu_install_python.sh -RUN bash /install/ubuntu_install_python.sh +RUN bash /install/ubuntu_install_python.sh 3.7 ENV PATH ${TVM_VENV}/bin:$PATH ENV PYTHONNOUSERSITE 1 # Disable .local directory from affecting CI. diff --git a/docker/Dockerfile.ci_gpu b/docker/Dockerfile.ci_gpu index 9917e4cc78a7..daf6381908d8 100644 --- a/docker/Dockerfile.ci_gpu +++ b/docker/Dockerfile.ci_gpu @@ -44,7 +44,7 @@ RUN bash /install/ubuntu_install_googletest.sh /googletest ENV TVM_VENV /venv/apache-tvm-py3.7 COPY python/bootstrap/lockfiles /install/python/bootstrap/lockfiles COPY install/ubuntu_install_python.sh /install/ubuntu_install_python.sh -RUN bash /install/ubuntu_install_python.sh +RUN bash /install/ubuntu_install_python.sh 3.7 ENV PATH ${TVM_VENV}/bin:$PATH ENV PYTHONNOUSERSITE 1 # Disable .local directory from affecting CI. diff --git a/docker/Dockerfile.ci_hexagon b/docker/Dockerfile.ci_hexagon index 2be11f034515..bf4e33fc7c18 100644 --- a/docker/Dockerfile.ci_hexagon +++ b/docker/Dockerfile.ci_hexagon @@ -40,7 +40,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/ubuntu_install_python.sh -RUN bash /install/ubuntu_install_python.sh +RUN bash /install/ubuntu_install_python.sh 3.8 ENV PATH ${TVM_VENV}/bin:$PATH ENV PYTHONNOUSERSITE 1 # Disable .local directory from affecting CI. diff --git a/docker/Dockerfile.ci_i386 b/docker/Dockerfile.ci_i386 index 9a2e08eaab76..4dbf94a22e6d 100644 --- a/docker/Dockerfile.ci_i386 +++ b/docker/Dockerfile.ci_i386 @@ -52,7 +52,7 @@ ENV PYTHONNOUSERSITE 1 # Disable .local directory from affecting CI. ENV TVM_VENV /venv/apache-tvm-py3.7 COPY python/bootstrap/lockfiles /install/python/bootstrap/lockfiles COPY install/ubuntu_install_python.sh /install/ubuntu_install_python.sh -RUN bash /install/ubuntu_install_python.sh +RUN bash /install/ubuntu_install_python.sh 3.7 ENV PATH ${TVM_VENV}/bin:$PATH COPY install/ubuntu_install_python_package.sh /install/ubuntu_install_python_package.sh diff --git a/docker/Dockerfile.ci_lint b/docker/Dockerfile.ci_lint index 860a43fa2194..f7d5838877ba 100644 --- a/docker/Dockerfile.ci_lint +++ b/docker/Dockerfile.ci_lint @@ -29,7 +29,7 @@ RUN apt-install-and-clear -y wget git sudo make parallel ENV TVM_VENV /venv/apache-tvm-py3.7 COPY python/bootstrap/lockfiles /install/python/bootstrap/lockfiles COPY install/ubuntu_install_python.sh /install/ubuntu_install_python.sh -RUN bash /install/ubuntu_install_python.sh +RUN bash /install/ubuntu_install_python.sh 3.7 ENV PATH ${TVM_VENV}/bin:$PATH ENV PYTHONNOUSERSITE 1 # Disable .local directory from affecting CI. diff --git a/docker/Dockerfile.ci_minimal b/docker/Dockerfile.ci_minimal index 8ebcc6c9b9f2..ec6aa78b2fc0 100644 --- a/docker/Dockerfile.ci_minimal +++ b/docker/Dockerfile.ci_minimal @@ -37,7 +37,7 @@ 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/ubuntu_install_python.sh /install/ubuntu_install_python.sh -RUN bash /install/ubuntu_install_python.sh +RUN bash /install/ubuntu_install_python.sh 3.7 ENV PATH ${TVM_VENV}/bin:$PATH ENV PYTHONNOUSERSITE 1 # Disable .local directory from affecting CI. diff --git a/docker/Dockerfile.ci_riscv b/docker/Dockerfile.ci_riscv index 3dd1943d27e1..a640e996c7be 100644 --- a/docker/Dockerfile.ci_riscv +++ b/docker/Dockerfile.ci_riscv @@ -38,7 +38,7 @@ 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/ubuntu_install_python.sh /install/ubuntu_install_python.sh -RUN bash /install/ubuntu_install_python.sh +RUN bash /install/ubuntu_install_python.sh 3.7 ENV PATH ${TVM_VENV}/bin:$PATH ENV PYTHONNOUSERSITE 1 # Disable .local directory from affecting CI. diff --git a/docker/Dockerfile.ci_wasm b/docker/Dockerfile.ci_wasm index 3e794c312c66..e69f0774008a 100644 --- a/docker/Dockerfile.ci_wasm +++ b/docker/Dockerfile.ci_wasm @@ -35,7 +35,7 @@ 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/ubuntu_install_python.sh /install/ubuntu_install_python.sh -RUN bash /install/ubuntu_install_python.sh +RUN bash /install/ubuntu_install_python.sh 3.7 ENV PATH ${TVM_VENV}/bin:$PATH ENV PYTHONNOUSERSITE 1 # Disable .local directory from affecting CI. diff --git a/docker/Dockerfile.demo_android b/docker/Dockerfile.demo_android index cb5a9e0015ab..ebfacabb4e67 100644 --- a/docker/Dockerfile.demo_android +++ b/docker/Dockerfile.demo_android @@ -31,7 +31,7 @@ RUN bash /install/ubuntu_install_core.sh ENV TVM_VENV /venv/apache-tvm-py3.7 COPY python/bootstrap/lockfiles /install/python/bootstrap/lockfiles COPY install/ubuntu_install_python.sh /install/ubuntu1804_install_python.sh -RUN bash /install/ubuntu1804_install_python.sh +RUN bash /install/ubuntu1804_install_python.sh 3.7 ENV PATH ${TVM_VENV}/bin:$PATH ENV PYTHONNOUSERSITE 1 # Disable .local directory from affecting CI. diff --git a/docker/Dockerfile.demo_rocm b/docker/Dockerfile.demo_rocm index b4cb83f7f68c..79bd2cb9be11 100644 --- a/docker/Dockerfile.demo_rocm +++ b/docker/Dockerfile.demo_rocm @@ -29,7 +29,7 @@ RUN bash /install/ubuntu_install_core.sh ENV TVM_VENV /venv/apache-tvm-py3.7 COPY python/bootstrap/lockfiles /install/python/bootstrap/lockfiles COPY install/ubuntu_install_python.sh /install/ubuntu_install_python.sh -RUN bash /install/ubuntu_install_python.sh +RUN bash /install/ubuntu_install_python.sh 3.7 ENV PATH ${TVM_VENV}/bin:$PATH ENV PYTHONNOUSERSITE 1 # Disable .local directory from affecting CI. diff --git a/docker/Dockerfile.demo_vitis_ai b/docker/Dockerfile.demo_vitis_ai index c90091e7ecd2..df56c6326d49 100644 --- a/docker/Dockerfile.demo_vitis_ai +++ b/docker/Dockerfile.demo_vitis_ai @@ -35,7 +35,7 @@ RUN bash /install/ubuntu_install_vitis_ai_core.sh ENV TVM_VENV /venv/apache-tvm-py3.7 COPY python/bootstrap/lockfiles /install/python/bootstrap/lockfiles COPY install/ubuntu_install_python.sh /install/ubuntu_install_python.sh -RUN bash /install/ubuntu_install_python.sh +RUN bash /install/ubuntu_install_python.sh 3.7 ENV PATH ${TVM_VENV}/bin:$PATH ENV PYTHONNOUSERSITE 1 # Disable .local directory from affecting CI. diff --git a/docker/install/ubuntu_install_python.sh b/docker/install/ubuntu_install_python.sh index eb6dcec45c5d..85a8cc48a95a 100755 --- a/docker/install/ubuntu_install_python.sh +++ b/docker/install/ubuntu_install_python.sh @@ -27,17 +27,35 @@ if [ -z "${TVM_VENV+x}" ]; then exit 2 fi +if [ "$#" -lt 1 ]; then + echo "Usage: docker/install/ubuntu_install_python.sh " + exit -1 +fi +PYTHON_VERSION=$1 + +if [ "${PYTHON_VERSION}" != "3.7" ] && [ "${PYTHON_VERSION}" != "3.8" ]; then + echo "Only 3.7 and 3.8 versions are supported in this script." + exit -1 +fi + apt-get update # Ensure lsb-release is installed. apt-install-and-clear -y \ lsb-core +apt-install-and-clear -y software-properties-common + release=$(lsb_release -sc) if [ "${release}" == "bionic" ]; then - PYTHON_VERSION=3.7 + if [ "${PYTHON_VERSION}" == "3.8" ]; then + echo "Only 3.7 is supported for bionic in this script." + exit -1 + fi elif [ "${release}" == "focal" ]; then - PYTHON_VERSION=3.8 + if [ "${PYTHON_VERSION}" == "3.7" ]; then + add-apt-repository -y ppa:deadsnakes/ppa + fi else echo "Don't know which version of python to install for lsb-release ${release}" exit 2 @@ -45,7 +63,6 @@ fi # Install python and pip. Don't modify this to add Python package dependencies, # instead modify install_python_package.sh -apt-install-and-clear -y software-properties-common apt-install-and-clear -y \ acl \ python${PYTHON_VERSION} \