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 f85bb7bbd10cff59d699428acf812ceadfe53a21 Author: Andrew Reusch <[email protected]> AuthorDate: Mon Jun 13 18:04:05 2022 -0700 fix tensorflow deps --- docker/Dockerfile.ci_arm | 9 ++++----- docker/Dockerfile.ci_i386 | 4 ++++ ...l_tensorflow_aarch64.sh => ubuntu_install_tensorflow_deps.sh} | 0 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile.ci_arm b/docker/Dockerfile.ci_arm index 3df656cc97..4a33422fbc 100644 --- a/docker/Dockerfile.ci_arm +++ b/docker/Dockerfile.ci_arm @@ -56,6 +56,10 @@ 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 +# TensorFlow C++ deps +COPY install/ubuntu_install_tensorflow_deps.sh /install/ubuntu_install_tensorflow_deps.sh +RUN bash /install/ubuntu_install_tensorflow_deps.sh + COPY python/build/pyproject.toml /install/python/pyproject.toml COPY python/build/poetry.lock /install/python/poetry.lock COPY install/ubuntu_install_python_package.sh /install/ubuntu_install_python_package.sh @@ -67,11 +71,6 @@ RUN bash /install/ubuntu_install_python_package.sh \ -E tvmc \ ; - -# TensorFlow C++ deps -COPY install/ubuntu_install_tensorflow_aarch64.sh /install/ubuntu_install_tensorflow_aarch64.sh -RUN bash /install/ubuntu_install_tensorflow_aarch64.sh - # Caffe deps COPY install/ubuntu_install_boost.sh /install/ubuntu_install_boost.sh RUN bash /install/ubuntu_install_boost.sh diff --git a/docker/Dockerfile.ci_i386 b/docker/Dockerfile.ci_i386 index b499d977c2..ee8849128c 100644 --- a/docker/Dockerfile.ci_i386 +++ b/docker/Dockerfile.ci_i386 @@ -39,6 +39,10 @@ ENV RUSTUP_HOME /opt/rust ENV CARGO_HOME /opt/rust ENV PATH $PATH:$CARGO_HOME/bin +# TensorFlow C++ deps +COPY install/ubuntu_install_tensorflow_deps.sh /install/ubuntu_install_tensorflow_deps.sh +RUN bash /install/ubuntu_install_tensorflow_deps.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 diff --git a/docker/install/ubuntu_install_tensorflow_aarch64.sh b/docker/install/ubuntu_install_tensorflow_deps.sh similarity index 100% rename from docker/install/ubuntu_install_tensorflow_aarch64.sh rename to docker/install/ubuntu_install_tensorflow_deps.sh
