diff --git a/docs/build_docs.py b/docs/build_docs.py index ddcbcc57c..825df8033 100644 --- a/docs/build_docs.py +++ b/docs/build_docs.py @@ -23,6 +23,7 @@ Usage: Note: - This script is built to be run in an environment where Python and MkDocs are installed and properly configured. """ + import os import re import shutil diff --git a/docs/en/guides/distance-calculation.md b/docs/en/guides/distance-calculation.md index 8cd064e46..c479d5f6e 100644 --- a/docs/en/guides/distance-calculation.md +++ b/docs/en/guides/distance-calculation.md @@ -10,6 +10,17 @@ keywords: Ultralytics, YOLOv8, Object Detection, Distance Calculation, Object Tr Measuring the gap between two objects is known as distance calculation within a specified space. In the case of [Ultralytics YOLOv8](https://github.com/ultralytics/ultralytics), the bounding box centroid is employed to calculate the distance for bounding boxes highlighted by the user. +
+
+
+
+ Watch: Distance Calculation using Ultralytics YOLOv8
+
+
+
+
+ Watch: Instance Segmentation with Object Tracking using Ultralytics YOLOv8
+
+
+
+
+ Watch: Getting Started with the Ultralytics HUB App (IOS & Android)
+
+
+
+
+ Watch: Getting Started with the Ultralytics HUB App (IOS & Android)
+
+
+
+
+ Watch: New Feature π Introducing Ultralytics HUB Cloud Training
+
+ +
+ +Introduced by Google in May 2017 as part of their TensorFlow framework, [TensorFlow Lite](https://www.tensorflow.org/lite/guide), or TFLite for short, is an open-source deep learning framework designed for on-device inference, also known as edge computing. It gives developers the necessary tools to execute their trained models on mobile, embedded, and IoT devices, as well as traditional computers. + +TensorFlow Lite is compatible with a wide range of platforms, including embedded Linux, Android, iOS, and MCU. Exporting your model to TFLite makes your applications faster, more reliable, and capable of running offline. + +## Key Features of TFLite Models + +TFLite models offer a wide range of key features that enable on-device machine learning by helping developers run their models on mobile, embedded, and edge devices: + +- **On-device Optimization**: TFLite optimizes for on-device ML, reducing latency by processing data locally, enhancing privacy by not transmitting personal data, and minimizing model size to save space. + +- **Multiple Platform Support**: TFLite offers extensive platform compatibility, supporting Android, iOS, embedded Linux, and microcontrollers. + +- **Diverse Language Support**: TFLite is compatible with various programming languages, including Java, Swift, Objective-C, C++, and Python. + +- **High Performance**: Achieves superior performance through hardware acceleration and model optimization. + +## Deployment Options in TFLite + +Before we look at the code for exporting YOLOv8 models to the TFLite format, letβs understand how TFLite models are normally used. + +TFLite offers various on-device deployment options for machine learning models, including: + + - **Deploying with Android and iOS**: Both Android and iOS applications with TFLite can analyze edge-based camera feeds and sensors to detect and identify objects. TFLite also offers native iOS libraries written in [Swift](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/swift) and [Objective-C](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/objc). The architecture diagram below shows the process of deploying a trained model onto Android and iOS platforms using TensorFlow Lite. + ++ +
+ + - **Implementing with Embedded Linux**: If running inferences on a [Raspberry Pi](https://www.raspberrypi.org/) using the [Ultralytics Guide](../guides/raspberry-pi.md) does not meet the speed requirements for your use case, you can use an exported TFLite model to accelerate inference times. Additionally, it's possible to further improve performance by utilizing a [Coral Edge TPU device]((https://coral.withgoogle.com/)). + + - **Deploying with Microcontrollers**: TFLite models can also be deployed on microcontrollers and other devices with only a few kilobytes of memory. The core runtime just fits in 16 KB on an Arm Cortex M3 and can run many basic models. It doesn't require operating system support, any standard C or C++ libraries, or dynamic memory allocation. + +## Export to TFLite: Converting Your YOLOv8 Model + +You can improve on-device model execution efficiency and optimize performance by converting them to TFLite format. + +### Installation + +To install the required packages, run: + +!!! Tip "Installation" + + === "CLI" + + ```bash + # Install the required package for YOLOv8 + pip install ultralytics + ``` + +For detailed instructions and best practices related to the installation process, check our [Ultralytics Installation guide](../quickstart.md). While installing the required packages for YOLOv8, if you encounter any difficulties, consult our [Common Issues guide](../guides/yolo-common-issues.md) for solutions and tips. + +### Usage + +Before diving into the usage instructions, it's important to note that while all [Ultralytics YOLOv8 models]((../models/index.md)) are available for exporting, you can ensure that the model you select supports export functionality [here](../modes/export.md). + +!!! Example "Usage" + + === "Python" + + ```python + from ultralytics import YOLO + + # Load the YOLOv8 model + model = YOLO('yolov8n.pt') + + # Export the model to TFLite format + model.export(format='tflite') # creates 'yolov8n_float32.tflite' + + # Load the exported TFLite model + tflite_model = YOLO('yolov8n_float32.tflite') + + # Run inference + results = tflite_model('https://ultralytics.com/images/bus.jpg') + ``` + + === "CLI" + + ```bash + # Export a YOLOv8n PyTorch model to TFLite format + yolo export model=yolov8n.pt format=tflite # creates 'yolov8n_float32.tflite' + + # Run inference with the exported model + yolo predict model='yolov8n_float32.tflite' source='https://ultralytics.com/images/bus.jpg' + ``` + +For more details about the export process, visit the [Ultralytics documentation page on exporting](../modes/export.md). + +## Deploying Exported YOLOv8 TFLite Models + +After successfully exporting your Ultralytics YOLOv8 models to TFLite format, you can now deploy them. The primary and recommended first step for running a TFLite model is to utilize the YOLO("model.tflite") method, as outlined in the previous usage code snippet. However, for in-depth instructions on deploying your TFLite models in various other settings, take a look at the following resources: + + - **[Android](https://www.tensorflow.org/lite/android/quickstart)**: A quick start guide for integrating TensorFlow Lite into Android applications, providing easy-to-follow steps for setting up and running machine learning models. + + - **[iOS](https://www.tensorflow.org/lite/guide/ios)**: Check out this detailed guide for developers on integrating and deploying TensorFlow Lite models in iOS applications, offering step-by-step instructions and resources. + + - **[End-To-End Examples](https://www.tensorflow.org/lite/examples)**: This page provides an overview of various TensorFlow Lite examples, showcasing practical applications and tutorials designed to help developers implement TensorFlow Lite in their machine learning projects on mobile and edge devices. + +## Summary + +In this guide, we focused on how to export to TFLite format. By converting your Ultralytics YOLOv8 models to TFLite model format, you can improve the efficiency and speed of YOLOv8 models, making them more effective and suitable for edge computing environments. + +For further details on usage, visit [TFLiteβs official documentation](https://www.tensorflow.org/lite/guide). + +Also, if you're curious about other Ultralytics YOLOv8 integrations, make sure to check out our [integration guide page](../integrations/index.md). You'll find tons of helpful info and insights waiting for you there. diff --git a/docs/en/integrations/torchscript.md b/docs/en/integrations/torchscript.md new file mode 100644 index 000000000..68950dbcd --- /dev/null +++ b/docs/en/integrations/torchscript.md @@ -0,0 +1,132 @@ +--- +comments: true +description: Learn to export your Ultralytics YOLOv8 models to TorchScript format for deployment through platforms like embedded systems, web browsers, and C++ applications. +keywords: Ultralytics, YOLOv8, Export to Torchscript, Model Optimization, Deployment, PyTorch, C++, Faster Inference +--- + +# YOLOv8 Model Export to TorchScript for Quick Deployment + +Deploying computer vision models across different environments, including embedded systems, web browsers, or platforms with limited Python support, requires a flexible and portable solution. TorchScript focuses on portability and the ability to run models in environments where the entire Python framework is unavailable. This makes it ideal for scenarios where you need to deploy your computer vision capabilities across various devices or platforms. + +Export to Torchscript to serialize your [Ultralytics YOLOv8](https://github.com/ultralytics/ultralytics) models for cross-platform compatibility and streamlined deployment. In this guide, we'll show you how to export your YOLOv8 models to the TorchScript format, making it easier for you to use them across a wider range of applications. + +## Why should you export to TorchScript? + ++ +
+ +Developed by the creators of PyTorch, TorchScript is a powerful tool for optimizing and deploying PyTorch models across a variety of platforms. Exporting YOLOv8 models to [TorchScript](https://pytorch.org/docs/stable/jit.html) is crucial for moving from research to real-world applications. TorchScript, part of the PyTorch framework, helps make this transition smoother by allowing PyTorch models to be used in environments that don't support Python. + +The process involves two techniques: tracing and scripting. Tracing records operations during model execution, while scripting allows for the definition of models using a subset of Python. These techniques ensures that models like YOLOv8 can still work their magic even outside their usual Python environment. + ++ +
+ +TorchScript models can also be optimized through techniques such as operator fusion and refinements in memory usage, ensuring efficient execution. Another advantage of exporting to TorchScript is its potential to accelerate model execution across various hardware platforms. It creates a standalone, production-ready representation of your PyTorch model that can be integrated into C++ environments, embedded systems, or deployed in web or mobile applications. + +## Key Features of TorchScript Models + +TorchScript, a key part of the PyTorch ecosystem, provides powerful features for optimizing and deploying deep learning models. + ++ +
+ +Here are the key features that make TorchScript a valuable tool for developers: + +- **Static Graph Execution**: TorchScript uses a static graph representation of the modelβs computation, which is different from PyTorchβs dynamic graph execution. In static graph execution, the computational graph is defined and compiled once before the actual execution, resulting in improved performance during inference. + + - **Model Serialization**: TorchScript allows you to serialize PyTorch models into a platform-independent format. Serialized models can be loaded without requiring the original Python code, enabling deployment in different runtime environments. + + - **JIT Compilation**: TorchScript uses Just-In-Time (JIT) compilation to convert PyTorch models into an optimized intermediate representation. JIT compiles the modelβs computational graph, enabling efficient execution on target devices. + + - **Cross-Language Integration**: With TorchScript, you can export PyTorch models to other languages such as C++, Java, and JavaScript. This makes it easier to integrate PyTorch models into existing software systems written in different languages. + +- **Gradual Conversion**: TorchScript provides a gradual conversion approach, allowing you to incrementally convert parts of your PyTorch model into TorchScript. This flexibility is particularly useful when dealing with complex models or when you want to optimize specific portions of the code. + +## Deployment Options in TorchScript + +Before we look at the code for exporting YOLOv8 models to the TorchScript format, letβs understand where TorchScript models are normally used. + +TorchScript offers various deployment options for machine learning models, such as: + +- **C++ API**: The most common use case for TorchScript is its C++ API, which allows you to load and execute optimized TorchScript models directly within C++ applications. This is ideal for production environments where Python may not be suitable or available. The C++ API offers low-overhead and efficient execution of TorchScript models, maximizing performance potential. + +- **Mobile Deployment**: TorchScript offers tools for converting models into formats readily deployable on mobile devices. PyTorch Mobile provides a runtime for executing these models within iOS and Android apps. This enables low-latency, offline inference capabilities, enhancing user experience and data privacy. + +- **Cloud Deployment**: TorchScript models can be deployed to cloud-based servers using solutions like TorchServe. It provides features like model versioning, batching, and metrics monitoring for scalable deployment in production environments. Cloud deployment with TorchScript can make your models accessible via APIs or other web services. + +## Export to TorchScript: Converting Your YOLOv8 Model + +Exporting YOLOv8 models to TorchScript makes it easier to use them in different places and helps them run faster and more efficiently. This is great for anyone looking to use deep learning models more effectively in real-world applications. + +### Installation + +To install the required package, run: + +!!! Tip "Installation" + + === "CLI" + + ```bash + # Install the required package for YOLOv8 + pip install ultralytics + ``` + +For detailed instructions and best practices related to the installation process, check our [Ultralytics Installation guide](../quickstart.md). While installing the required packages for YOLOv8, if you encounter any difficulties, consult our [Common Issues guide](../guides/yolo-common-issues.md) for solutions and tips. + +### Usage + +Before diving into the usage instructions, it's important to note that while all [Ultralytics YOLOv8 models]((../models/index.md)) are available for exporting, you can ensure that the model you select supports export functionality [here](../modes/export.md). + +!!! Example "Usage" + + === "Python" + + ```python + from ultralytics import YOLO + + # Load the YOLOv8 model + model = YOLO('yolov8n.pt') + + # Export the model to TorchScript format + model.export(format='torchscript') # creates 'yolov8n.torchscript' + + # Load the exported TorchScript model + torchscript_model = YOLO('yolov8n.torchscript') + + # Run inference + results = torchscript_model('https://ultralytics.com/images/bus.jpg') + ``` + + === "CLI" + + ```bash + # Export a YOLOv8n PyTorch model to TorchScript format + yolo export model=yolov8n.pt format=torchscript # creates 'yolov8n.torchscript' + + # Run inference with the exported model + yolo predict model=yolov8n.torchscript source='https://ultralytics.com/images/bus.jpg' + ``` + +For more details about the export process, visit the [Ultralytics documentation page on exporting](../modes/export.md). + +## Deploying Exported YOLOv8 TorchScript Models + +After successfully exporting your Ultralytics YOLOv8 models to TorchScript format, you can now deploy them. The primary and recommended first step for running a TorchScript model is to utilize the YOLO("model.torchscript") method, as outlined in the previous usage code snippet. However, for in-depth instructions on deploying your TorchScript models in various other settings, take a look at the following resources: + +- **[Explore Mobile Deployment](https://pytorch.org/mobile/home/)**: The PyTorch Mobile Documentation provides comprehensive guidelines for deploying models on mobile devices, ensuring your applications are efficient and responsive. + +- **[Master Server-Side Deployment](https://pytorch.org/serve/getting_started.html)**: Learn how to deploy models server-side with TorchServe, offering a step-by-step tutorial for scalable, efficient model serving. + +- **[Implement C++ Deployment](https://pytorch.org/tutorials/advanced/cpp_export.html)**: Dive into the Tutorial on Loading a TorchScript Model in C++, facilitating the integration of your TorchScript models into C++ applications for enhanced performance and versatility. + +## Summary + +In this guide, we explored the process of exporting Ultralytics YOLOv8 models to the TorchScript format. By following the provided instructions, you can optimize YOLOv8 models for performance and gain the flexibility to deploy them across various platforms and environments. + +For further details on usage, visit [TorchScriptβs official documentation](https://pytorch.org/docs/stable/jit.html). + +Also, if youβd like to know more about other Ultralytics YOLOv8 integrations, visit our [integration guide page](../integrations/index.md). You'll find plenty of useful resources and insights there. diff --git a/docs/en/models/yolo-world.md b/docs/en/models/yolo-world.md index 8037baec5..954b5dd18 100644 --- a/docs/en/models/yolo-world.md +++ b/docs/en/models/yolo-world.md @@ -41,6 +41,7 @@ This section details the models available with their specific pre-trained weight | YOLOv8s-world | [yolov8s-world.pt](https://github.com/ultralytics/assets/releases/download/v8.1.0/yolov8s-world.pt) | [Object Detection](../tasks/detect.md) | β | β | β | β | | YOLOv8m-world | [yolov8m-world.pt](https://github.com/ultralytics/assets/releases/download/v8.1.0/yolov8m-world.pt) | [Object Detection](../tasks/detect.md) | β | β | β | β | | YOLOv8l-world | [yolov8l-world.pt](https://github.com/ultralytics/assets/releases/download/v8.1.0/yolov8l-world.pt) | [Object Detection](../tasks/detect.md) | β | β | β | β | +| YOLOv8x-world | [yolov8x-world.pt](https://github.com/ultralytics/assets/releases/download/v8.1.0/yolov8x-world.pt) | [Object Detection](../tasks/detect.md) | β | β | β | β | ## Zero-shot Transfer on COCO Dataset @@ -49,6 +50,7 @@ This section details the models available with their specific pre-trained weight | yolov8s-world | 37.4 | 52.0 | 40.6 | | yolov8m-world | 42.0 | 57.0 | 45.6 | | yolov8l-world | 45.7 | 61.3 | 49.8 | +| yolov8x-world | 47.0 | 63.0 | 51.2 | ## Usage Examples diff --git a/docs/en/modes/benchmark.md b/docs/en/modes/benchmark.md index 4f22ee8d6..7f8e4573d 100644 --- a/docs/en/modes/benchmark.md +++ b/docs/en/modes/benchmark.md @@ -101,6 +101,6 @@ Benchmarks will attempt to run automatically on all possible export formats belo | [TF Edge TPU](https://coral.ai/docs/edgetpu/models-intro/) | `edgetpu` | `yolov8n_edgetpu.tflite` | β | `imgsz` | | [TF.js](https://www.tensorflow.org/js) | `tfjs` | `yolov8n_web_model/` | β | `imgsz`, `half`, `int8` | | [PaddlePaddle](https://github.com/PaddlePaddle) | `paddle` | `yolov8n_paddle_model/` | β | `imgsz` | -| [ncnn](https://github.com/Tencent/ncnn) | `ncnn` | `yolov8n_ncnn_model/` | β | `imgsz`, `half` | +| [NCNN](https://github.com/Tencent/ncnn) | `ncnn` | `yolov8n_ncnn_model/` | β | `imgsz`, `half` | See full `export` details in the [Export](https://docs.ultralytics.com/modes/export/) page. diff --git a/docs/en/modes/export.md b/docs/en/modes/export.md index 61576cf9e..5859b18b6 100644 --- a/docs/en/modes/export.md +++ b/docs/en/modes/export.md @@ -108,4 +108,4 @@ Available YOLOv8 export formats are in the table below. You can export to any fo | [TF Edge TPU](https://coral.ai/docs/edgetpu/models-intro/) | `edgetpu` | `yolov8n_edgetpu.tflite` | β | `imgsz` | | [TF.js](https://www.tensorflow.org/js) | `tfjs` | `yolov8n_web_model/` | β | `imgsz`, `half`, `int8` | | [PaddlePaddle](https://github.com/PaddlePaddle) | `paddle` | `yolov8n_paddle_model/` | β | `imgsz` | -| [ncnn](https://github.com/Tencent/ncnn) | `ncnn` | `yolov8n_ncnn_model/` | β | `imgsz`, `half` | +| [NCNN](https://github.com/Tencent/ncnn) | `ncnn` | `yolov8n_ncnn_model/` | β | `imgsz`, `half` | diff --git a/docs/en/modes/predict.md b/docs/en/modes/predict.md index 64a3aa42b..d3a9d47de 100644 --- a/docs/en/modes/predict.md +++ b/docs/en/modes/predict.md @@ -683,7 +683,7 @@ The `plot()` method in `Results` objects facilitates visualization of prediction for i, r in enumerate(results): # Plot results image im_bgr = r.plot() # BGR-order numpy array - im_rgb = Image.fromarray(im_array[..., ::-1]) # RGB-order PIL image + im_rgb = Image.fromarray(im_bgr[..., ::-1]) # RGB-order PIL image # Show results to screen (in supported environments) r.show() diff --git a/docs/en/tasks/classify.md b/docs/en/tasks/classify.md index 5608c9857..02b9a4bc9 100644 --- a/docs/en/tasks/classify.md +++ b/docs/en/tasks/classify.md @@ -176,6 +176,6 @@ Available YOLOv8-cls export formats are in the table below. You can predict or v | [TF Edge TPU](https://coral.ai/docs/edgetpu/models-intro/) | `edgetpu` | `yolov8n-cls_edgetpu.tflite` | β | `imgsz` | | [TF.js](https://www.tensorflow.org/js) | `tfjs` | `yolov8n-cls_web_model/` | β | `imgsz`, `half`, `int8` | | [PaddlePaddle](https://github.com/PaddlePaddle) | `paddle` | `yolov8n-cls_paddle_model/` | β | `imgsz` | -| [ncnn](https://github.com/Tencent/ncnn) | `ncnn` | `yolov8n-cls_ncnn_model/` | β | `imgsz`, `half` | +| [NCNN](https://github.com/Tencent/ncnn) | `ncnn` | `yolov8n-cls_ncnn_model/` | β | `imgsz`, `half` | See full `export` details in the [Export](https://docs.ultralytics.com/modes/export/) page. diff --git a/docs/en/tasks/detect.md b/docs/en/tasks/detect.md index a53877d57..b5d270092 100644 --- a/docs/en/tasks/detect.md +++ b/docs/en/tasks/detect.md @@ -177,6 +177,6 @@ Available YOLOv8 export formats are in the table below. You can predict or valid | [TF Edge TPU](https://coral.ai/docs/edgetpu/models-intro/) | `edgetpu` | `yolov8n_edgetpu.tflite` | β | `imgsz` | | [TF.js](https://www.tensorflow.org/js) | `tfjs` | `yolov8n_web_model/` | β | `imgsz`, `half`, `int8` | | [PaddlePaddle](https://github.com/PaddlePaddle) | `paddle` | `yolov8n_paddle_model/` | β | `imgsz` | -| [ncnn](https://github.com/Tencent/ncnn) | `ncnn` | `yolov8n_ncnn_model/` | β | `imgsz`, `half` | +| [NCNN](https://github.com/Tencent/ncnn) | `ncnn` | `yolov8n_ncnn_model/` | β | `imgsz`, `half` | See full `export` details in the [Export](https://docs.ultralytics.com/modes/export/) page. diff --git a/docs/en/tasks/obb.md b/docs/en/tasks/obb.md index 47f713bc8..c91690981 100644 --- a/docs/en/tasks/obb.md +++ b/docs/en/tasks/obb.md @@ -186,6 +186,6 @@ Available YOLOv8-obb export formats are in the table below. You can predict or v | [TF Edge TPU](https://coral.ai/docs/edgetpu/models-intro/) | `edgetpu` | `yolov8n-obb_edgetpu.tflite` | β | `imgsz` | | [TF.js](https://www.tensorflow.org/js) | `tfjs` | `yolov8n-obb_web_model/` | β | `imgsz`, `half`, `int8` | | [PaddlePaddle](https://github.com/PaddlePaddle) | `paddle` | `yolov8n-obb_paddle_model/` | β | `imgsz` | -| [ncnn](https://github.com/Tencent/ncnn) | `ncnn` | `yolov8n-obb_ncnn_model/` | β | `imgsz`, `half` | +| [NCNN](https://github.com/Tencent/ncnn) | `ncnn` | `yolov8n-obb_ncnn_model/` | β | `imgsz`, `half` | See full `export` details in the [Export](https://docs.ultralytics.com/modes/export/) page. diff --git a/docs/en/tasks/pose.md b/docs/en/tasks/pose.md index 2c3584c4d..431164b1b 100644 --- a/docs/en/tasks/pose.md +++ b/docs/en/tasks/pose.md @@ -180,6 +180,6 @@ Available YOLOv8-pose export formats are in the table below. You can predict or | [TF Edge TPU](https://coral.ai/docs/edgetpu/models-intro/) | `edgetpu` | `yolov8n-pose_edgetpu.tflite` | β | `imgsz` | | [TF.js](https://www.tensorflow.org/js) | `tfjs` | `yolov8n-pose_web_model/` | β | `imgsz`, `half`, `int8` | | [PaddlePaddle](https://github.com/PaddlePaddle) | `paddle` | `yolov8n-pose_paddle_model/` | β | `imgsz` | -| [ncnn](https://github.com/Tencent/ncnn) | `ncnn` | `yolov8n-pose_ncnn_model/` | β | `imgsz`, `half` | +| [NCNN](https://github.com/Tencent/ncnn) | `ncnn` | `yolov8n-pose_ncnn_model/` | β | `imgsz`, `half` | See full `export` details in the [Export](https://docs.ultralytics.com/modes/export/) page. diff --git a/docs/en/tasks/segment.md b/docs/en/tasks/segment.md index b06bc94f0..921378a45 100644 --- a/docs/en/tasks/segment.md +++ b/docs/en/tasks/segment.md @@ -182,6 +182,6 @@ Available YOLOv8-seg export formats are in the table below. You can predict or v | [TF Edge TPU](https://coral.ai/docs/edgetpu/models-intro/) | `edgetpu` | `yolov8n-seg_edgetpu.tflite` | β | `imgsz` | | [TF.js](https://www.tensorflow.org/js) | `tfjs` | `yolov8n-seg_web_model/` | β | `imgsz`, `half`, `int8` | | [PaddlePaddle](https://github.com/PaddlePaddle) | `paddle` | `yolov8n-seg_paddle_model/` | β | `imgsz` | -| [ncnn](https://github.com/Tencent/ncnn) | `ncnn` | `yolov8n-seg_ncnn_model/` | β | `imgsz`, `half` | +| [NCNN](https://github.com/Tencent/ncnn) | `ncnn` | `yolov8n-seg_ncnn_model/` | β | `imgsz`, `half` | See full `export` details in the [Export](https://docs.ultralytics.com/modes/export/) page. diff --git a/docs/en/usage/cli.md b/docs/en/usage/cli.md index 55d01e0fa..c71d7d066 100644 --- a/docs/en/usage/cli.md +++ b/docs/en/usage/cli.md @@ -184,7 +184,7 @@ Available YOLOv8 export formats are in the table below. You can export to any fo | [TF Edge TPU](https://coral.ai/docs/edgetpu/models-intro/) | `edgetpu` | `yolov8n_edgetpu.tflite` | β | `imgsz` | | [TF.js](https://www.tensorflow.org/js) | `tfjs` | `yolov8n_web_model/` | β | `imgsz`, `half`, `int8` | | [PaddlePaddle](https://github.com/PaddlePaddle) | `paddle` | `yolov8n_paddle_model/` | β | `imgsz` | -| [ncnn](https://github.com/Tencent/ncnn) | `ncnn` | `yolov8n_ncnn_model/` | β | `imgsz`, `half` | +| [NCNN](https://github.com/Tencent/ncnn) | `ncnn` | `yolov8n_ncnn_model/` | β | `imgsz`, `half` | ## Overriding default arguments diff --git a/mkdocs.yml b/mkdocs.yml index d20812239..586eecd9c 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -344,6 +344,8 @@ nav: - ONNX: integrations/onnx.md - TensorRT: integrations/tensorrt.md - CoreML: integrations/coreml.md + - TFLite: integrations/tflite.md + - TorchScript: integrations/torchscript.md - Ray Tune: integrations/ray-tune.md - Roboflow: integrations/roboflow.md - MLflow: integrations/mlflow.md diff --git a/ultralytics/__init__.py b/ultralytics/__init__.py index 0d72f48e6..666aea71f 100644 --- a/ultralytics/__init__.py +++ b/ultralytics/__init__.py @@ -1,6 +1,6 @@ # Ultralytics YOLO π, AGPL-3.0 license -__version__ = "8.1.19" +__version__ = "8.1.20" from ultralytics.data.explorer.explorer import Explorer from ultralytics.models import RTDETR, SAM, YOLO, YOLOWorld diff --git a/ultralytics/data/explorer/gui/dash.py b/ultralytics/data/explorer/gui/dash.py index 36ab3c0dd..b082d4951 100644 --- a/ultralytics/data/explorer/gui/dash.py +++ b/ultralytics/data/explorer/gui/dash.py @@ -144,9 +144,9 @@ def run_sql_query(): def run_ai_query(): """Execute SQL query and update session state with query results.""" if not SETTINGS["openai_api_key"]: - st.session_state[ - "error" - ] = 'OpenAI API key not found in settings. Please run yolo settings openai_api_key="..."' + st.session_state["error"] = ( + 'OpenAI API key not found in settings. Please run yolo settings openai_api_key="..."' + ) return st.session_state["error"] = None query = st.session_state.get("ai_query") diff --git a/ultralytics/engine/exporter.py b/ultralytics/engine/exporter.py index 75f7a0f98..afe7d3e6c 100644 --- a/ultralytics/engine/exporter.py +++ b/ultralytics/engine/exporter.py @@ -16,7 +16,7 @@ TensorFlow Lite | `tflite` | yolov8n.tflite TensorFlow Edge TPU | `edgetpu` | yolov8n_edgetpu.tflite TensorFlow.js | `tfjs` | yolov8n_web_model/ PaddlePaddle | `paddle` | yolov8n_paddle_model/ -ncnn | `ncnn` | yolov8n_ncnn_model/ +NCNN | `ncnn` | yolov8n_ncnn_model/ Requirements: $ pip install "ultralytics[export]" @@ -48,6 +48,7 @@ TensorFlow.js: $ ln -s ../../yolov5/yolov8n_web_model public/yolov8n_web_model $ npm start """ + import json import os import shutil @@ -292,7 +293,7 @@ class Exporter: f[9], _ = self.export_tfjs() if paddle: # PaddlePaddle f[10], _ = self.export_paddle() - if ncnn: # ncnn + if ncnn: # NCNN f[11], _ = self.export_ncnn() # Finish @@ -495,14 +496,14 @@ class Exporter: return f, None @try_export - def export_ncnn(self, prefix=colorstr("ncnn:")): + def export_ncnn(self, prefix=colorstr("NCNN:")): """ - YOLOv8 ncnn export using PNNX https://github.com/pnnx/pnnx. + YOLOv8 NCNN export using PNNX https://github.com/pnnx/pnnx. """ check_requirements("ncnn") import ncnn # noqa - LOGGER.info(f"\n{prefix} starting export with ncnn {ncnn.__version__}...") + LOGGER.info(f"\n{prefix} starting export with NCNN {ncnn.__version__}...") f = Path(str(self.file).replace(self.file.suffix, f"_ncnn_model{os.sep}")) f_ts = self.file.with_suffix(".torchscript") @@ -1079,9 +1080,9 @@ class Exporter: model = ct.models.MLModel(pipeline.spec, weights_dir=weights_dir) model.input_description["image"] = "Input image" model.input_description["iouThreshold"] = f"(optional) IOU threshold override (default: {nms.iouThreshold})" - model.input_description[ - "confidenceThreshold" - ] = f"(optional) Confidence threshold override (default: {nms.confidenceThreshold})" + model.input_description["confidenceThreshold"] = ( + f"(optional) Confidence threshold override (default: {nms.confidenceThreshold})" + ) model.output_description["confidence"] = 'Boxes Γ Class confidence (see user-defined metadata "classes")' model.output_description["coordinates"] = "Boxes Γ [x, y, width, height] (relative to image size)" LOGGER.info(f"{prefix} pipeline success") diff --git a/ultralytics/engine/predictor.py b/ultralytics/engine/predictor.py index 28b15c2f4..38b9641a3 100644 --- a/ultralytics/engine/predictor.py +++ b/ultralytics/engine/predictor.py @@ -27,6 +27,7 @@ Usage - formats: yolov8n_edgetpu.tflite # TensorFlow Edge TPU yolov8n_paddle_model # PaddlePaddle """ + import platform import threading from pathlib import Path diff --git a/ultralytics/engine/tuner.py b/ultralytics/engine/tuner.py index 80a554d43..de804fd0e 100644 --- a/ultralytics/engine/tuner.py +++ b/ultralytics/engine/tuner.py @@ -16,6 +16,7 @@ Example: model.tune(data='coco8.yaml', epochs=10, iterations=300, optimizer='AdamW', plots=False, save=False, val=False) ``` """ + import random import shutil import subprocess diff --git a/ultralytics/engine/validator.py b/ultralytics/engine/validator.py index 94c89ebd5..db9d07607 100644 --- a/ultralytics/engine/validator.py +++ b/ultralytics/engine/validator.py @@ -18,6 +18,7 @@ Usage - formats: yolov8n_edgetpu.tflite # TensorFlow Edge TPU yolov8n_paddle_model # PaddlePaddle """ + import json import time from pathlib import Path diff --git a/ultralytics/hub/session.py b/ultralytics/hub/session.py index 2d26b5a9b..ebc6692b7 100644 --- a/ultralytics/hub/session.py +++ b/ultralytics/hub/session.py @@ -52,6 +52,7 @@ class HUBTrainingSession: "heartbeat": 300.0, } # rate limits (seconds) self.metrics_queue = {} # holds metrics for each epoch until upload + self.metrics_upload_failed_queue = {} # holds metrics for each epoch if upload failed self.timers = {} # holds timers in ultralytics/utils/callbacks/hub.py # Parse input @@ -234,6 +235,9 @@ class HUBTrainingSession: self._show_upload_progress(progress_total, response) if HTTPStatus.OK <= response.status_code < HTTPStatus.MULTIPLE_CHOICES: + # if request related to metrics upload + if kwargs.get("metrics"): + self.metrics_upload_failed_queue = {} return response # Success, no need to retry if i == 0: @@ -249,6 +253,10 @@ class HUBTrainingSession: time.sleep(2**i) # Exponential backoff for retries + # if request related to metrics upload and exceed retries + if response is None and kwargs.get("metrics"): + self.metrics_upload_failed_queue.update(kwargs.get("metrics", None)) + return response if thread: diff --git a/ultralytics/models/rtdetr/model.py b/ultralytics/models/rtdetr/model.py index b8def4856..362edce04 100644 --- a/ultralytics/models/rtdetr/model.py +++ b/ultralytics/models/rtdetr/model.py @@ -7,6 +7,8 @@ hybrid encoder and IoU-aware query selection for enhanced detection accuracy. For more information on RT-DETR, visit: https://arxiv.org/pdf/2304.08069.pdf """ +from pathlib import Path + from ultralytics.engine.model import Model from ultralytics.nn.tasks import RTDETRDetectionModel @@ -34,7 +36,7 @@ class RTDETR(Model): Raises: NotImplementedError: If the model file extension is not 'pt', 'yaml', or 'yml'. """ - if model and model.split(".")[-1] not in ("pt", "yaml", "yml"): + if model and Path(model).suffix not in (".pt", ".yaml", ".yml"): raise NotImplementedError("RT-DETR only supports creating from *.pt, *.yaml, or *.yml files.") super().__init__(model=model, task="detect") diff --git a/ultralytics/nn/autobackend.py b/ultralytics/nn/autobackend.py index 3fafbbd9c..4d8c69c57 100644 --- a/ultralytics/nn/autobackend.py +++ b/ultralytics/nn/autobackend.py @@ -72,7 +72,7 @@ class AutoBackend(nn.Module): | TensorFlow Lite | *.tflite | | TensorFlow Edge TPU | *_edgetpu.tflite | | PaddlePaddle | *_paddle_model | - | ncnn | *_ncnn_model | + | NCNN | *_ncnn_model | This class offers dynamic backend switching capabilities based on the input model format, making it easier to deploy models across various platforms. @@ -304,9 +304,9 @@ class AutoBackend(nn.Module): input_handle = predictor.get_input_handle(predictor.get_input_names()[0]) output_names = predictor.get_output_names() metadata = w.parents[1] / "metadata.yaml" - elif ncnn: # ncnn - LOGGER.info(f"Loading {w} for ncnn inference...") - check_requirements("git+https://github.com/Tencent/ncnn.git" if ARM64 else "ncnn") # requires ncnn + elif ncnn: # NCNN + LOGGER.info(f"Loading {w} for NCNN inference...") + check_requirements("git+https://github.com/Tencent/ncnn.git" if ARM64 else "ncnn") # requires NCNN import ncnn as pyncnn net = pyncnn.Net() @@ -431,7 +431,7 @@ class AutoBackend(nn.Module): self.input_handle.copy_from_cpu(im) self.predictor.run() y = [self.predictor.get_output_handle(x).copy_to_cpu() for x in self.output_names] - elif self.ncnn: # ncnn + elif self.ncnn: # NCNN mat_in = self.pyncnn.Mat(im[0].cpu().numpy()) ex = self.net.create_extractor() input_names, output_names = self.net.input_names(), self.net.output_names() diff --git a/ultralytics/utils/benchmarks.py b/ultralytics/utils/benchmarks.py index f925b2d40..b98448da5 100644 --- a/ultralytics/utils/benchmarks.py +++ b/ultralytics/utils/benchmarks.py @@ -21,7 +21,7 @@ TensorFlow Lite | `tflite` | yolov8n.tflite TensorFlow Edge TPU | `edgetpu` | yolov8n_edgetpu.tflite TensorFlow.js | `tfjs` | yolov8n_web_model/ PaddlePaddle | `paddle` | yolov8n_paddle_model/ -ncnn | `ncnn` | yolov8n_ncnn_model/ +NCNN | `ncnn` | yolov8n_ncnn_model/ """ import glob diff --git a/ultralytics/utils/callbacks/hub.py b/ultralytics/utils/callbacks/hub.py index 587b45902..cdb42b9bc 100644 --- a/ultralytics/utils/callbacks/hub.py +++ b/ultralytics/utils/callbacks/hub.py @@ -33,6 +33,11 @@ def on_fit_epoch_end(trainer): all_plots = {**all_plots, **model_info_for_loggers(trainer)} session.metrics_queue[trainer.epoch] = json.dumps(all_plots) + + # If any metrics fail to upload, add them to the queue to attempt uploading again. + if session.metrics_upload_failed_queue: + session.metrics_queue.update(session.metrics_upload_failed_queue) + if time() - session.timers["metrics"] > session.rate_limits["metrics"]: session.upload_metrics() session.timers["metrics"] = time() # reset timer