ultralytics 8.2.25 latest TensorFlow 2.16 support (ultralytics#13176)

Signed-off-by: Glenn Jocher <[email protected]> Co-authored-by: UltralyticsAssistant <[email protected]> Co-authored-by: lakshanthad <[email protected]>
haiZhaoChen · May 29, 2024 · dd819fc · dd819fc
1 parent d80bd84
commit dd819fc
Show file tree

Hide file tree

Showing 9 changed files with 79 additions and 49 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -206,11 +206,16 @@ jobs:
         run: |
           # CoreML must be installed before export due to protobuf error from AutoInstall
           python -m pip install --upgrade pip wheel
+          slow=""
           torch=""
           if [ "${{ matrix.torch }}" == "1.8.0" ]; then
               torch="torch==1.8.0 torchvision==0.9.0"
           fi
-          pip install -e . $torch pytest-cov "coremltools>=7.0; platform_system != 'Windows' and python_version <= '3.11'" --extra-index-url https://download.pytorch.org/whl/cpu
+          if [[ "${{ github.event_name }}" =~ ^(schedule|workflow_dispatch)$ ]]; then
+              slow="pycocotools mlflow ray[tune]"
+          fi
+          slow="pycocotools mlflow ray[tune]"
+          pip install -e ".[export]" $torch $slow pytest-cov --extra-index-url https://download.pytorch.org/whl/cpu
       - name: Check environment
         run: |
           yolo checks
@@ -220,7 +225,6 @@ jobs:
         run: |
           slow=""
           if [[ "${{ github.event_name }}" =~ ^(schedule|workflow_dispatch)$ ]]; then
-              pip install pycocotools mlflow "ray[tune]"
               slow="--slow"
           fi
           pytest $slow --cov=ultralytics/ --cov-report xml tests/
@@ -272,7 +276,7 @@ jobs:
       - name: Install requirements
         run: |
           python -m pip install --upgrade pip wheel
-          pip install --no-cache-dir -e ".[export]" pytest mlflow pycocotools "ray[tune]"
+          pip install -e ".[export]" pytest mlflow pycocotools "ray[tune]"
       - name: Check environment
         run: |
           yolo checks

diff --git a/docs/en/guides/analytics.md b/docs/en/guides/analytics.md
@@ -16,14 +16,14 @@ This guide provides a comprehensive overview of three fundamental types of data
 |:------------------------------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------:|
 | ![Line Graph](https://github.com/RizwanMunawar/RizwanMunawar/assets/62513924/eeabd90c-04fd-4e5b-aac9-c7777f892200) | ![Bar Plot](https://github.com/RizwanMunawar/RizwanMunawar/assets/62513924/c1da2d6a-99ff-43a8-b5dc-ca93127917f8) | ![Pie Chart](https://github.com/RizwanMunawar/RizwanMunawar/assets/62513924/9d8acce6-d9e4-4685-949d-cd4851483187) |
 
-###  Why Graphs are Important
+### Why Graphs are Important
 
-- Line graphs are ideal for tracking changes over short and long periods and for comparing changes for multiple groups over the same period. 
-- Bar plots, on the other hand, are suitable for comparing quantities across different categories and showing relationships between a category and its numerical value. 
+- Line graphs are ideal for tracking changes over short and long periods and for comparing changes for multiple groups over the same period.
+- Bar plots, on the other hand, are suitable for comparing quantities across different categories and showing relationships between a category and its numerical value.
 - Lastly, pie charts are effective for illustrating proportions among categories and showing parts of a whole.
 
 !!! Analytics "Analytics Examples"
-    
+
     === "Line Graph"
 
         ```python
@@ -174,21 +174,21 @@ This guide provides a comprehensive overview of three fundamental types of data
 
 Here's a table with the `Analytics` arguments:
 
-| Name         | Type              | Default       | Description                                 |
-|--------------|-------------------|---------------|---------------------------------------------|
-| `type`       | `str`             | `None`        | Type of data or object.                     |
-| `im0_shape`  | `tuple`           | `None`        | Shape of the initial image.                 |
-| `writer`     | `cv2.VideoWriter` | `None`        | Object for writing video files.             |
-| `title`      | `str`             | `ultralytics` | Title for the visualization.                |
-| `x_label`    | `str`             | `x`           | Label for the x-axis.                       |
-| `y_label`    | `str`             | `y`           | Label for the y-axis.                       |
-| `bg_color`   | `str`             | `white`       | Background color.                           |
-| `fg_color`   | `str`             | `black`       | Foreground color.                           |
-| `line_color` | `str`             | `yellow`      | Color of the lines.                         |
-| `line_width` | `int`             | `2`           | Width of the lines.                         |
-| `fontsize`   | `int`             | `13`          | Font size for text.                         |
-| `view_img`   | `bool`            | `False`       | Flag to display the image or video.         |
-| `save_img`   | `bool`            | `True`        | Flag to save the image or video.            |
+| Name         | Type              | Default       | Description                         |
+|--------------|-------------------|---------------|-------------------------------------|
+| `type`       | `str`             | `None`        | Type of data or object.             |
+| `im0_shape`  | `tuple`           | `None`        | Shape of the initial image.         |
+| `writer`     | `cv2.VideoWriter` | `None`        | Object for writing video files.     |
+| `title`      | `str`             | `ultralytics` | Title for the visualization.        |
+| `x_label`    | `str`             | `x`           | Label for the x-axis.               |
+| `y_label`    | `str`             | `y`           | Label for the y-axis.               |
+| `bg_color`   | `str`             | `white`       | Background color.                   |
+| `fg_color`   | `str`             | `black`       | Foreground color.                   |
+| `line_color` | `str`             | `yellow`      | Color of the lines.                 |
+| `line_width` | `int`             | `2`           | Width of the lines.                 |
+| `fontsize`   | `int`             | `13`          | Font size for text.                 |
+| `view_img`   | `bool`            | `False`       | Flag to display the image or video. |
+| `save_img`   | `bool`            | `True`        | Flag to save the image or video.    |
 
 ### Arguments `model.track`
 

diff --git a/docs/en/guides/defining-project-goals.md b/docs/en/guides/defining-project-goals.md
@@ -37,20 +37,20 @@ Primary users include traffic management authorities and law enforcement, while
 
 ### Setting Measurable Objectives
 
-Setting measurable objectives is key to the success of a computer vision project. These goals should be clear, achievable, and time-bound. 
+Setting measurable objectives is key to the success of a computer vision project. These goals should be clear, achievable, and time-bound.
 
 For example, if you are developing a system to estimate vehicle speeds on a highway. You could consider the following measurable objectives:
 
--  To achieve at least 95% accuracy in speed detection within six months, using a dataset of 10,000 vehicle images.
--  The system should be able to process real-time video feeds at 30 frames per second with minimal delay. 
+- To achieve at least 95% accuracy in speed detection within six months, using a dataset of 10,000 vehicle images.
+- The system should be able to process real-time video feeds at 30 frames per second with minimal delay.
 
 By setting specific and quantifiable goals, you can effectively track progress, identify areas for improvement, and ensure the project stays on course.
 
 ## The Connection Between The Problem Statement and The Computer Vision Tasks
 
 Your problem statement helps you conceptualize which computer vision task can solve your issue.
 
-For example, if your problem is monitoring vehicle speeds on a highway, the relevant computer vision task is object tracking. [Object tracking](../modes/track.md) is suitable because it allows the system to continuously follow each vehicle in the video feed, which is crucial for accurately calculating their speeds. 
+For example, if your problem is monitoring vehicle speeds on a highway, the relevant computer vision task is object tracking. [Object tracking](../modes/track.md) is suitable because it allows the system to continuously follow each vehicle in the video feed, which is crucial for accurately calculating their speeds.
 
 <p align="center">
   <img width="100%" src="https://assets-global.website-files.com/6479eab6eb2ed5e597810e9e/664f03ba300cf6e61689862f_FIG%20444.gif" alt="Example of Object Tracking">
@@ -134,7 +134,7 @@ Connecting with other computer vision enthusiasts can be incredibly helpful for
 
 ### Comprehensive Guides and Documentation
 
-- **Ultralytics YOLOv8 Documentation:** Explore the [official YOLOv8 documentation](./index.md) for in-depth guides and valuable tips on various computer vision tasks and projects. 
+- **Ultralytics YOLOv8 Documentation:** Explore the [official YOLOv8 documentation](./index.md) for in-depth guides and valuable tips on various computer vision tasks and projects.
 
 ## Conclusion
 

diff --git a/docs/en/guides/steps-of-a-cv-project.md b/docs/en/guides/steps-of-a-cv-project.md
@@ -8,15 +8,15 @@ keywords: Computer Vision Steps, How Does Computer Vision Work, Computer Vision
 
 ## Introduction
 
-Computer vision is a subfield of artificial intelligence (AI) that helps computers see and understand the world like humans do. It processes and analyzes images or videos to extract information, recognize patterns, and make decisions based on that data. 
+Computer vision is a subfield of artificial intelligence (AI) that helps computers see and understand the world like humans do. It processes and analyzes images or videos to extract information, recognize patterns, and make decisions based on that data.
 
 Computer vision techniques like [object detection](../tasks/detect.md), [image classification](../tasks/classify.md), and [instance segmentation](../tasks/segment.md) can be applied across various industries, from [autonomous driving](https://www.ultralytics.com/solutions/ai-in-self-driving) to [medical imaging](https://www.ultralytics.com/solutions/ai-in-healthcare), to gain valuable insights.
 
 <p align="center">
   <img width="100%" src="https://media.licdn.com/dms/image/D4D12AQGf61lmNOm3xA/article-cover_image-shrink_720_1280/0/1656513646049?e=1722470400&v=beta&t=23Rqohhxfie38U5syPeL2XepV2QZe6_HSSC-4rAAvt4" alt="Overview of computer vision techniques">
 </p>
 
-Working on your own computer vision projects is a great way to understand and learn more about computer vision. However, a computer vision project can consist of many steps, and it might seem confusing at first. By the end of this guide, you’ll be familiar with the steps involved in a computer vision project.  We’ll walk through everything from the beginning to the end of a project, explaining why each part is important. Let’s get started and make your computer vision project a success!
+Working on your own computer vision projects is a great way to understand and learn more about computer vision. However, a computer vision project can consist of many steps, and it might seem confusing at first. By the end of this guide, you’ll be familiar with the steps involved in a computer vision project. We’ll walk through everything from the beginning to the end of a project, explaining why each part is important. Let’s get started and make your computer vision project a success!
 
 ## An Overview of a Computer Vision Project
 
@@ -36,7 +36,7 @@ Now that we know what to expect, let's dive right into the steps and get your pr
 
 ## Step 1: Defining Your Project’s Goals
 
-The first step in any computer vision project is clearly defining the problem you’re trying to solve. Knowing the end goal helps you start to build a solution. This is especially true when it comes to computer vision because your project’s objective will directly affect which computer vision task you need to focus on. 
+The first step in any computer vision project is clearly defining the problem you’re trying to solve. Knowing the end goal helps you start to build a solution. This is especially true when it comes to computer vision because your project’s objective will directly affect which computer vision task you need to focus on.
 
 Here are some examples of project objectives and the computer vision tasks that can be used to reach these objectives:
 
@@ -51,11 +51,11 @@ Here are some examples of project objectives and the computer vision tasks that
 
 ### Step 1.5: Selecting the Right Model and Training Approach
 
-After understanding the project objective and suitable computer vision tasks, an essential part of defining the project goal is [selecting the right model](../models/index.md) and training approach. 
+After understanding the project objective and suitable computer vision tasks, an essential part of defining the project goal is [selecting the right model](../models/index.md) and training approach.
 
 Depending on the objective, you might choose to select the model first or after seeing what data you are able to collect in Step 2. For example, suppose your project is highly dependent on the availability of specific types of data. In that case, it may be more practical to gather and analyze the data first before selecting a model. On the other hand, if you have a clear understanding of the model requirements, you can choose the model first and then collect data that fits those specifications.
 
-Choosing between training from scratch or using transfer learning affects how you prepare your data. Training from scratch requires a diverse dataset to build the model’s understanding from the ground up. Transfer learning, on the other hand, allows you to use a pre-trained model and adapt it with a smaller, more specific dataset. Also, choosing a specific model to train will determine how you need to prepare your data, such as resizing images or adding annotations, according to the model’s specific requirements. 
+Choosing between training from scratch or using transfer learning affects how you prepare your data. Training from scratch requires a diverse dataset to build the model’s understanding from the ground up. Transfer learning, on the other hand, allows you to use a pre-trained model and adapt it with a smaller, more specific dataset. Also, choosing a specific model to train will determine how you need to prepare your data, such as resizing images or adding annotations, according to the model’s specific requirements.
 
 <p align="center">
   <img width="100%" src="https://miro.medium.com/v2/resize:fit:1330/format:webp/1*zCnoXfPVcdXizTmhL68Rlw.jpeg" alt="Training From Scratch Vs. Using Transfer Learning">
@@ -117,7 +117,7 @@ By properly understanding, splitting, and augmenting your data, you can develop
 
 ## Step 4: Model Training
 
-Once your dataset is ready for training, you can focus on setting up the necessary environment, managing your datasets, and training your model. 
+Once your dataset is ready for training, you can focus on setting up the necessary environment, managing your datasets, and training your model.
 
 First, you’ll need to make sure your environment is configured correctly. Typically, this includes the following:
 
@@ -141,7 +141,7 @@ It’s important to assess your model's performance using various metrics and re
 
 ## Step 6: Model Testing
 
-In this step, you can make sure that your model performs well on completely unseen data, confirming its readiness for deployment. The difference between model testing and model evaluation is that it focuses on verifying the final model's performance rather than iteratively improving it. 
+In this step, you can make sure that your model performs well on completely unseen data, confirming its readiness for deployment. The difference between model testing and model evaluation is that it focuses on verifying the final model's performance rather than iteratively improving it.
 
 It's important to thoroughly test and debug any common issues that may arise. Test your model on a separate test dataset that was not used during training or validation. This dataset should represent real-world scenarios to ensure the model's performance is consistent and reliable.
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -100,8 +100,9 @@ export = [
     "onnx>=1.12.0", # ONNX export
     "coremltools>=7.0; platform_system != 'Windows' and python_version <= '3.11'", # CoreML supported on macOS and Linux
     "openvino>=2024.0.0", # OpenVINO export
-    "tensorflow<=2.13.1; python_version <= '3.11'", # TF bug https://github.com/ultralytics/ultralytics/issues/5161
-    "tensorflowjs>=3.9.0; python_version <= '3.11'", # TF.js export, automatically installs tensorflow
+    "tensorflow>=2.0.0", # TF bug https://github.com/ultralytics/ultralytics/issues/5161
+    "tensorflowjs>=3.9.0", # TF.js export, automatically installs tensorflow
+    "keras",  # not installed auotomatically by tensorflow>=2.16
     "flatbuffers>=23.5.26,<100; platform_machine == 'aarch64'", # update old 'flatbuffers' included inside tensorflow package
     "numpy==1.23.5; platform_machine == 'aarch64'", # fix error: `np.bool` was a deprecated alias for the builtin `bool` when using TensorRT models on NVIDIA Jetson
     "h5py!=3.11.0; platform_machine == 'aarch64'", # fix h5py build issues due to missing aarch64 wheels in 3.11 release
@@ -111,7 +112,6 @@ explorer = [
     "duckdb<=0.9.2", # SQL queries, duckdb==0.10.0 bug https://github.com/ultralytics/ultralytics/pull/8181
     "streamlit", # visualizing with GUI
 ]
-# tensorflow>=2.4.1,<=2.13.1  # TF exports (-cpu, -aarch64, -macos)
 # tflite-support  # for TFLite model metadata
 # nvidia-pyindex  # TensorRT export
 # nvidia-tensorrt  # TensorRT export

diff --git a/tests/test_exports.py b/tests/test_exports.py
@@ -129,6 +129,31 @@ def test_export_coreml_matrix(task, dynamic, int8, half, batch):
     shutil.rmtree(file)  # cleanup
 
 
+@pytest.mark.slow
+@pytest.mark.skipif(not checks.IS_PYTHON_MINIMUM_3_10, reason="TFLite export requires Python>=3.10")
+@pytest.mark.skipif(not LINUX, reason="Test disabled as TF suffers from install conflicts on Windows and macOS")
+@pytest.mark.parametrize(
+    "task, dynamic, int8, half, batch",
+    [  # generate all combinations but exclude those where both int8 and half are True
+        (task, dynamic, int8, half, batch)
+        for task, dynamic, int8, half, batch in product(TASKS, [False], [True, False], [True, False], [1])
+        if not (int8 and half)  # exclude cases where both int8 and half are True
+    ],
+)
+def test_export_tflite_matrix(task, dynamic, int8, half, batch):
+    """Test YOLO exports to TFLite format."""
+    file = YOLO(TASK2MODEL[task]).export(
+        format="tflite",
+        imgsz=32,
+        dynamic=dynamic,
+        int8=int8,
+        half=half,
+        batch=batch,
+    )
+    YOLO(file)([SOURCE] * batch, imgsz=32)  # exported model inference at batch=3
+    Path(file).unlink()  # cleanup
+
+
 @pytest.mark.skipif(not TORCH_1_9, reason="CoreML>=7.2 not supported with PyTorch<=1.8")
 @pytest.mark.skipif(WINDOWS, reason="CoreML not supported on Windows")  # RuntimeError: BlobWriter not loaded
 @pytest.mark.skipif(IS_RASPBERRYPI, reason="CoreML not supported on Raspberry Pi")
@@ -142,6 +167,7 @@ def test_export_coreml():
         YOLO(MODEL).export(format="coreml", nms=True, imgsz=32)
 
 
+@pytest.mark.skipif(not checks.IS_PYTHON_MINIMUM_3_10, reason="TFLite export requires Python>=3.10")
 @pytest.mark.skipif(not LINUX, reason="Test disabled as TF suffers from install conflicts on Windows and macOS")
 def test_export_tflite():
     """

diff --git a/ultralytics/__init__.py b/ultralytics/__init__.py
@@ -1,6 +1,6 @@
 # Ultralytics YOLO 🚀, AGPL-3.0 license
 
-__version__ = "8.2.24"
+__version__ = "8.2.25"
 
 import os