HongChuang/ultralytics-ascend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

ultralytics 8.3.49 Docker images uv pip install (#18115)

Browse source 
Signed-off-by: UltralyticsAssistant <web@ultralytics.com>
Signed-off-by: Glenn Jocher <glenn.jocher@ultralytics.com>
Co-authored-by: UltralyticsAssistant <web@ultralytics.com>
Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
Co-authored-by: Lakshantha Dissanayake <lakshantha@ultralytics.com>
This commit is contained in:
Paula Derrenger 2024-12-10 18:29:45 +01:00 • committed by GitHub
parent 5c31766b0d
commit 6c65d756e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
docker/Dockerfile
View file

@ -40,18 +40,18 @@ RUN sed -i '/^\[http "https:\/\/github\.com\/"\]/,+1d' .git/config
ADD https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11n.pt . ADD https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11n.pt .
# Install pip packages # Install pip packages
RUN python3 -m pip install --upgrade pip wheel RUN pip install uv
# Note -cu12 must be used with tensorrt) # Note -cu12 must be used with tensorrt)
RUN pip install -e ".[export]" tensorrt-cu12 "albumentations>=1.4.6" comet pycocotools RUN uv pip install --system -e ".[export]" tensorrt-cu12 "albumentations>=1.4.6" comet pycocotools
# Run exports to AutoInstall packages # Run exports to AutoInstall packages
# Edge TPU export fails the first time so is run twice here # Edge TPU export fails the first time so is run twice here
RUN yolo export model=tmp/yolo11n.pt format=edgetpu imgsz=32 || yolo export model=tmp/yolo11n.pt format=edgetpu imgsz=32 RUN yolo export model=tmp/yolo11n.pt format=edgetpu imgsz=32 || yolo export model=tmp/yolo11n.pt format=edgetpu imgsz=32
RUN yolo export model=tmp/yolo11n.pt format=ncnn imgsz=32 RUN yolo export model=tmp/yolo11n.pt format=ncnn imgsz=32
# Requires <= Python 3.10, bug with paddlepaddle==2.5.0 https://github.com/PaddlePaddle/X2Paddle/issues/991 # Requires <= Python 3.10, bug with paddlepaddle==2.5.0 https://github.com/PaddlePaddle/X2Paddle/issues/991
RUN pip install "paddlepaddle>=2.6.0" x2paddle RUN uv pip install --system "paddlepaddle>=2.6.0" x2paddle
# Fix error: `np.bool` was a deprecated alias for the builtin `bool` segmentation error in Tests # Fix error: `np.bool` was a deprecated alias for the builtin `bool` segmentation error in Tests
RUN pip install numpy==1.23.5 RUN uv pip install --system numpy==1.23.5
# Remove extra build files # Remove extra build files
RUN rm -rf tmp /root/.config/Ultralytics/persistent_cache.json RUN rm -rf tmp /root/.config/Ultralytics/persistent_cache.json

4
docker/Dockerfile-arm64
View file

@ -34,8 +34,8 @@ RUN sed -i '/^\[http "https:\/\/github\.com\/"\]/,+1d' .git/config
ADD https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11n.pt . ADD https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11n.pt .
# Install pip packages # Install pip packages
RUN python3 -m pip install --upgrade pip wheel RUN pip install uv
RUN pip install -e ".[export]" RUN uv pip install --system -e ".[export]" --break-system-packages
# Creates a symbolic link to make 'python' point to 'python3' # Creates a symbolic link to make 'python' point to 'python3'
RUN ln -sf /usr/bin/python3 /usr/bin/python RUN ln -sf /usr/bin/python3 /usr/bin/python

6
docker/Dockerfile-cpu
View file

@ -32,14 +32,14 @@ RUN sed -i '/^\[http "https:\/\/github\.com\/"\]/,+1d' .git/config
ADD https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11n.pt . ADD https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11n.pt .
# Install pip packages # Install pip packages
RUN python3 -m pip install --upgrade pip wheel RUN pip install uv
RUN pip install -e ".[export]" --extra-index-url https://download.pytorch.org/whl/cpu RUN uv pip install --system -e ".[export]" --extra-index-url https://download.pytorch.org/whl/cpu --index-strategy unsafe-first-match
# Run exports to AutoInstall packages # Run exports to AutoInstall packages
RUN yolo export model=tmp/yolo11n.pt format=edgetpu imgsz=32 RUN yolo export model=tmp/yolo11n.pt format=edgetpu imgsz=32
RUN yolo export model=tmp/yolo11n.pt format=ncnn imgsz=32 RUN yolo export model=tmp/yolo11n.pt format=ncnn imgsz=32
# Requires Python<=3.10, bug with paddlepaddle==2.5.0 https://github.com/PaddlePaddle/X2Paddle/issues/991 # Requires Python<=3.10, bug with paddlepaddle==2.5.0 https://github.com/PaddlePaddle/X2Paddle/issues/991
RUN pip install "paddlepaddle>=2.6.0" x2paddle RUN uv pip install --system "paddlepaddle>=2.6.0" x2paddle
# Remove extra build files # Remove extra build files
RUN rm -rf tmp /root/.config/Ultralytics/persistent_cache.json RUN rm -rf tmp /root/.config/Ultralytics/persistent_cache.json

7
docker/Dockerfile-jetson-jetpack4
View file

@ -43,13 +43,14 @@ ADD https://nvidia.box.com/shared/static/gjqofg7rkg97z3gc8jeyup6t8n9j8xjw.whl on
ADD https://forums.developer.nvidia.com/uploads/short-url/hASzFOm9YsJx6VVFrDW1g44CMmv.whl tensorrt-8.2.0.6-cp38-none-linux_aarch64.whl ADD https://forums.developer.nvidia.com/uploads/short-url/hASzFOm9YsJx6VVFrDW1g44CMmv.whl tensorrt-8.2.0.6-cp38-none-linux_aarch64.whl
# Install pip packages # Install pip packages
RUN python3 -m pip install --upgrade pip wheel RUN python3 -m pip install --upgrade pip
RUN pip install \ RUN python3 -m pip install uv
RUN uv pip install --system \
onnxruntime_gpu-1.8.0-cp38-cp38-linux_aarch64.whl \ onnxruntime_gpu-1.8.0-cp38-cp38-linux_aarch64.whl \
tensorrt-8.2.0.6-cp38-none-linux_aarch64.whl \ tensorrt-8.2.0.6-cp38-none-linux_aarch64.whl \
https://github.com/ultralytics/assets/releases/download/v0.0.0/torch-1.11.0a0+gitbc2c6ed-cp38-cp38-linux_aarch64.whl \ https://github.com/ultralytics/assets/releases/download/v0.0.0/torch-1.11.0a0+gitbc2c6ed-cp38-cp38-linux_aarch64.whl \
https://github.com/ultralytics/assets/releases/download/v0.0.0/torchvision-0.12.0a0+9b5a3fe-cp38-cp38-linux_aarch64.whl https://github.com/ultralytics/assets/releases/download/v0.0.0/torchvision-0.12.0a0+9b5a3fe-cp38-cp38-linux_aarch64.whl
RUN pip install -e ".[export]" RUN uv pip install --system -e ".[export]"
# Remove extra build files # Remove extra build files
RUN rm -rf *.whl /root/.config/Ultralytics/persistent_cache.json RUN rm -rf *.whl /root/.config/Ultralytics/persistent_cache.json

6
docker/Dockerfile-jetson-jetpack5
View file

@ -40,9 +40,9 @@ RUN sed -i '/opencv-python/d' pyproject.toml
ADD https://nvidia.box.com/shared/static/mvdcltm9ewdy2d5nurkiqorofz1s53ww.whl onnxruntime_gpu-1.15.1-cp38-cp38-linux_aarch64.whl ADD https://nvidia.box.com/shared/static/mvdcltm9ewdy2d5nurkiqorofz1s53ww.whl onnxruntime_gpu-1.15.1-cp38-cp38-linux_aarch64.whl
# Install pip packages manually for TensorRT compatibility https://github.com/NVIDIA/TensorRT/issues/2567 # Install pip packages manually for TensorRT compatibility https://github.com/NVIDIA/TensorRT/issues/2567
RUN python3 -m pip install --upgrade pip wheel RUN python3 -m pip install --upgrade pip uv
RUN pip install onnxruntime_gpu-1.15.1-cp38-cp38-linux_aarch64.whl RUN uv pip install --system onnxruntime_gpu-1.15.1-cp38-cp38-linux_aarch64.whl
RUN pip install -e ".[export]" RUN uv pip install --system -e ".[export]"
# Remove extra build files # Remove extra build files
RUN rm -rf *.whl /root/.config/Ultralytics/persistent_cache.json RUN rm -rf *.whl /root/.config/Ultralytics/persistent_cache.json

6
docker/Dockerfile-jetson-jetpack6
View file

@ -34,12 +34,12 @@ ADD https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11n.pt .
ADD https://nvidia.box.com/shared/static/48dtuob7meiw6ebgfsfqakc9vse62sg4.whl onnxruntime_gpu-1.18.0-cp310-cp310-linux_aarch64.whl ADD https://nvidia.box.com/shared/static/48dtuob7meiw6ebgfsfqakc9vse62sg4.whl onnxruntime_gpu-1.18.0-cp310-cp310-linux_aarch64.whl
# Pip install onnxruntime-gpu, torch, torchvision and ultralytics # Pip install onnxruntime-gpu, torch, torchvision and ultralytics
RUN python3 -m pip install --upgrade pip wheel RUN python3 -m pip install --upgrade pip uv
RUN pip install \ RUN uv pip install --system \
onnxruntime_gpu-1.18.0-cp310-cp310-linux_aarch64.whl \ onnxruntime_gpu-1.18.0-cp310-cp310-linux_aarch64.whl \
https://github.com/ultralytics/assets/releases/download/v0.0.0/torch-2.3.0-cp310-cp310-linux_aarch64.whl \ https://github.com/ultralytics/assets/releases/download/v0.0.0/torch-2.3.0-cp310-cp310-linux_aarch64.whl \
https://github.com/ultralytics/assets/releases/download/v0.0.0/torchvision-0.18.0a0+6043bc2-cp310-cp310-linux_aarch64.whl https://github.com/ultralytics/assets/releases/download/v0.0.0/torchvision-0.18.0a0+6043bc2-cp310-cp310-linux_aarch64.whl
RUN pip install -e ".[export]" RUN uv pip install --system -e ".[export]"
# Remove extra build files # Remove extra build files
RUN rm -rf *.whl /root/.config/Ultralytics/persistent_cache.json RUN rm -rf *.whl /root/.config/Ultralytics/persistent_cache.json

6
docker/Dockerfile-python
View file

@ -32,14 +32,14 @@ RUN sed -i '/^\[http "https:\/\/github\.com\/"\]/,+1d' .git/config
ADD https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11n.pt . ADD https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11n.pt .
# Install pip packages # Install pip packages
RUN python3 -m pip install --upgrade pip wheel RUN pip install uv
RUN pip install -e ".[export]" --extra-index-url https://download.pytorch.org/whl/cpu RUN uv pip install --system -e ".[export]" --extra-index-url https://download.pytorch.org/whl/cpu --index-strategy unsafe-first-match
# Run exports to AutoInstall packages # Run exports to AutoInstall packages
RUN yolo export model=tmp/yolo11n.pt format=edgetpu imgsz=32 RUN yolo export model=tmp/yolo11n.pt format=edgetpu imgsz=32
RUN yolo export model=tmp/yolo11n.pt format=ncnn imgsz=32 RUN yolo export model=tmp/yolo11n.pt format=ncnn imgsz=32
# Requires Python<=3.10, bug with paddlepaddle==2.5.0 https://github.com/PaddlePaddle/X2Paddle/issues/991 # Requires Python<=3.10, bug with paddlepaddle==2.5.0 https://github.com/PaddlePaddle/X2Paddle/issues/991
RUN pip install "paddlepaddle>=2.6.0" x2paddle RUN uv pip install --system "paddlepaddle>=2.6.0" x2paddle
# Remove extra build files # Remove extra build files
RUN rm -rf tmp /root/.config/Ultralytics/persistent_cache.json RUN rm -rf tmp /root/.config/Ultralytics/persistent_cache.json

2
docker/Dockerfile-runner
View file

@ -23,7 +23,7 @@ RUN FILENAME=actions-runner-linux-x64-2.320.0.tar.gz && \
rm $FILENAME rm $FILENAME
# Install runner dependencies # Install runner dependencies
RUN pip install pytest-cov RUN uv pip install --system pytest-cov
RUN ./bin/installdependencies.sh && \ RUN ./bin/installdependencies.sh && \
apt-get -y install libicu-dev apt-get -y install libicu-dev

2
ultralytics/__init__.py
View file

@ -1,6 +1,6 @@
# Ultralytics YOLO 🚀, AGPL-3.0 license # Ultralytics YOLO 🚀, AGPL-3.0 license
__version__ = "8.3.48" __version__ = "8.3.49"
import os import os