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.
apache · Jan 6, 2020 · d93e1dc · d93e1dc
1 parent 218db33
commit d93e1dc
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git 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
+RUN pip3 install "Pillow<7"
 
 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
@@ -21,7 +21,7 @@
 FROM tvmai/ci-gpu:v0.54
 
 # Jupyter notebook.
-RUN pip3 install matplotlib Image Pillow jupyter[notebook]
+RUN pip3 install matplotlib Image "Pillow<7" 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
@@ -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 jupyter[notebook]
+RUN pip3 install matplotlib Image "Pillow<7" 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
@@ -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 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
diff --git 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
+- pip install sphinx>=1.5.5 sphinx-gallery sphinx_rtd_theme matplotlib Image recommonmark "Pillow<7"
 - 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
@@ -160,7 +160,7 @@ def get_package_data_files():
         'attrs',
         'psutil',
         ],
-      extras_require={'test': ['pillow',
+      extras_require={'test': ['pillow<7',
                                'matplotlib'],
                       'extra_feature': ['tornado',
                                         'psutil',

diff --git 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
+#   pip3 install --user psutil xgboost tornado mxnet requests "Pillow<7"
 #
 # 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
@@ -34,7 +34,7 @@
 #
 # .. code-block:: bash
 #
-#   pip3 install --user mxnet requests pillow
+#   pip3 install --user mxnet requests "Pillow<7"
 #
 # Now return to the python code. Import packages.