Merge branch 'main' into please_dont_modify_this_branch_unless_you_are_just_merging_with_main__

Author: NicolasHug

.github/scripts/setup-env.sh

@@ -23,15 +23,13 @@ case $(uname) in
 esac
 
 echo '::group::Create build environment'
-# See https://github.com/pytorch/vision/issues/7296 for ffmpeg
 conda create \
   --name ci \
   --quiet --yes \
   python="${PYTHON_VERSION}" pip \
   ninja cmake \
   libpng \
-  libwebp \
-  'ffmpeg<4.3'
+  libwebp
 conda activate ci
 conda install --quiet --yes libjpeg-turbo -c pytorch
 pip install --progress-bar=off --upgrade setuptools==72.1.0

CMakeLists.txt

@@ -11,8 +11,6 @@ option(WITH_JPEG "Enable features requiring LibJPEG." ON)
 # untested. Since building from cmake is very low pri anyway, this is OK. If
 # you're a user and you need this, please open an issue (and a PR!).
 option(WITH_WEBP "Enable features requiring LibWEBP." OFF)
-# Same here
-option(WITH_AVIF "Enable features requiring LibAVIF." OFF)
 
 if(WITH_CUDA)
   enable_language(CUDA)
@@ -40,12 +38,7 @@ endif()
 
 if (WITH_WEBP)
     add_definitions(-DWEBP_FOUND)
-    find_package(WEBP REQUIRED)
-endif()
-
-if (WITH_AVIF)
-    add_definitions(-DAVIF_FOUND)
-    find_package(AVIF REQUIRED)
+    find_package(WebP REQUIRED)
 endif()
 
 function(CUDA_CONVERT_FLAGS EXISTING_TARGET)

README.md

@@ -20,7 +20,7 @@ versions.
 
 | `torch`            | `torchvision`      | Python              |
 | ------------------ | ------------------ | ------------------- |
-| `main` / `nightly` | `main` / `nightly` | `>=3.9`, `<=3.12`   |
+| `main` / `nightly` | `main` / `nightly` | `>=3.10`, `<=3.13`   |
 | `2.8`              | `0.23`             | `>=3.9`, `<=3.13`   |
 | `2.7`              | `0.22`             | `>=3.9`, `<=3.13`   |
 | `2.6`              | `0.21`             | `>=3.9`, `<=3.12`   |

docs/source/conf.py

@@ -88,6 +88,7 @@ def __init__(self, src_dir):
         "plot_transforms_e2e.py",
         "plot_cutmix_mixup.py",
         "plot_rotated_box_transforms.py",
+        "plot_keypoints_transforms.py",
         "plot_custom_transforms.py",
         "plot_tv_tensors.py",
         "plot_custom_tv_tensors.py",

gallery/assets/pottery.jpg

@@ -1,6 +1,6 @@
 import matplotlib.pyplot as plt
 import torch
-from torchvision.utils import draw_bounding_boxes, draw_segmentation_masks
+from torchvision.utils import draw_bounding_boxes, draw_keypoints, draw_segmentation_masks
 from torchvision import tv_tensors
 from torchvision.transforms import v2
 from torchvision.transforms.v2 import functional as F
@@ -18,6 +18,7 @@ def plot(imgs, row_title=None, bbox_width=3, **imshow_kwargs):
         for col_idx, img in enumerate(row):
             boxes = None
             masks = None
+            points = None
             if isinstance(img, tuple):
                 img, target = img
                 if isinstance(target, dict):
@@ -30,6 +31,8 @@ def plot(imgs, row_title=None, bbox_width=3, **imshow_kwargs):
                     # work with this specific format.
                     if tv_tensors.is_rotated_bounding_format(boxes.format):
                         boxes = v2.ConvertBoundingBoxFormat("xyxyxyxy")(boxes)
+                elif isinstance(target, tv_tensors.KeyPoints):
+                    points = target
                 else:
                     raise ValueError(f"Unexpected target type: {type(target)}")
             img = F.to_image(img)
@@ -44,6 +47,8 @@ def plot(imgs, row_title=None, bbox_width=3, **imshow_kwargs):
                 img = draw_bounding_boxes(img, boxes, colors="yellow", width=bbox_width)
             if masks is not None:
                 img = draw_segmentation_masks(img, masks.to(torch.bool), colors=["green"] * masks.shape[0], alpha=.65)
+            if points is not None:
+                img = draw_keypoints(img, points, colors="red", radius=10)
 
             ax = axs[row_idx, col_idx]
             ax.imshow(img.permute(1, 2, 0).numpy(), **imshow_kwargs)

gallery/transforms/helpers.py

