Merge branch 'main' into Group_Normalization

pull/14087/head
Ultralytics Assistant 4 months ago committed by GitHub
commit 97e0ec0107
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 3
      .github/workflows/ci.yaml
  2. 7
      .github/workflows/docker.yaml
  3. 6
      docs/en/datasets/index.md
  4. 2
      docs/en/modes/predict.md
  5. 6
      docs/en/tasks/obb.md
  6. 2
      examples/tutorial.ipynb
  7. 3
      pyproject.toml
  8. 4
      ultralytics/cfg/__init__.py
  9. 1
      ultralytics/engine/exporter.py

@ -39,7 +39,8 @@ on:
jobs: jobs:
HUB: HUB:
if: github.repository == 'ultralytics/ultralytics' && (github.event_name == 'schedule' || github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.hub == 'true')) # if: github.repository == 'ultralytics/ultralytics' && (github.event_name == 'schedule' || github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.hub == 'true'))
if: github.repository == 'ultralytics/ultralytics' && 'workflow_dispatch' && github.event.inputs.hub == 'true'
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
fail-fast: false fail-fast: false

@ -84,11 +84,8 @@ jobs:
outputs: outputs:
new_release: ${{ steps.check_tag.outputs.new_release }} new_release: ${{ steps.check_tag.outputs.new_release }}
steps: steps:
- name: Cleanup disk - name: Cleanup disk space
# Free up to 30GB of disk space per https://github.com/ultralytics/ultralytics/pull/15848 uses: ultralytics/actions/cleanup-disk@main
uses: jlumbroso/free-disk-space@v1.3.1
with:
tool-cache: true
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@v4 uses: actions/checkout@v4

@ -19,7 +19,11 @@ Ultralytics provides support for various datasets to facilitate computer vision
<strong>Watch:</strong> Ultralytics Datasets Overview <strong>Watch:</strong> Ultralytics Datasets Overview
</p> </p>
## Ultralytics Explorer 🚀 NEW ## Ultralytics Explorer
!!! warning "Community Note ⚠"
As of **`ultralytics>=8.3.10`**, Ultralytics explorer support has been deprecated. But don't worry! You can now access similar and even enhanced functionality through [Ultralytics HUB](https://hub.ultralytics.com/), our intuitive no-code platform designed to streamline your workflow. With Ultralytics HUB, you can continue exploring, visualizing, and managing your data effortlessly, all without writing a single line of code. Make sure to check it out and take advantage of its powerful features!🚀
Create [embeddings](https://www.ultralytics.com/glossary/embeddings) for your dataset, search for similar images, run SQL queries, perform semantic search and even search using natural language! You can get started with our GUI app or build your own using the API. Learn more [here](explorer/index.md). Create [embeddings](https://www.ultralytics.com/glossary/embeddings) for your dataset, search for similar images, run SQL queries, perform semantic search and even search using natural language! You can get started with our GUI app or build your own using the API. Learn more [here](explorer/index.md).

@ -665,7 +665,7 @@ For more details see the [`Probs` class documentation](../reference/engine/resul
model = YOLO("yolo11n-obb.pt") model = YOLO("yolo11n-obb.pt")
# Run inference on an image # Run inference on an image
results = model("bus.jpg") # results list results = model("boats.jpg") # results list
# View results # View results
for r in results: for r in results:

@ -141,14 +141,14 @@ Use a trained YOLO11n-obb model to run predictions on images.
model = YOLO("path/to/best.pt") # load a custom model model = YOLO("path/to/best.pt") # load a custom model
# Predict with the model # Predict with the model
results = model("https://ultralytics.com/images/bus.jpg") # predict on an image results = model("https://ultralytics.com/images/boats.jpg") # predict on an image
``` ```
=== "CLI" === "CLI"
```bash ```bash
yolo obb predict model=yolo11n-obb.pt source='https://ultralytics.com/images/bus.jpg' # predict with official model yolo obb predict model=yolo11n-obb.pt source='https://ultralytics.com/images/boats.jpg' # predict with official model
yolo obb predict model=path/to/best.pt source='https://ultralytics.com/images/bus.jpg' # predict with custom model yolo obb predict model=path/to/best.pt source='https://ultralytics.com/images/boats.jpg' # predict with custom model
``` ```
<p align="center"> <p align="center">

@ -583,7 +583,7 @@
"\n", "\n",
"model = YOLO('yolo11n-obb.pt') # load a pretrained YOLO OBB model\n", "model = YOLO('yolo11n-obb.pt') # load a pretrained YOLO OBB model\n",
"model.train(data='dota8.yaml', epochs=3) # train the model\n", "model.train(data='dota8.yaml', epochs=3) # train the model\n",
"model('https://ultralytics.com/images/bus.jpg') # predict on an image" "model('https://ultralytics.com/images/boats.jpg') # predict on an image"
], ],
"metadata": { "metadata": {
"id": "IJNKClOOB5YS" "id": "IJNKClOOB5YS"

@ -61,7 +61,8 @@ classifiers = [
# Required dependencies ------------------------------------------------------------------------------------------------ # Required dependencies ------------------------------------------------------------------------------------------------
dependencies = [ dependencies = [
"numpy>=1.23.0", # temporary patch for compat errors https://github.com/ultralytics/yolov5/actions/runs/9538130424/job/26286956354 "numpy>=1.23.0",
"numpy<2.0.0; sys_platform == 'darwin'", # macOS OpenVINO errors https://github.com/ultralytics/ultralytics/pull/17221
"matplotlib>=3.3.0", "matplotlib>=3.3.0",
"opencv-python>=4.6.0", "opencv-python>=4.6.0",
"pillow>=7.1.2", "pillow>=7.1.2",

@ -809,7 +809,9 @@ def entrypoint(debug=""):
# Mode # Mode
if mode in {"predict", "track"} and "source" not in overrides: if mode in {"predict", "track"} and "source" not in overrides:
overrides["source"] = DEFAULT_CFG.source or ASSETS overrides["source"] = (
"https://ultralytics.com/images/boats.jpg" if task == "obb" else DEFAULT_CFG.source or ASSETS
)
LOGGER.warning(f"WARNING ⚠ 'source' argument is missing. Using default 'source={overrides['source']}'.") LOGGER.warning(f"WARNING ⚠ 'source' argument is missing. Using default 'source={overrides['source']}'.")
elif mode in {"train", "val"}: elif mode in {"train", "val"}:
if "data" not in overrides and "resume" not in overrides: if "data" not in overrides and "resume" not in overrides:

@ -457,6 +457,7 @@ class Exporter:
@try_export @try_export
def export_openvino(self, prefix=colorstr("OpenVINO:")): def export_openvino(self, prefix=colorstr("OpenVINO:")):
"""YOLO OpenVINO export.""" """YOLO OpenVINO export."""
# WARNING: numpy>=2.0.0 issue with OpenVINO on macOS https://github.com/ultralytics/ultralytics/pull/17221
check_requirements(f'openvino{"<=2024.0.0" if ARM64 else ">=2024.0.0"}') # fix OpenVINO issue on ARM64 check_requirements(f'openvino{"<=2024.0.0" if ARM64 else ">=2024.0.0"}') # fix OpenVINO issue on ARM64
import openvino as ov import openvino as ov

Loading…
Cancel
Save