From 092b58a8cf21555887654446437fb33dbd64a3d7 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Fri, 29 Sep 2023 20:32:26 +0200 Subject: [PATCH] Remove thop from dockerfiles as already in requirements --- docker/Dockerfile | 2 +- docker/Dockerfile-arm64 | 2 +- docker/Dockerfile-cpu | 2 +- docker/Dockerfile-jetson | 2 +- docker/Dockerfile-python | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 4feeb1f1..d97632c6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -29,7 +29,7 @@ ADD https://github.com/ultralytics/assets/releases/download/v0.0.0/yolov8n.pt /u # Install pip packages RUN python3 -m pip install --upgrade pip wheel -RUN pip install --no-cache -e ".[export]" thop albumentations comet pycocotools pytest-cov +RUN pip install --no-cache -e ".[export]" albumentations comet pycocotools pytest-cov # Run exports to AutoInstall packages RUN yolo export model=tmp/yolov8n.pt format=edgetpu imgsz=32 diff --git a/docker/Dockerfile-arm64 b/docker/Dockerfile-arm64 index 052d83e5..c31bbaa3 100644 --- a/docker/Dockerfile-arm64 +++ b/docker/Dockerfile-arm64 @@ -24,7 +24,7 @@ ADD https://github.com/ultralytics/assets/releases/download/v0.0.0/yolov8n.pt /u # Install pip packages RUN python3 -m pip install --upgrade pip wheel -RUN pip install --no-cache -e . thop +RUN pip install --no-cache -e . # Creates a symbolic link to make 'python' point to 'python3' RUN ln -sf /usr/bin/python3 /usr/bin/python diff --git a/docker/Dockerfile-cpu b/docker/Dockerfile-cpu index 1bccdafd..cdce1077 100644 --- a/docker/Dockerfile-cpu +++ b/docker/Dockerfile-cpu @@ -27,7 +27,7 @@ RUN rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED # Install pip packages RUN python3 -m pip install --upgrade pip wheel -RUN pip install --no-cache -e ".[export]" thop --extra-index-url https://download.pytorch.org/whl/cpu +RUN pip install --no-cache -e ".[export]" --extra-index-url https://download.pytorch.org/whl/cpu # Run exports to AutoInstall packages RUN yolo export model=tmp/yolov8n.pt format=edgetpu imgsz=32 diff --git a/docker/Dockerfile-jetson b/docker/Dockerfile-jetson index d17169da..a8bbc642 100644 --- a/docker/Dockerfile-jetson +++ b/docker/Dockerfile-jetson @@ -27,7 +27,7 @@ RUN grep -v '^opencv-python' requirements.txt > tmp.txt && mv tmp.txt requiremen # Install pip packages manually for TensorRT compatibility https://github.com/NVIDIA/TensorRT/issues/2567 RUN python3 -m pip install --upgrade pip wheel -RUN pip install --no-cache tqdm matplotlib pyyaml psutil pandas onnx thop "numpy==1.23" +RUN pip install --no-cache tqdm matplotlib pyyaml psutil pandas onnx "numpy==1.23" RUN pip install --no-cache -e . # Set environment variables diff --git a/docker/Dockerfile-python b/docker/Dockerfile-python index 783d3900..caef5933 100644 --- a/docker/Dockerfile-python +++ b/docker/Dockerfile-python @@ -27,7 +27,7 @@ ADD https://github.com/ultralytics/assets/releases/download/v0.0.0/yolov8n.pt /u # Install pip packages RUN python3 -m pip install --upgrade pip wheel -RUN pip install --no-cache -e ".[export]" thop --extra-index-url https://download.pytorch.org/whl/cpu +RUN pip install --no-cache -e ".[export]" --extra-index-url https://download.pytorch.org/whl/cpu # Run exports to AutoInstall packages RUN yolo export model=tmp/yolov8n.pt format=edgetpu imgsz=32