Commit d93e1dca by Leandro Nunes Committed by Tianqi Chen

Pin python pillow to "<7" due to torchvision 1.2.0 dependency issue (#4632)

* As a result of backwards incompatible changes released in pillow 7.0,
   torchvision crashes if you just "pip install pillow", as we do in
   a few places.

 * This patch sets pillow<7 to be installed in Dockerfiles and support
   material as tutorials and documentation.
parent 218db33a
...@@ -87,7 +87,7 @@ RUN bash /install/ubuntu_install_caffe2.sh ...@@ -87,7 +87,7 @@ RUN bash /install/ubuntu_install_caffe2.sh
COPY install/ubuntu_install_dgl.sh /install/ubuntu_install_dgl.sh COPY install/ubuntu_install_dgl.sh /install/ubuntu_install_dgl.sh
RUN bash /install/ubuntu_install_dgl.sh RUN bash /install/ubuntu_install_dgl.sh
RUN pip3 install Pillow RUN pip3 install "Pillow<7"
COPY install/ubuntu_install_vulkan.sh /install/ubuntu_install_vulkan.sh COPY install/ubuntu_install_vulkan.sh /install/ubuntu_install_vulkan.sh
RUN bash /install/ubuntu_install_vulkan.sh RUN bash /install/ubuntu_install_vulkan.sh
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
FROM tvmai/ci-gpu:v0.54 FROM tvmai/ci-gpu:v0.54
# Jupyter notebook. # Jupyter notebook.
RUN pip3 install matplotlib Image Pillow jupyter[notebook] RUN pip3 install matplotlib Image "Pillow<7" jupyter[notebook]
# Build TVM # Build TVM
COPY install/install_tvm_gpu.sh /install/install_tvm_gpu.sh COPY install/install_tvm_gpu.sh /install/install_tvm_gpu.sh
......
...@@ -45,7 +45,7 @@ RUN apt-get install -y python3-dev python3-pip ...@@ -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 pip3 install setuptools numpy pytest cython decorator scipy tornado psutil xgboost
RUN echo "Installing Jupyter notebook" RUN echo "Installing Jupyter notebook"
RUN pip3 install matplotlib Image Pillow jupyter[notebook] RUN pip3 install matplotlib Image "Pillow<7" jupyter[notebook]
RUN echo "Installing OpenCL libraries" RUN echo "Installing OpenCL libraries"
RUN apt-get install -y libviennacl-dev mesa-opencl-icd ocl-icd-opencl-dev clinfo RUN apt-get install -y libviennacl-dev mesa-opencl-icd ocl-icd-opencl-dev clinfo
......
...@@ -21,4 +21,4 @@ set -u ...@@ -21,4 +21,4 @@ set -u
set -o pipefail set -o pipefail
# install libraries for python package on ubuntu # 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 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<7" packaging
...@@ -3,7 +3,7 @@ TVM Documentations ...@@ -3,7 +3,7 @@ TVM Documentations
This folder contains the source of TVM documents This folder contains the source of TVM documents
- A hosted version of doc is at http://docs.tvm.ai - 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 - pip install sphinx>=1.5.5 sphinx-gallery sphinx_rtd_theme matplotlib Image recommonmark "Pillow<7"
- Build tvm first in the root folder. - 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. - To build locally, you need to enable USE_CUDA, USE_OPENCL, LLVM_CONFIG in config.mk and then type "make html" in this folder.
......
...@@ -160,7 +160,7 @@ setup(name='tvm', ...@@ -160,7 +160,7 @@ setup(name='tvm',
'attrs', 'attrs',
'psutil', 'psutil',
], ],
extras_require={'test': ['pillow', extras_require={'test': ['pillow<7',
'matplotlib'], 'matplotlib'],
'extra_feature': ['tornado', 'extra_feature': ['tornado',
'psutil', 'psutil',
......
...@@ -40,7 +40,7 @@ log file to get the best knob parameters. ...@@ -40,7 +40,7 @@ log file to get the best knob parameters.
# #
# .. code-block:: bash # .. code-block:: bash
# #
# pip3 install --user psutil xgboost tornado mxnet requests pillow # pip3 install --user psutil xgboost tornado mxnet requests "Pillow<7"
# #
# To make TVM run faster during tuning, it is recommended to use cython # To make TVM run faster during tuning, it is recommended to use cython
# as FFI of TVM. In the root directory of TVM, execute # as FFI of TVM. In the root directory of TVM, execute
......
...@@ -34,7 +34,7 @@ tensorization in the core) to massage the compute graph for the hardware target. ...@@ -34,7 +34,7 @@ tensorization in the core) to massage the compute graph for the hardware target.
# #
# .. code-block:: bash # .. code-block:: bash
# #
# pip3 install --user mxnet requests pillow # pip3 install --user mxnet requests "Pillow<7"
# #
# Now return to the python code. Import packages. # Now return to the python code. Import packages.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment