Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
glenn-jocher committed May 30, 2024
2 parents c6272ff + fbd8fdb commit 3b07537
Show file tree
Hide file tree
Showing 22 changed files with 223 additions and 69 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ jobs:
Tests:
if: github.event_name != 'workflow_dispatch' || github.event.inputs.tests == 'true'
timeout-minutes: 120
timeout-minutes: 360
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,26 @@ on:
Dockerfile-cpu:
type: boolean
description: Use Dockerfile-cpu
default: true
Dockerfile-arm64:
type: boolean
description: Use Dockerfile-arm64
default: true
Dockerfile-jetson:
type: boolean
description: Use Dockerfile-jetson
default: true
Dockerfile-python:
type: boolean
description: Use Dockerfile-python
default: true
Dockerfile-conda:
type: boolean
description: Use Dockerfile-conda
default: true
push:
type: boolean
description: Push images to Docker Hub
default: true
description: Publish all Images to Docker Hub

jobs:
docker:
Expand Down
3 changes: 2 additions & 1 deletion docker/Dockerfile-arm64
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ ADD https://github.com/ultralytics/assets/releases/download/v8.2.0/yolov8n.pt $A
RUN rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED

# Install pip packages
# Install tensorstore from .whl because PyPI does not include aarch64 binaries
RUN python3 -m pip install --upgrade pip wheel
RUN pip install --no-cache-dir -e ".[export]"
RUN pip install --no-cache-dir https://github.com/ultralytics/yolov5/releases/download/v7.0/tensorstore-0.1.59-cp311-cp311-linux_aarch64.whl -e ".[export]"

# Creates a symbolic link to make 'python' point to 'python3'
RUN ln -sf /usr/bin/python3 /usr/bin/python
Expand Down
3 changes: 1 addition & 2 deletions docker/Dockerfile-jetson
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,11 @@ ADD https://github.com/ultralytics/assets/releases/download/v8.2.0/yolov8n.pt $A
RUN grep -v "opencv-python" pyproject.toml > temp.toml && mv temp.toml pyproject.toml

# Download onnxruntime-gpu 1.15.1 for Jetson Linux 35.2.1 (JetPack 5.1). Other versions can be seen in https://elinux.org/Jetson_Zoo#ONNX_Runtime
RUN wget https://nvidia.box.com/shared/static/mvdcltm9ewdy2d5nurkiqorofz1s53ww.whl -O 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
RUN python3 -m pip install --upgrade pip wheel
RUN pip install onnxruntime_gpu-1.15.1-cp38-cp38-linux_aarch64.whl
RUN pip install --no-cache-dir tqdm matplotlib pyyaml psutil pandas onnx
RUN pip install --no-cache-dir -e ".[export]"


Expand Down
4 changes: 2 additions & 2 deletions docs/en/hub/app/android.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
comments: true
description: Experience rapid object detection on your Android device with the Ultralytics YOLO model app. Click to learn more!.
keywords: Ultralytics, YOLO, Android App, real-time object detection, TensorFlow Lite, hardware acceleration, FP16, INT8, GPU
description: Discover real-time object detection on your Android with the Ultralytics App using optimized YOLO models.
keywords: Ultralytics, YOLO, Android app, real-time object detection, TensorFlow Lite, model optimization, AI mobile application
---

# Ultralytics Android App: Real-time Object Detection with YOLO Models
Expand Down
4 changes: 2 additions & 2 deletions docs/en/hub/app/index.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
comments: true
description: Unlock the power of YOLO models on iOS & Android with the Ultralytics HUB App. Experience optimized performance on-the-go!.
keywords: Ultralytics HUB App, YOLOv5, YOLOv8, mobile object detection, iOS, Android, real-time image recognition
description: Unlock real-time YOLO model detection directly on your mobile! Discover apps for iOS and Android with YOLOv5 and YOLOv8.
keywords: Ultralytics HUB App, YOLOv5, YOLOv8, real-time detection, mobile AI, iOS, Android, Apple Neural Engine, Android GPU, Ultralytics
---

# Ultralytics HUB App
Expand Down
4 changes: 2 additions & 2 deletions docs/en/hub/app/ios.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
comments: true
description: Transform your iOS device into a powerful object detection tool with the Ultralytics iOS App, powered by YOLO models.
keywords: Ultralytics, iOS app, YOLO, object detection, real-time, iPhone, iPad, quantization, Apple Neural Engine, Core ML
description: Discover real-time object detection on iOS devices using powerful YOLO models, optimized via Apple Neural Engine.
keywords: Ultralytics, iOS app, YOLO models, real-time detection, object detection, iPhone, iPad, Apple Neural Engine, Core ML, quantization, FP16, INT8
---

# Ultralytics iOS App: Real-time Object Detection with YOLO Models
Expand Down
4 changes: 2 additions & 2 deletions docs/en/hub/cloud-training.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
comments: true
description: Unlock one-click cloud training for your models on Ultralytics HUB Pro. Streamline your AI workflow today!.
keywords: Ultralytics HUB, cloud training, AI model training, Pro users, easy model training, Ultralytics cloud, AI workflow
description: Transform model training with Ultralytics HUB Cloud. Efficient, simple cloud-based training for Pro users.
keywords: Ultralytics HUB, cloud training, model training, Pro users, cloud-based ML, machine learning, AI model training
---

# Ultralytics HUB Cloud Training
Expand Down
6 changes: 3 additions & 3 deletions docs/en/hub/datasets.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
comments: true
description: Learn how Ultralytics HUB datasets streamline your ML workflow. Upload, format, validate, access, share, edit or delete datasets for Ultralytics YOLO model training.
keywords: Ultralytics, HUB datasets, YOLO model training, upload datasets, dataset validation, ML workflow, share datasets
description: Discover how to seamlessly upload, manage, and leverage datasets for model training with Ultralytics HUB.
keywords: Ultralytics HUB datasets, upload datasets, manage datasets, dataset management, model training, YOLOv5 datasets, YOLOv8 datasets
---

# Ultralytics HUB Datasets
Expand Down Expand Up @@ -164,4 +164,4 @@ Navigate to the Dataset page of the dataset you want to delete, open the dataset

