This is an automated email from the ASF dual-hosted git repository.
tqchen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tvm.git
The following commit(s) were added to refs/heads/master by this push:
new 4196726 [CI] Update ci-cpu to bionic (#5554)
4196726 is described below
commit 419672617d983cca2836e84d7908ffda20003990
Author: Tianqi Chen <[email protected]>
AuthorDate: Mon May 11 09:04:28 2020 -0700
[CI] Update ci-cpu to bionic (#5554)
---
docker/Dockerfile.ci_cpu | 12 +++++------
...nstall_nnpack.sh => ubuntu1804_install_llvm.sh} | 25 +++++++++++++---------
...stall_redis.sh => ubuntu1804_install_python.sh} | 17 ++++++++++-----
docker/install/ubuntu_install_nnpack.sh | 2 +-
docker/install/ubuntu_install_redis.sh | 5 ++---
docker/install/ubuntu_install_tflite.sh | 4 +---
6 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/docker/Dockerfile.ci_cpu b/docker/Dockerfile.ci_cpu
index abd7c0d..f1a928a 100644
--- a/docker/Dockerfile.ci_cpu
+++ b/docker/Dockerfile.ci_cpu
@@ -16,22 +16,22 @@
# under the License.
# CI docker CPU env
-# tag: v0.55
-FROM ubuntu:16.04
+# tag: v0.62
+FROM ubuntu:18.04
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/ubuntu_install_python.sh
-RUN bash /install/ubuntu_install_python.sh
+COPY install/ubuntu1804_install_python.sh /install/ubuntu1804_install_python.sh
+RUN bash /install/ubuntu1804_install_python.sh
COPY install/ubuntu_install_python_package.sh
/install/ubuntu_install_python_package.sh
RUN bash /install/ubuntu_install_python_package.sh
-COPY install/ubuntu_install_llvm.sh /install/ubuntu_install_llvm.sh
-RUN bash /install/ubuntu_install_llvm.sh
+COPY install/ubuntu1804_install_llvm.sh /install/ubuntu1804_install_llvm.sh
+RUN bash /install/ubuntu1804_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/ubuntu_install_nnpack.sh
b/docker/install/ubuntu1804_install_llvm.sh
similarity index 50%
copy from docker/install/ubuntu_install_nnpack.sh
copy to docker/install/ubuntu1804_install_llvm.sh
index 6eb94ae..4f7c9df 100755
--- a/docker/install/ubuntu_install_nnpack.sh
+++ b/docker/install/ubuntu1804_install_llvm.sh
@@ -20,16 +20,21 @@ set -e
set -u
set -o pipefail
-apt-get update && apt-get install -y --no-install-recommends git cmake
+echo deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main\
+ >> /etc/apt/sources.list.d/llvm.list
+echo deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main\
+ >> /etc/apt/sources.list.d/llvm.list
-git clone https://github.com/Maratyszcza/NNPACK NNPACK
-git clone https://github.com/Maratyszcza/pthreadpool NNPACK/pthreadpool
-# Use specific versioning tag.
-(cd NNPACK && git checkout 1e005b0c2)
-(cd NNPACK/pthreadpool && git checkout 13da0b4c)
+echo deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main\
+ >> /etc/apt/sources.list.d/llvm.list
+echo deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main\
+ >> /etc/apt/sources.list.d/llvm.list
-mkdir -p NNPACK/build
-cd NNPACK/build
-cmake -DCMAKE_INSTALL_PREFIX:PATH=. -DNNPACK_INFERENCE_ONLY=OFF
-DNNPACK_CONVOLUTION_ONLY=OFF -DNNPACK_BUILD_TESTS=OFF
-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DPTHREADPOOL_SOURCE_DIR=pthreadpool .. &&
make -j2 && make install
-cd -
+echo deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic main\
+ >> /etc/apt/sources.list.d/llvm.list
+echo deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic 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-get install -y llvm-9 llvm-10 llvm-11 clang-9 clang-10
clang-11
diff --git a/docker/install/ubuntu_install_redis.sh
b/docker/install/ubuntu1804_install_python.sh
similarity index 71%
copy from docker/install/ubuntu_install_redis.sh
copy to docker/install/ubuntu1804_install_python.sh
index 9679fdd..6b4d6fb 100755
--- a/docker/install/ubuntu_install_redis.sh
+++ b/docker/install/ubuntu1804_install_python.sh
@@ -6,9 +6,9 @@
# 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
@@ -20,6 +20,13 @@ set -e
set -u
set -o pipefail
-apt-get update && apt-get install -y redis-server
-pip2 install xgboost psutil
-pip3 install xgboost psutil
+# install python and pip, don't modify this, modify install_python_package.sh
+apt-get update
+apt-get install -y software-properties-common
+apt-get install -y python3-dev python3-setuptools
+
+# Install pip
+cd /tmp && wget -q https://bootstrap.pypa.io/get-pip.py && python3 get-pip.py
+
+# Pin pip version
+pip3 install pip==19.3.1
diff --git a/docker/install/ubuntu_install_nnpack.sh
b/docker/install/ubuntu_install_nnpack.sh
index 6eb94ae..744f76a 100755
--- a/docker/install/ubuntu_install_nnpack.sh
+++ b/docker/install/ubuntu_install_nnpack.sh
@@ -20,7 +20,7 @@ set -e
set -u
set -o pipefail
-apt-get update && apt-get install -y --no-install-recommends git cmake
+apt-get update && apt-get install -y --no-install-recommends git cmake
python-setuptools
git clone https://github.com/Maratyszcza/NNPACK NNPACK
git clone https://github.com/Maratyszcza/pthreadpool NNPACK/pthreadpool
diff --git a/docker/install/ubuntu_install_redis.sh
b/docker/install/ubuntu_install_redis.sh
index 9679fdd..939b366 100755
--- a/docker/install/ubuntu_install_redis.sh
+++ b/docker/install/ubuntu_install_redis.sh
@@ -6,9 +6,9 @@
# 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
@@ -21,5 +21,4 @@ set -u
set -o pipefail
apt-get update && apt-get install -y redis-server
-pip2 install xgboost psutil
pip3 install xgboost psutil
diff --git a/docker/install/ubuntu_install_tflite.sh
b/docker/install/ubuntu_install_tflite.sh
index f7ed484..123ff52 100755
--- a/docker/install/ubuntu_install_tflite.sh
+++ b/docker/install/ubuntu_install_tflite.sh
@@ -29,7 +29,6 @@ cd ..
# Install flatbuffers python packages.
pip3 install flatbuffers
-pip2 install flatbuffers
# Build the TFLite static library, necessary for building with TFLite ON.
# The library is built at:
@@ -69,9 +68,8 @@ cat <<EOM >__init__.py
name = "tflite"
EOM
-# Install tflite over python2 and python3
+# Install tflite over python3
python3 setup.py install
-python2 setup.py install
cd ..
rm -rf tflite
