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/06/29 22:00:56 UTC
[tvm] branch areusch/freeze-dependencies updated (1ffe4982ec -> 424cbdf718)
This is an automated email from the ASF dual-hosted git repository.
areusch pushed a change to branch areusch/freeze-dependencies
in repository https://gitbox.apache.org/repos/asf/tvm.git
discard 1ffe4982ec cmake from ppa
new 424cbdf718 cmake from ppa
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (1ffe4982ec)
\
N -- N -- N refs/heads/areusch/freeze-dependencies (424cbdf718)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
docker/install/ubuntu_install_core.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[tvm] 01/01: cmake from ppa
Posted by ar...@apache.org.
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 424cbdf718eeaa91d50bb7e81b78c048a8319993
Author: Andrew Reusch <ar...@gmail.com>
AuthorDate: Wed Jun 29 14:54:40 2022 -0700
cmake from ppa
---
docker/Dockerfile.ci_arm | 4 ++--
docker/Dockerfile.ci_gpu | 4 ++--
docker/Dockerfile.ci_i386 | 4 ++--
docker/install/ubuntu_install_core.sh | 25 ++++++++++++++++++++++---
4 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/docker/Dockerfile.ci_arm b/docker/Dockerfile.ci_arm
index 4a33422fbc..16dc6995a4 100644
--- a/docker/Dockerfile.ci_arm
+++ b/docker/Dockerfile.ci_arm
@@ -53,8 +53,8 @@ COPY install/ubuntu1804_install_python.sh /install/ubuntu1804_install_python.sh
RUN bash /install/ubuntu1804_install_python.sh
ENV PATH ${TVM_VENV}/bin:$PATH
-COPY install/ubuntu_install_cmake_source.sh /install/ubuntu_install_cmake_source.sh
-RUN bash /install/ubuntu_install_cmake_source.sh
+# COPY install/ubuntu_install_cmake_source.sh /install/ubuntu_install_cmake_source.sh
+# RUN bash /install/ubuntu_install_cmake_source.sh
# TensorFlow C++ deps
COPY install/ubuntu_install_tensorflow_deps.sh /install/ubuntu_install_tensorflow_deps.sh
diff --git a/docker/Dockerfile.ci_gpu b/docker/Dockerfile.ci_gpu
index 60d93aa0c8..a29f097950 100644
--- a/docker/Dockerfile.ci_gpu
+++ b/docker/Dockerfile.ci_gpu
@@ -41,8 +41,8 @@ COPY install/ubuntu1804_install_python.sh /install/ubuntu1804_install_python.sh
RUN bash /install/ubuntu1804_install_python.sh
ENV PATH ${TVM_VENV}/bin:$PATH
-COPY install/ubuntu_install_cmake_source.sh /install/ubuntu_install_cmake_source.sh
-RUN bash /install/ubuntu_install_cmake_source.sh
+# COPY install/ubuntu_install_cmake_source.sh /install/ubuntu_install_cmake_source.sh
+# RUN bash /install/ubuntu_install_cmake_source.sh
COPY install/ubuntu1804_install_llvm.sh /install/ubuntu1804_install_llvm.sh
RUN bash /install/ubuntu1804_install_llvm.sh
diff --git a/docker/Dockerfile.ci_i386 b/docker/Dockerfile.ci_i386
index 3babb10360..db6d3aac36 100644
--- a/docker/Dockerfile.ci_i386
+++ b/docker/Dockerfile.ci_i386
@@ -52,8 +52,8 @@ ENV PATH ${TVM_VENV}/bin:$PATH
COPY install/ubuntu_install_llvm.sh /install/ubuntu_install_llvm.sh
RUN bash /install/ubuntu_install_llvm.sh
-COPY install/ubuntu_install_cmake_source.sh /install/ubuntu_install_cmake_source.sh
-RUN bash /install/ubuntu_install_cmake_source.sh
+# COPY install/ubuntu_install_cmake_source.sh /install/ubuntu_install_cmake_source.sh
+# RUN bash /install/ubuntu_install_cmake_source.sh
COPY python/build/pyproject.toml /install/python/pyproject.toml
COPY python/build/poetry.lock /install/python/poetry.lock
diff --git a/docker/install/ubuntu_install_core.sh b/docker/install/ubuntu_install_core.sh
index d912fc30e4..1502e4d434 100755
--- a/docker/install/ubuntu_install_core.sh
+++ b/docker/install/ubuntu_install_core.sh
@@ -50,7 +50,26 @@ apt-get update && apt-install-and-clear -y --no-install-recommends \
wget \
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor - | sudo tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
-echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null
+os_release=$(lsb_release -sc)
+echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ ${os_release} main" | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null
+
+arch=$(dpkg-architecture -q DEB_HOST_ARCH)
+case "${arch}-${os_release}" in
+ amd64-bionic|i386-bionic)
+ cmake_version=3.16.1-0kitware1
+ ;;
+ amd64-focal|i386-focal)
+ cmake_version=3.17.2-0kitware1
+ ;;
+ arm64-focal)
+ cmake_version=3.19.0-0kitware1
+ ;;
+ *)
+ echo "Don't know which version of cmake to install for dpkg-architecture -q DEB_HOST_ARCH ${arch} and lsb_release -sc: ${os_release}"
+ exit 2
+ ;;
+esac
+
apt-get update && apt-install-and-clear -y --no-install-recommends \
- cmake=3.17.2-0kitware1 \
- cmake-data=3.17.2-0kitware1 \
+ cmake=${cmake_version} \
+ cmake-data=${cmake_version} \