diff --git a/docker/hvd/Dockerfile.hvd-apex b/docker/hvd/Dockerfile.hvd-apex index 2ef8b10f66ba..2db7b048deca 100644 --- a/docker/hvd/Dockerfile.hvd-apex +++ b/docker/hvd/Dockerfile.hvd-apex @@ -42,9 +42,10 @@ 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 @@ -52,6 +53,14 @@ RUN pip install --upgrade --no-cache-dir pytorch-ignite \ tensorboard \ tqdm +# replace pillow with pillow-simd +RUN 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 && \ diff --git a/docker/hvd/Dockerfile.hvd-apex-vision b/docker/hvd/Dockerfile.hvd-apex-vision index b64c09545f33..42bcfeb79780 100644 --- a/docker/hvd/Dockerfile.hvd-apex-vision +++ b/docker/hvd/Dockerfile.hvd-apex-vision @@ -15,5 +15,4 @@ RUN pip install --upgrade --no-cache-dir albumentations \ numpy \ opencv-python \ py_config_runner \ - pillow \ clearml diff --git a/docker/hvd/Dockerfile.hvd-base b/docker/hvd/Dockerfile.hvd-base index 8ed83a7fea7e..076f3846763c 100644 --- a/docker/hvd/Dockerfile.hvd-base +++ b/docker/hvd/Dockerfile.hvd-base @@ -21,9 +21,10 @@ 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 @@ -31,6 +32,14 @@ RUN pip install --upgrade --no-cache-dir pytorch-ignite \ tensorboard \ tqdm +# replace pillow with pillow-simd +RUN 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 && \ diff --git a/docker/hvd/Dockerfile.hvd-vision b/docker/hvd/Dockerfile.hvd-vision index ba15e3dbb49c..249c71622d63 100644 --- a/docker/hvd/Dockerfile.hvd-vision +++ b/docker/hvd/Dockerfile.hvd-vision @@ -15,5 +15,4 @@ RUN pip install --upgrade --no-cache-dir albumentations \ numpy \ opencv-python \ py_config_runner \ - pillow \ clearml diff --git a/docker/main/Dockerfile.apex b/docker/main/Dockerfile.apex index dc52abc5cd2d..e2c9fcc2ab3a 100644 --- a/docker/main/Dockerfile.apex +++ b/docker/main/Dockerfile.apex @@ -31,9 +31,10 @@ 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 @@ -41,6 +42,14 @@ RUN pip install --upgrade --no-cache-dir pytorch-ignite \ tensorboard \ tqdm +# replace pillow with pillow-simd +RUN 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 && \ diff --git a/docker/main/Dockerfile.apex-vision b/docker/main/Dockerfile.apex-vision index 63fe867a8048..626a9348cfa6 100644 --- a/docker/main/Dockerfile.apex-vision +++ b/docker/main/Dockerfile.apex-vision @@ -15,5 +15,4 @@ RUN pip install --upgrade --no-cache-dir albumentations \ numpy \ opencv-python \ py_config_runner \ - pillow \ clearml diff --git a/docker/main/Dockerfile.base b/docker/main/Dockerfile.base index 2c70a5b23b0b..eb93151f2d23 100644 --- a/docker/main/Dockerfile.base +++ b/docker/main/Dockerfile.base @@ -6,9 +6,10 @@ 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 @@ -16,6 +17,14 @@ RUN pip install --upgrade --no-cache-dir pytorch-ignite \ tensorboard \ tqdm +# replace pillow with pillow-simd +RUN 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 && \ diff --git a/docker/main/Dockerfile.vision b/docker/main/Dockerfile.vision index ad6b90051ff0..43e3ee5d796c 100644 --- a/docker/main/Dockerfile.vision +++ b/docker/main/Dockerfile.vision @@ -15,5 +15,4 @@ RUN pip install --upgrade --no-cache-dir albumentations \ numpy \ opencv-python \ py_config_runner \ - pillow \ clearml diff --git a/docker/msdp/Dockerfile.msdp-apex b/docker/msdp/Dockerfile.msdp-apex index 5d815272ac12..ad80311a0021 100644 --- a/docker/msdp/Dockerfile.msdp-apex +++ b/docker/msdp/Dockerfile.msdp-apex @@ -53,9 +53,10 @@ 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 @@ -63,6 +64,14 @@ RUN pip install --upgrade --no-cache-dir pytorch-ignite \ tensorboard \ tqdm +# replace pillow with pillow-simd +RUN 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 && \ diff --git a/docker/msdp/Dockerfile.msdp-apex-vision b/docker/msdp/Dockerfile.msdp-apex-vision index cada97803e3d..1c630959dae9 100644 --- a/docker/msdp/Dockerfile.msdp-apex-vision +++ b/docker/msdp/Dockerfile.msdp-apex-vision @@ -15,5 +15,4 @@ RUN pip install --upgrade --no-cache-dir albumentations \ numpy \ opencv-python \ py_config_runner \ - pillow \ clearml