If you change your mind, you can restore the dataset from the [Trash](https://hub.ultralytics.com/trash) page.

![Ultralytics HUB screenshot of the Trash page with an arrow pointing to Trash button in the sidebar and one to the Restore option of one of the datasets](https://github.com/ultralytics/assets/main/docs/hub/datasets/hub_delete_dataset_3.jpg)
![Ultralytics HUB screenshot of the Trash page with an arrow pointing to Trash button in the sidebar and one to the Restore option of one of the datasets](https://github.com/ultralytics/assets/main/docs/hub/datasets/hub_delete_dataset_3.jpg)
4 changes: 2 additions & 2 deletions docs/en/hub/index.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
comments: true
description: Discover Ultralytics HUB for seamless training and deploying of YOLOv5 and YOLOv8 models. Start your AI journey with ease!.
keywords: Ultralytics HUB, YOLO model training, YOLOv5, YOLOv8, model deployment, AI, machine learning
description: Launch into AI with Ultralytics HUB! Train, monitor, and deploy YOLO models easily. Start your journey in AI model training today.
keywords: Ultralytics HUB, YOLOv5, YOLOv8, model training, AI platform, object detection, deploy models, train YOLO models
---

# Ultralytics HUB
Expand Down
4 changes: 2 additions & 2 deletions docs/en/hub/inference-api.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
comments: true
description: Effortlessly run AI model inferences with Ultralytics HUB Inference API. Perfect for developers!.
keywords: Ultralytics HUB, Inference API, YOLO, REST API, machine learning, AI model inference, remote inference
description: Effortlessly run YOLO model inferences with Ultralytics HUB Inference API. No local setup required!
keywords: Ultralytics HUB, Inference API, YOLO, model inference, REST API, machine learning, AI model deployment
---

# Ultralytics HUB Inference API
Expand Down
6 changes: 3 additions & 3 deletions docs/en/hub/models.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
comments: true
description: Streamline your AI model training on custom datasets with Ultralytics HUB. Efficient, user-friendly, and powerful.
keywords: Ultralytics HUB, AI model training, custom datasets, YOLOv8, real-time updates, model deployment, Ultralytics
description: Discover how to efficiently train vision AI models using the user-friendly Ultralytics HUB with YOLOv8.
keywords: train AI models, Ultralytics HUB, YOLOv8, custom datasets, vision AI, model training
---

# Ultralytics HUB Models
Expand Down Expand Up @@ -294,4 +294,4 @@ Navigate to the Model page of the model you want to delete, open the model actio

If you change your mind, you can restore the model from the [Trash](https://hub.ultralytics.com/trash) page.

![Ultralytics HUB screenshot of the Trash page with an arrow pointing to the Restore option of one of the models](https://github.com/ultralytics/assets/main/docs/hub/models/hub_delete_model_3.jpg)
![Ultralytics HUB screenshot of the Trash page with an arrow pointing to the Restore option of one of the models](https://github.com/ultralytics/assets/main/docs/hub/models/hub_delete_model_3.jpg)
6 changes: 3 additions & 3 deletions docs/en/hub/pro.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
comments: true
description: Unlock premium features with Ultralytics HUB Pro! Get 200GB storage, cloud training, enhanced API limits, and more.
keywords: Ultralytics HUB Pro, upgrade, premium features, cloud training, team collaboration, API limits
description: Unlock premium features with the Ultralytics HUB Pro Plan! Get 200GB storage, cloud training, and more.
keywords: Ultralytics HUB Pro, cloud training, inference API, collaboration, Pro Plan benefits, upgrade HUB subscription
---

# Ultralytics HUB Pro
Expand Down Expand Up @@ -57,4 +57,4 @@ Next, set the amount you want to top-up.

That's it!

![Ultralytics HUB screenshot of the Payment Successful dialog](https://github.com/ultralytics/assets/main/docs/hub/pro/hub_pro_account_balance_3.jpg)
![Ultralytics HUB screenshot of the Payment Successful dialog](https://github.com/ultralytics/assets/main/docs/hub/pro/hub_pro_account_balance_3.jpg)
6 changes: 3 additions & 3 deletions docs/en/hub/projects.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
comments: true
description: Effortlessly consolidate, manage, and enhance your AI models with Ultralytics HUB projects. Start now!.
keywords: Ultralytics HUB, manage AI models, project creation, model comparison, model management
description: Effortlessly consolidate, manage, and enhance your AI models with Ultralytics HUB projects. Start now!
keywords: Ultralytics HUB, model management, create project, share project, edit project, delete project, model comparison
---

# Ultralytics HUB Projects
Expand Down Expand Up @@ -178,4 +178,4 @@ Navigate to the Project page of the project where the model you want to mode is

Select the project you want to transfer the model to and click **Save**.

![Ultralytics HUB screenshot of the Transfer Model dialog with an arrow pointing to the dropdown and one to the Save button](https://github.com/ultralytics/assets/main/docs/hub/projects/hub_transfer_models_3.jpg)
![Ultralytics HUB screenshot of the Transfer Model dialog with an arrow pointing to the dropdown and one to the Save button](https://github.com/ultralytics/assets/main/docs/hub/projects/hub_transfer_models_3.jpg)
4 changes: 2 additions & 2 deletions docs/en/hub/quickstart.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
comments: true
description: Easily train YOLO models with the Ultralytics HUB. Quick sign-up, intuitive use, and ready-to-deploy models!.
keywords: Ultralytics HUB, YOLO Quickstart, train YOLO model, pre-trained models, deploy models, Ultralytics HUB App
keywords: Ultralytics HUB, YOLO models, quickstart, train YOLO, easy signup, deploy models, Ultralytics
---

# Ultralytics HUB Quickstart
Expand Down Expand Up @@ -98,4 +98,4 @@ You can report a bug, request a feature, or ask a question on <a href="https://g

??? tip "Tip"

You can join our <a href="https://ultralytics.com/discord">Discord</a> community for questions and discussions!
You can join our <a href="https://ultralytics.com/discord">Discord</a> community for questions and discussions!
Loading

0 comments on commit 3b07537

Please sign in to comment.