From 46ed5ff75ed2a6aef6cf1f4f7a78ae535191aa1b Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Sat, 14 Jan 2023 19:20:56 +0100 Subject: [PATCH] Reorder Dockerfile for reduced rebuilding (#358) --- docker/Dockerfile | 10 ++++++---- docker/Dockerfile-arm64 | 4 +--- docker/Dockerfile-cpu | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index accd2aa1..2542ac01 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -4,7 +4,12 @@ # Start FROM NVIDIA PyTorch image https://ngc.nvidia.com/catalog/containers/nvidia:pytorch FROM nvcr.io/nvidia/pytorch:22.12-py3 + +# Remove torch nightly and install torch stable RUN rm -rf /opt/pytorch # remove 1.2GB dir +RUN pip uninstall -y torchtext torch torchvision +RUN pip cache purge +RUN pip install --no-cache torch torchvision # Downloads to user config dir ADD https://ultralytics.com/assets/Arial.ttf https://ultralytics.com/assets/Arial.Unicode.ttf /root/.config/Ultralytics/ @@ -22,10 +27,7 @@ RUN git clone https://github.com/ultralytics/ultralytics /usr/src/ultralytics # Install pip packages RUN python -m pip install --upgrade pip wheel -RUN pip uninstall -y Pillow torchtext torch torchvision -RUN pip install --no-cache ultralytics albumentations comet gsutil notebook Pillow>=9.1.0 \ - 'opencv-python<4.6.0.66' \ - --extra-index-url https://download.pytorch.org/whl/cu113 +RUN pip install --no-cache ultralytics albumentations comet gsutil notebook 'opencv-python<4.6.0.66' # Set environment variables ENV OMP_NUM_THREADS=1 diff --git a/docker/Dockerfile-arm64 b/docker/Dockerfile-arm64 index 93f60171..3499c18b 100644 --- a/docker/Dockerfile-arm64 +++ b/docker/Dockerfile-arm64 @@ -27,10 +27,8 @@ RUN git clone https://github.com/ultralytics/ultralytics /usr/src/ultralytics COPY requirements.txt . RUN python3 -m pip install --upgrade pip wheel RUN pip install --no-cache ultralytics gsutil notebook \ - tensorflow-aarch64 + tensorflow-aarch64 onnx onnx-simplifier onnxruntime coremltools openvino-dev # tensorflowjs \ - # onnx onnx-simplifier onnxruntime \ - # coremltools openvino-dev \ # Cleanup ENV DEBIAN_FRONTEND teletype diff --git a/docker/Dockerfile-cpu b/docker/Dockerfile-cpu index 41b655c8..0163db0f 100644 --- a/docker/Dockerfile-cpu +++ b/docker/Dockerfile-cpu @@ -28,7 +28,8 @@ COPY requirements.txt . RUN python3 -m pip install --upgrade pip wheel RUN pip install --no-cache ultralytics albumentations gsutil notebook \ coremltools onnx onnx-simplifier onnxruntime tensorflow-cpu tensorflowjs \ - # openvino-dev \ + openvino-dev \ + # tensorflowjs \ --extra-index-url https://download.pytorch.org/whl/cpu # Cleanup