diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index cb9856cd..12c29f39 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -6,7 +6,7 @@ name: Ultralytics CI on: push: branches: [main] - pull_request_target: + pull_request: branches: [main] schedule: - cron: "0 0 * * *" # runs at 00:00 UTC every day @@ -39,6 +39,7 @@ on: jobs: Docs: + # TODO: break this job out into it's own action with pull_request_target to allow changes to user forks if: github.repository == 'ultralytics/ultralytics' runs-on: macos-14 steps: @@ -73,7 +74,8 @@ jobs: - name: Build Docs and Check for Warnings run: python docs/build_docs.py - name: Commit and Push Docs changes - if: always() && github.event_name == 'pull_request_target' + continue-on-error: true + if: always() && github.event_name == 'pull_request' run: | git add --update # only add updated files git reset HEAD -- .github/workflows/ # workflow changes are not permitted with default token diff --git a/pyproject.toml b/pyproject.toml index c95872f4..a4ee2403 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -78,7 +78,7 @@ dependencies = [ "py-cpuinfo", # display CPU info "pandas>=1.1.4", "seaborn>=0.11.0", # plotting - "ultralytics-thop>=0.2.5", # FLOPs computation https://github.com/ultralytics/thop + "ultralytics-thop>=2.0.0", # FLOPs computation https://github.com/ultralytics/thop ] # Optional dependencies ------------------------------------------------------------------------------------------------ @@ -95,7 +95,7 @@ dev = [ "mkdocstrings[python]", "mkdocs-jupyter", # for notebooks "mkdocs-redirects", # for 301 redirects - "mkdocs-ultralytics-plugin>=0.0.45", # for meta descriptions and images, dates and authors + "mkdocs-ultralytics-plugin>=0.0.48", # for meta descriptions and images, dates and authors ] export = [ "onnx>=1.12.0", # ONNX export diff --git a/ultralytics/__init__.py b/ultralytics/__init__.py index d6f49605..c851108c 100644 --- a/ultralytics/__init__.py +++ b/ultralytics/__init__.py @@ -1,6 +1,6 @@ # Ultralytics YOLO 🚀, AGPL-3.0 license -__version__ = "8.2.33" +__version__ = "8.2.34" import os diff --git a/ultralytics/nn/tasks.py b/ultralytics/nn/tasks.py index 2a4ca80d..d9647ee2 100644 --- a/ultralytics/nn/tasks.py +++ b/ultralytics/nn/tasks.py @@ -47,6 +47,7 @@ from ultralytics.nn.modules import ( ResNetLayer, RTDETRDecoder, Segment, + Silence, # noqa (equivalent to nn.Identity, unused in file but required to load YOLOv9 models) WorldDetect, ) from ultralytics.utils import DEFAULT_CFG_DICT, DEFAULT_CFG_KEYS, LOGGER, colorstr, emojis, yaml_load