Skip to content

[docker] Pillow -> Pillow-SIMD (#1509) #1639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions docker/hvd/Dockerfile.hvd-apex
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,25 @@ RUN pip install --no-cache-dir /tmp/apex/apex-*.whl && \
# Install tzdata / git
RUN apt-get update && \
ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime && \
apt-get install -y tzdata && \
apt-get -y install --no-install-recommends tzdata git && \
dpkg-reconfigure --frontend noninteractive tzdata && \
apt-get -y install --no-install-recommends git && \
apt-get autoremove -y && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

# Ignite main dependencies
RUN pip install --upgrade --no-cache-dir pytorch-ignite \
tensorboard \
tqdm

# replace pillow with pillow-simd
RUN apt-get update && apt-get -y install --no-install-recommends g++ && \
pip uninstall -y pillow && \
CC="cc -mavx2" pip install --upgrade --no-cache-dir --force-reinstall pillow-simd && \
apt-get remove -y g++ && \
apt-get autoremove -y && \
rm -rf /var/lib/apt/lists/*

# Checkout Ignite examples only
RUN mkdir -p pytorch-ignite-examples && \
cd pytorch-ignite-examples && \
Expand Down
1 change: 0 additions & 1 deletion docker/hvd/Dockerfile.hvd-apex-vision
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ RUN pip install --upgrade --no-cache-dir albumentations \
numpy \
opencv-python \
py_config_runner \
pillow \
clearml
13 changes: 11 additions & 2 deletions docker/hvd/Dockerfile.hvd-base
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,25 @@ FROM pytorch/pytorch:${PTH_VERSION}-runtime
# Install tzdata / git
RUN apt-get update && \
ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime && \
apt-get install -y tzdata && \
apt-get -y install --no-install-recommends tzdata git && \
dpkg-reconfigure --frontend noninteractive tzdata && \
apt-get -y install --no-install-recommends git && \
apt-get autoremove -y && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

# Ignite main dependencies
RUN pip install --upgrade --no-cache-dir pytorch-ignite \
tensorboard \
tqdm

# replace pillow with pillow-simd
RUN apt-get update && apt-get -y install --no-install-recommends g++ && \
pip uninstall -y pillow && \
CC="cc -mavx2" pip install --upgrade --no-cache-dir --force-reinstall pillow-simd && \
apt-get remove -y g++ && \
apt-get autoremove -y && \
rm -rf /var/lib/apt/lists/*

# Checkout Ignite examples only
RUN mkdir -p pytorch-ignite-examples && \
cd pytorch-ignite-examples && \
Expand Down
1 change: 0 additions & 1 deletion docker/hvd/Dockerfile.hvd-vision
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ RUN pip install --upgrade --no-cache-dir albumentations \
numpy \
opencv-python \
py_config_runner \
pillow \
clearml
13 changes: 11 additions & 2 deletions docker/main/Dockerfile.apex
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,25 @@ RUN pip install --no-cache-dir /tmp/apex/apex-*.whl && \
# Install tzdata / git
RUN apt-get update && \
ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime && \
apt-get install -y tzdata && \
apt-get -y install --no-install-recommends tzdata git && \
dpkg-reconfigure --frontend noninteractive tzdata && \
apt-get -y install --no-install-recommends git && \
apt-get autoremove -y && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

# Ignite main dependencies
RUN pip install --upgrade --no-cache-dir pytorch-ignite \
tensorboard \
tqdm

# replace pillow with pillow-simd
RUN apt-get update && apt-get -y install --no-install-recommends g++ && \
pip uninstall -y pillow && \
CC="cc -mavx2" pip install --upgrade --no-cache-dir --force-reinstall pillow-simd && \
apt-get remove -y g++ && \
apt-get autoremove -y && \
rm -rf /var/lib/apt/lists/*

# Checkout Ignite examples only
RUN mkdir -p pytorch-ignite-examples && \
cd pytorch-ignite-examples && \
Expand Down
1 change: 0 additions & 1 deletion docker/main/Dockerfile.apex-vision
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ RUN pip install --upgrade --no-cache-dir albumentations \
numpy \
opencv-python \
py_config_runner \
pillow \
clearml
13 changes: 11 additions & 2 deletions docker/main/Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,25 @@ FROM pytorch/pytorch:${PTH_VERSION}-runtime
# Install tzdata / git
RUN apt-get update && \
ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime && \
apt-get install -y tzdata && \
apt-get -y install --no-install-recommends tzdata git && \
dpkg-reconfigure --frontend noninteractive tzdata && \
apt-get -y install --no-install-recommends git && \
apt-get autoremove -y && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

# Ignite main dependencies
RUN pip install --upgrade --no-cache-dir pytorch-ignite \
tensorboard \
tqdm

# replace pillow with pillow-simd
RUN apt-get update && apt-get -y install --no-install-recommends g++ && \
pip uninstall -y pillow && \
CC="cc -mavx2" pip install --upgrade --no-cache-dir --force-reinstall pillow-simd && \
apt-get remove -y g++ && \
apt-get autoremove -y && \
rm -rf /var/lib/apt/lists/*

# Checkout Ignite examples only
RUN mkdir -p pytorch-ignite-examples && \
cd pytorch-ignite-examples && \
Expand Down
1 change: 0 additions & 1 deletion docker/main/Dockerfile.vision
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ RUN pip install --upgrade --no-cache-dir albumentations \
numpy \
opencv-python \
py_config_runner \
pillow \
clearml
13 changes: 11 additions & 2 deletions docker/msdp/Dockerfile.msdp-apex
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,25 @@ RUN cd /msdp && export CUDA_HOME=/usr/local/cuda && \
# Install tzdata / git
RUN apt-get update && \
ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime && \
apt-get install -y tzdata && \
apt-get -y install --no-install-recommends tzdata git && \
dpkg-reconfigure --frontend noninteractive tzdata && \
apt-get -y install --no-install-recommends git && \
apt-get autoremove -y && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

# Ignite main dependencies
RUN pip install --upgrade --no-cache-dir pytorch-ignite \
tensorboard \
tqdm

# replace pillow with pillow-simd
RUN apt-get update && apt-get -y install --no-install-recommends g++ && \
pip uninstall -y pillow && \
CC="cc -mavx2" pip install --upgrade --no-cache-dir --force-reinstall pillow-simd && \
apt-get remove -y g++ && \
apt-get autoremove -y && \
rm -rf /var/lib/apt/lists/*

# Checkout Ignite examples only
RUN mkdir -p pytorch-ignite-examples && \
cd pytorch-ignite-examples && \
Expand Down
1 change: 0 additions & 1 deletion docker/msdp/Dockerfile.msdp-apex-vision
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ RUN pip install --upgrade --no-cache-dir albumentations \
numpy \
opencv-python \
py_config_runner \
pillow \
clearml