@@ -0,0 +1,116 @@
+"""
+===============================================================
+Transforms on KeyPoints
+===============================================================
+
+This example illustrates how to define and use keypoints.
+For this tutorial, we use this picture of a ceramic figure from the pre-columbian period.
+The image is specified "public domain" (https://www.metmuseum.org/art/collection/search/502727).
+
+.. note::
+    Support for keypoints was released in TorchVision 0.23 and is
+    currently a BETA feature. We don't expect the API to change, but there may
+    be some rare edge-cases. If you find any issues, please report them on
+    our bug tracker: https://github.com/pytorch/vision/issues?q=is:open+is:issue
+
+First, a bit of setup code:
+"""
+
+# %%
+from PIL import Image
+from pathlib import Path
+import matplotlib.pyplot as plt
+
+
+import torch
+from torchvision.tv_tensors import KeyPoints
+from torchvision.transforms import v2
+from helpers import plot
+
+plt.rcParams["figure.figsize"] = [10, 5]
+plt.rcParams["savefig.bbox"] = "tight"
+
+# if you change the seed, make sure that the transformed output
+# still make sense
+torch.manual_seed(0)
+
+# If you're trying to run that on Colab, you can download the assets and the
+# helpers from https://github.com/pytorch/vision/tree/main/gallery/
+orig_img = Image.open(Path('../assets') / 'pottery.jpg')
+
+# %%
+# Creating KeyPoints
+# -------------------------------
+# Key points are created by instantiating the
+# :class:`~torchvision.tv_tensors.KeyPoints` class.
+
+
+orig_pts = KeyPoints(
+    [
+        [
+            [445, 700],  # nose
+            [320, 660],
+            [370, 660],
+            [420, 660],  # left eye
+            [300, 620],
+            [420, 620],  # left eyebrow
+            [475, 665],
+            [515, 665],
+            [555, 655],  # right eye
+            [460, 625],
+            [560, 600],  # right eyebrow
+            [370, 780],
+            [450, 760],
+            [540, 780],
+            [450, 820],  # mouth
+        ],
+    ],
+    canvas_size=(orig_img.size[1], orig_img.size[0]),
+)
+
+plot([(orig_img, orig_pts)])
+
+# %%
+# Transforms illustrations
+# ------------------------
+#
+# Using :class:`~torchvision.transforms.RandomRotation`:
+rotater = v2.RandomRotation(degrees=(0, 180), expand=True)
+rotated_imgs = [rotater((orig_img, orig_pts)) for _ in range(4)]
+plot([(orig_img, orig_pts)] + rotated_imgs)
+
+# %%
+# Using :class:`~torchvision.transforms.Pad`:
+padded_imgs_and_points = [
+    v2.Pad(padding=padding)(orig_img, orig_pts)
+    for padding in (30, 50, 100, 200)
+]
+plot([(orig_img, orig_pts)] + padded_imgs_and_points)
+
+# %%
+# Using :class:`~torchvision.transforms.Resize`:
+resized_imgs = [
+    v2.Resize(size=size)(orig_img, orig_pts)
+    for size in (300, 500, 1000, orig_img.size)
+]
+plot([(orig_img, orig_pts)] + resized_imgs)
+
+# %%
+# Using :class:`~torchvision.transforms.RandomPerspective`:
+perspective_transformer = v2.RandomPerspective(distortion_scale=0.6, p=1.0)
+perspective_imgs = [perspective_transformer(orig_img, orig_pts) for _ in range(4)]
+plot([(orig_img, orig_pts)] + perspective_imgs)
+
+# %%
+# Using :class:`~torchvision.transforms.CenterCrop`:
+center_crops_and_points = [
+    v2.CenterCrop(size=size)(orig_img, orig_pts)
+    for size in (300, 500, 1000, orig_img.size)
+]
+plot([(orig_img, orig_pts)] + center_crops_and_points)
+
+# %%
+# Using :class:`~torchvision.transforms.RandomRotation`:
+rotater = v2.RandomRotation(degrees=(0, 180))
+rotated_imgs = [rotater((orig_img, orig_pts)) for _ in range(4)]
+plot([(orig_img, orig_pts)] + rotated_imgs)

gallery/transforms/plot_keypoints_transforms.py

@@ -17,7 +17,6 @@ if [[ "$(uname)" == Darwin || "$OSTYPE" == "msys" ]]; then
   # Installing webp also installs a non-turbo jpeg, so we uninstall jpeg stuff
   # before re-installing them
   conda uninstall libjpeg-turbo libjpeg -y
-  conda install -y ffmpeg=4.2 -c pytorch
   conda install -y libjpeg-turbo -c pytorch
 
   # Copy binaries to be included in the wheel distribution
@@ -30,7 +29,7 @@ else
 
   if [[ "$ARCH" == "aarch64" ]]; then
     conda install libpng -y
-    conda install -y ffmpeg=4.2 libjpeg-turbo -c pytorch-nightly
+    conda install -y libjpeg-turbo -c pytorch-nightly
   fi
 
   conda install libwebp -y

packaging/pre_build_script.sh

@@ -6,6 +6,7 @@
 import shutil
 import subprocess
 import sys
+import sysconfig
 import warnings
 from pathlib import Path
 
@@ -27,9 +28,9 @@
 # video decoding backends in torchvision. I'm renaming this to "gpu video
 # decoder" where possible, keeping user facing names (like the env var below) to
 # the old scheme for BC.
-USE_GPU_VIDEO_DECODER = os.getenv("TORCHVISION_USE_VIDEO_CODEC", "1") == "1"
+USE_GPU_VIDEO_DECODER = os.getenv("TORCHVISION_USE_VIDEO_CODEC", "0") == "1"
 # Same here: "use ffmpeg" was used to denote "use cpu video decoder".
-USE_CPU_VIDEO_DECODER = os.getenv("TORCHVISION_USE_FFMPEG", "1") == "1"
+USE_CPU_VIDEO_DECODER = os.getenv("TORCHVISION_USE_FFMPEG", "0") == "1"
 
 TORCHVISION_INCLUDE = os.environ.get("TORCHVISION_INCLUDE", "")
 TORCHVISION_LIBRARY = os.environ.get("TORCHVISION_LIBRARY", "")
@@ -136,6 +137,8 @@ def get_macros_and_flags():
     if sys.platform == "win32":
         define_macros += [("torchvision_EXPORTS", None)]
         extra_compile_args["cxx"].append("/MP")
+        if sysconfig.get_config_var("Py_GIL_DISABLED"):
+            extra_compile_args["cxx"].append("-DPy_GIL_DISABLED")
 
     if DEBUG:
         extra_compile_args["cxx"].append("-g")