Skip to content

Commit a581e74

Browse files
authored
Pin Pillow because of a EasyOCR breakage (#1269)
http://b/290035631
1 parent 15bd161 commit a581e74

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

Dockerfile.tmpl

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ RUN conda config --add channels nvidia && \
9696
conda install -c conda-forge mamba && \
9797
# Base image channel order: conda-forge (highest priority), defaults.
9898
# End state: rapidsai (highest priority), nvidia, conda-forge, defaults.
99-
mamba install mkl cartopy imagemagick pyproj "shapely<2" && \
99+
mamba install -y mkl cartopy imagemagick pyproj "shapely<2" && \
100100
/tmp/clean-layer.sh
101101

102102
{{ if eq .Accelerator "gpu" }}
@@ -109,17 +109,17 @@ RUN pip uninstall -y pyarrow && \
109109

110110
# Install implicit
111111
{{ if eq .Accelerator "gpu" }}
112-
RUN mamba install implicit implicit-proc=*=gpu && \
112+
RUN mamba install -y implicit implicit-proc=*=gpu && \
113113
/tmp/clean-layer.sh
114114
{{ else }}
115-
RUN mamba install implicit && \
115+
RUN mamba install -y implicit && \
116116
/tmp/clean-layer.sh
117117
{{ end}}
118118

119119
# Install PyTorch
120120
{{ if eq .Accelerator "gpu" }}
121121
COPY --from=torch_whl /tmp/whl/*.whl /tmp/torch/
122-
RUN mamba install -c pytorch magma-cuda${CUDA_MAJOR_VERSION}${CUDA_MINOR_VERSION} && \
122+
RUN mamba install -y -c pytorch magma-cuda${CUDA_MAJOR_VERSION}${CUDA_MINOR_VERSION} && \
123123
pip install /tmp/torch/*.whl && \
124124
# b/255757999 openmp (libomp.so) is an dependency of libtorchtext and libtorchaudio but
125125
mamba install -y openmp && \
@@ -161,7 +161,7 @@ RUN pip install jax[cpu] && \
161161

162162
# Install spacy
163163
{{ if eq .Accelerator "gpu" }}
164-
RUN mamba install -c conda-forge spacy cupy && \
164+
RUN mamba install -y -c conda-forge spacy cupy && \
165165
/tmp/clean-layer.sh
166166
{{ else }}
167167
RUN pip install spacy && \
@@ -386,8 +386,9 @@ RUN pip install annoy \
386386
google-cloud-automl==1.0.1 \
387387
google-api-core==1.33.2 \
388388
google-cloud-bigquery \
389-
google-cloud-storage \
390-
google-cloud-translate==3.* \
389+
google-cloud-storage && \
390+
# Split these installations to avoid `pip._vendor.resolvelib.resolvers.ResolutionTooDeep: 200000`
391+
pip install google-cloud-translate==3.* \
391392
google-cloud-language==2.* \
392393
google-cloud-videointelligence==2.* \
393394
google-cloud-vision==2.* \
@@ -447,7 +448,8 @@ RUN pip install bleach \
447448
pandocfilters \
448449
pexpect \
449450
pickleshare \
450-
Pillow && \
451+
# TODO(b/290035631) unpin when EasyOCR did a release.
452+
Pillow==9.5.0 && \
451453
# Install openslide and its python binding
452454
apt-get install -y openslide-tools && \
453455
pip install openslide-python \

0 commit comments

Comments
 (0)