From 4a1e7d2d2e5bd3ca82bf5164a6b15e5176389ead Mon Sep 17 00:00:00 2001 From: Masahiro Masuda Date: Tue, 21 Jan 2020 17:42:38 +0900 Subject: [PATCH 1/3] update torch version --- docker/install/ubuntu_install_onnx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/install/ubuntu_install_onnx.sh b/docker/install/ubuntu_install_onnx.sh index a915ca02c05a..4dd0daef2cfb 100755 --- a/docker/install/ubuntu_install_onnx.sh +++ b/docker/install/ubuntu_install_onnx.sh @@ -28,4 +28,4 @@ pip3 install onnxruntime==1.0.0 # not expose that in the wheel!!! pip3 install future -pip3 install torch==1.2.0 torchvision==0.4.0 +pip3 install torch==1.4.0 torchvision==0.5.0 From ab713abfce19297ade572ee04b0a19e75c75eb89 Mon Sep 17 00:00:00 2001 From: Masahiro Masuda Date: Thu, 23 Jan 2020 19:20:00 +0900 Subject: [PATCH 2/3] Revert "Pin python pillow to "<7" due to torchvision 1.2.0 dependency issue (#4632)" This reverts commit d93e1dca81f3bcf122148e29d0b5e72af97811b1. --- docker/Dockerfile.ci_gpu | 2 +- docker/Dockerfile.demo_gpu | 2 +- docker/Dockerfile.demo_opencl | 2 +- docker/install/ubuntu_install_python_package.sh | 2 +- docs/README.txt | 2 +- python/setup.py | 2 +- vta/tutorials/autotvm/tune_relay_vta.py | 2 +- vta/tutorials/frontend/deploy_vision_on_vta.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/Dockerfile.ci_gpu b/docker/Dockerfile.ci_gpu index 7a65a70061b7..c803b3919063 100644 --- a/docker/Dockerfile.ci_gpu +++ b/docker/Dockerfile.ci_gpu @@ -87,7 +87,7 @@ RUN bash /install/ubuntu_install_caffe2.sh COPY install/ubuntu_install_dgl.sh /install/ubuntu_install_dgl.sh RUN bash /install/ubuntu_install_dgl.sh -RUN pip3 install "Pillow<7" +RUN pip3 install Pillow COPY install/ubuntu_install_vulkan.sh /install/ubuntu_install_vulkan.sh RUN bash /install/ubuntu_install_vulkan.sh diff --git a/docker/Dockerfile.demo_gpu b/docker/Dockerfile.demo_gpu index b97150ffcbf1..730d86c64e08 100644 --- a/docker/Dockerfile.demo_gpu +++ b/docker/Dockerfile.demo_gpu @@ -21,7 +21,7 @@ FROM tvmai/ci-gpu:v0.55 # Jupyter notebook. -RUN pip3 install matplotlib Image "Pillow<7" jupyter[notebook] +RUN pip3 install matplotlib Image Pillow jupyter[notebook] # Build TVM COPY install/install_tvm_gpu.sh /install/install_tvm_gpu.sh diff --git a/docker/Dockerfile.demo_opencl b/docker/Dockerfile.demo_opencl index fb2d8999dc54..bf27eef862f5 100644 --- a/docker/Dockerfile.demo_opencl +++ b/docker/Dockerfile.demo_opencl @@ -45,7 +45,7 @@ RUN apt-get install -y python3-dev python3-pip RUN pip3 install setuptools numpy pytest cython decorator scipy tornado psutil xgboost RUN echo "Installing Jupyter notebook" -RUN pip3 install matplotlib Image "Pillow<7" jupyter[notebook] +RUN pip3 install matplotlib Image Pillow jupyter[notebook] RUN echo "Installing OpenCL libraries" RUN apt-get install -y libviennacl-dev mesa-opencl-icd ocl-icd-opencl-dev clinfo diff --git a/docker/install/ubuntu_install_python_package.sh b/docker/install/ubuntu_install_python_package.sh index 32fa0b2251a0..2eaf00e8fdd0 100755 --- a/docker/install/ubuntu_install_python_package.sh +++ b/docker/install/ubuntu_install_python_package.sh @@ -21,4 +21,4 @@ set -u set -o pipefail # install libraries for python package on ubuntu -pip3 install pylint==1.9.4 six numpy pytest cython decorator scipy tornado typed_ast pytest mypy orderedset antlr4-python3-runtime attrs requests "Pillow<7" packaging +pip3 install pylint==1.9.4 six numpy pytest cython decorator scipy tornado typed_ast pytest mypy orderedset antlr4-python3-runtime attrs requests Pillow packaging diff --git a/docs/README.txt b/docs/README.txt index 18d97a3949f5..fffdaa233ef8 100644 --- a/docs/README.txt +++ b/docs/README.txt @@ -3,7 +3,7 @@ TVM Documentations This folder contains the source of TVM documents - A hosted version of doc is at http://docs.tvm.ai -- pip install sphinx>=1.5.5 sphinx-gallery sphinx_rtd_theme matplotlib Image recommonmark "Pillow<7" +- pip install sphinx>=1.5.5 sphinx-gallery sphinx_rtd_theme matplotlib Image recommonmark Pillow - Build tvm first in the root folder. - To build locally, you need to enable USE_CUDA, USE_OPENCL, LLVM_CONFIG in config.mk and then type "make html" in this folder. diff --git a/python/setup.py b/python/setup.py index a135a6c41101..a9e4ad8d16f7 100644 --- a/python/setup.py +++ b/python/setup.py @@ -160,7 +160,7 @@ def get_package_data_files(): 'attrs', 'psutil', ], - extras_require={'test': ['pillow<7', + extras_require={'test': ['pillow', 'matplotlib'], 'extra_feature': ['tornado', 'psutil', diff --git a/vta/tutorials/autotvm/tune_relay_vta.py b/vta/tutorials/autotvm/tune_relay_vta.py index 25360ce468f2..409ffa9d0d12 100644 --- a/vta/tutorials/autotvm/tune_relay_vta.py +++ b/vta/tutorials/autotvm/tune_relay_vta.py @@ -40,7 +40,7 @@ # # .. code-block:: bash # -# pip3 install --user psutil xgboost tornado mxnet requests "Pillow<7" +# pip3 install --user psutil xgboost tornado mxnet requests pillow # # To make TVM run faster during tuning, it is recommended to use cython # as FFI of TVM. In the root directory of TVM, execute diff --git a/vta/tutorials/frontend/deploy_vision_on_vta.py b/vta/tutorials/frontend/deploy_vision_on_vta.py index 154eb85ed9a5..4c2e4cbfc0d2 100644 --- a/vta/tutorials/frontend/deploy_vision_on_vta.py +++ b/vta/tutorials/frontend/deploy_vision_on_vta.py @@ -34,7 +34,7 @@ # # .. code-block:: bash # -# pip3 install --user mxnet requests "Pillow<7" +# pip3 install --user mxnet requests pillow # # Now return to the python code. Import packages. From f95c996d88d8ad0a0a5194679dc43ca33085abfc Mon Sep 17 00:00:00 2001 From: Masahiro Masuda Date: Tue, 4 Feb 2020 06:54:38 +0900 Subject: [PATCH 3/3] update onnx to 1.6 --- docker/install/ubuntu_install_onnx.sh | 2 +- tests/python/frontend/onnx/test_forward.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/install/ubuntu_install_onnx.sh b/docker/install/ubuntu_install_onnx.sh index 4dd0daef2cfb..2ad601983fa2 100755 --- a/docker/install/ubuntu_install_onnx.sh +++ b/docker/install/ubuntu_install_onnx.sh @@ -21,7 +21,7 @@ set -u set -o pipefail # fix to certain version for now -pip3 install onnx==1.5.0 +pip3 install onnx==1.6.0 pip3 install onnxruntime==1.0.0 # torch depends on a number of other packages, but unhelpfully, does diff --git a/tests/python/frontend/onnx/test_forward.py b/tests/python/frontend/onnx/test_forward.py index fc05e7a011a9..f9e8aac4e389 100644 --- a/tests/python/frontend/onnx/test_forward.py +++ b/tests/python/frontend/onnx/test_forward.py @@ -16,6 +16,8 @@ # under the License. import numpy as np import math +import onnx +from onnx import helper, TensorProto, mapping import torch import torchvision import topi @@ -24,8 +26,6 @@ from tvm import relay from tvm.contrib import graph_runtime from tvm.relay.testing.config import ctx_list -import onnx -from onnx import helper, TensorProto, mapping import scipy