diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9bce8343..7917c829 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -111,7 +111,7 @@ jobs: - name: Install requirements shell: bash # for Windows compatibility run: | - uv pip install --system -e ".[export]" "coverage[toml]" --extra-index-url https://download.pytorch.org/whl/cpu --index-strategy unsafe-first-match + uv pip install --system -e ".[export]" "coverage[toml]" --extra-index-url https://download.pytorch.org/whl/cpu --index-strategy unsafe-best-match - name: Check environment run: | yolo checks @@ -185,7 +185,7 @@ jobs: if [[ "${{ github.event_name }}" =~ ^(schedule|workflow_dispatch)$ ]]; then slow="pycocotools mlflow" fi - uv pip install --system -e ".[export]" $torch $slow pytest-cov --extra-index-url https://download.pytorch.org/whl/cpu + uv pip install --system -e ".[export]" $torch $slow pytest-cov --extra-index-url https://download.pytorch.org/whl/cpu --index-strategy unsafe-best-match - name: Check environment run: | yolo checks diff --git a/docker/Dockerfile-cpu b/docker/Dockerfile-cpu index 79d5d50b..0111d80d 100644 --- a/docker/Dockerfile-cpu +++ b/docker/Dockerfile-cpu @@ -33,7 +33,7 @@ ADD https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11n.pt . # Install pip packages RUN pip install uv -RUN uv pip install --system -e ".[export]" --extra-index-url https://download.pytorch.org/whl/cpu --index-strategy unsafe-first-match +RUN uv pip install --system -e ".[export]" --extra-index-url https://download.pytorch.org/whl/cpu --index-strategy unsafe-best-match # Run exports to AutoInstall packages RUN yolo export model=tmp/yolo11n.pt format=edgetpu imgsz=32 diff --git a/docker/Dockerfile-jetson-jetpack4 b/docker/Dockerfile-jetson-jetpack4 index e11279da..79f6a8ad 100644 --- a/docker/Dockerfile-jetson-jetpack4 +++ b/docker/Dockerfile-jetson-jetpack4 @@ -42,6 +42,9 @@ ADD https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11n.pt . ADD https://nvidia.box.com/shared/static/gjqofg7rkg97z3gc8jeyup6t8n9j8xjw.whl onnxruntime_gpu-1.8.0-cp38-cp38-linux_aarch64.whl ADD https://forums.developer.nvidia.com/uploads/short-url/hASzFOm9YsJx6VVFrDW1g44CMmv.whl tensorrt-8.2.0.6-cp38-none-linux_aarch64.whl +# Replace pyproject.toml TF.js version with 'tensorflowjs>=3.9.0' for jetpack compat +RUN sed -i 's/^\( "tensorflowjs\)>=.*\(".*\)/\1>=3.9.0\2/' pyproject.toml + # Install pip packages RUN python3 -m pip install --upgrade pip RUN python3 -m pip install uv diff --git a/docker/Dockerfile-jetson-jetpack5 b/docker/Dockerfile-jetson-jetpack5 index ba42f143..f59ca0ea 100644 --- a/docker/Dockerfile-jetson-jetpack5 +++ b/docker/Dockerfile-jetson-jetpack5 @@ -30,13 +30,15 @@ COPY . . RUN sed -i '/^\[http "https:\/\/github\.com\/"\]/,+1d' .git/config ADD https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11n.pt . +# Replace pyproject.toml TF.js version with 'tensorflowjs>=3.9.0' for jetpack compat +RUN sed -i 's/^\( "tensorflowjs\)>=.*\(".*\)/\1>=3.9.0\2/' pyproject.toml + # Pip install onnxruntime-gpu, torch, torchvision and ultralytics RUN python3 -m pip install --upgrade pip uv RUN uv pip install --system \ https://github.com/ultralytics/assets/releases/download/v0.0.0/onnxruntime_gpu-1.18.0-cp38-cp38-linux_aarch64.whl \ https://github.com/ultralytics/assets/releases/download/v0.0.0/torch-2.2.0-cp38-cp38-linux_aarch64.whl \ https://github.com/ultralytics/assets/releases/download/v0.0.0/torchvision-0.17.2+c1d70fe-cp38-cp38-linux_aarch64.whl - RUN uv pip install --system -e ".[export]" # Remove extra build files diff --git a/docker/Dockerfile-python b/docker/Dockerfile-python index 796d1887..206a1faa 100644 --- a/docker/Dockerfile-python +++ b/docker/Dockerfile-python @@ -33,7 +33,7 @@ ADD https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11n.pt . # Install pip packages RUN pip install uv -RUN uv pip install --system -e ".[export]" --extra-index-url https://download.pytorch.org/whl/cpu --index-strategy unsafe-first-match +RUN uv pip install --system -e ".[export]" --extra-index-url https://download.pytorch.org/whl/cpu --index-strategy unsafe-best-match # Run exports to AutoInstall packages RUN yolo export model=tmp/yolo11n.pt format=edgetpu imgsz=32 diff --git a/pyproject.toml b/pyproject.toml index db1b7895..224357eb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -99,7 +99,7 @@ export = [ "scikit-learn>=1.3.2; platform_system != 'Windows' and python_version <= '3.11'", # CoreML k-means quantization "openvino>=2024.0.0,!=2025.0.0", # OpenVINO export "tensorflow>=2.0.0", # TF bug https://github.com/ultralytics/ultralytics/issues/5161 - "tensorflowjs>=3.9.0", # TF.js export, automatically installs tensorflow + "tensorflowjs>=4.0.0", # TF.js export, automatically installs tensorflow "tensorstore>=0.1.63; platform_machine == 'aarch64' and python_version >= '3.9'", # for TF Raspberry Pi exports "keras", # not installed automatically by tensorflow>=2.16 "flatbuffers>=23.5.26,<100; platform_machine == 'aarch64'", # update old 'flatbuffers' included inside tensorflow package diff --git a/ultralytics/__init__.py b/ultralytics/__init__.py index f6ea1135..b8e99fcc 100644 --- a/ultralytics/__init__.py +++ b/ultralytics/__init__.py @@ -1,6 +1,6 @@ # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license -__version__ = "8.3.88" +__version__ = "8.3.89" import os