Merge branch 'main' of github.com:pytorch/vision into update-usort

Author: NicolasHug

.circleci/config.yml

@@ -458,7 +458,7 @@ jobs:
   binary_macos_wheel:
     <<: *binary_common
     macos:
-      xcode: "12.0"
+      xcode: "14.0"
     steps:
       - checkout_merge
       - designate_upload_channel
@@ -481,7 +481,7 @@ jobs:
   binary_ios_build:
     <<: *torchvision_ios_params
     macos:
-      xcode: "12.0"
+      xcode: "14.0"
     steps:
     - attach_workspace:
         at: ~/workspace
@@ -501,7 +501,7 @@ jobs:
   binary_ios_upload:
     <<: *torchvision_ios_params
     macos:
-      xcode: "12.0"
+      xcode: "14.0"
     steps:
     - attach_workspace:
         at: ~/workspace
@@ -554,7 +554,7 @@ jobs:
   binary_macos_conda:
     <<: *binary_common
     macos:
-      xcode: "12.0"
+      xcode: "14.0"
     steps:
       - checkout_merge
       - designate_upload_channel
@@ -901,7 +901,7 @@ jobs:
   unittest_macos_cpu:
     <<: *binary_common
     macos:
-      xcode: "12.0"
+      xcode: "14.0"
     resource_class: large
     steps:
       - checkout
@@ -977,7 +977,7 @@ jobs:
   cmake_macos_cpu:
     <<: *binary_common
     macos:
-      xcode: "12.0"
+      xcode: "14.0"
     steps:
       - checkout_merge
       - designate_upload_channel

.circleci/config.yml.in

@@ -41,4 +41,4 @@ jobs:
 
       - name: Run prototype tests
         shell: bash
-        run: pytest --durations=20 test/test_prototype_*.py
+        run: pytest -vvv --durations=20 test/test_prototype_*.py

.github/workflows/prototype-tests.yml

@@ -23,6 +23,8 @@ supported Python versions.
 +==========================+==========================+=================================+
 | ``main`` / ``nightly``   | ``main`` / ``nightly``   | ``>=3.7``, ``<=3.10``           |
 +--------------------------+--------------------------+---------------------------------+
+| ``1.12.0``               | ``0.13.0``               | ``>=3.7``, ``<=3.10``           |
++--------------------------+--------------------------+---------------------------------+
 | ``1.11.0``               | ``0.12.0``               | ``>=3.7``, ``<=3.10``           |
 +--------------------------+--------------------------+---------------------------------+
 | ``1.10.2``               | ``0.11.3``               | ``>=3.6``, ``<=3.9``            |

README.rst

@@ -11,7 +11,7 @@ paper.
 Model builders
 --------------
 
-The following model builders can be used to instanciate an SwinTransformer model. 
+The following model builders can be used to instantiate an SwinTransformer model. 
 `swin_t` can be instantiated with pre-trained weights and all others without. 
 All the model builders internally rely on the ``torchvision.models.swin_transformer.SwinTransformer`` 
 base class. Please refer to the `source code

docs/source/models/swin_transformer.rst

@@ -170,7 +170,7 @@ def example_read_video(video_object, start=0, end=None, read_video=True, read_au
 print(vf.size(), af.size())
 
 ####################################
-# 3. Building an example randomly sampled dataset (can be applied to training dataest of kinetics400)
+# 3. Building an example randomly sampled dataset (can be applied to training dataset of kinetics400)
 # -------------------------------------------------------------------------------------------------------
 # Cool, so now we can use the same principle to make the sample dataset.
 # We suggest trying out iterable dataset for this purpose.

gallery/plot_video_api.py

@@ -49,6 +49,7 @@
     resnet152,
     resnext50_32x4d,
     resnext101_32x8d,
+    resnext101_64x4d,
     wide_resnet50_2,
     wide_resnet101_2,
 )

hubconf.py

@@ -1,8 +1,8 @@
-pytorch_version = '1.11.0'
+pytorch_version = '1.12.0'
 
 Pod::Spec.new do |s|
     s.name             = 'LibTorchvision'
-    s.version          = '0.12.0'
+    s.version          = '0.13.0'
     s.authors          = 'PyTorch Team'
     s.license          = { :type => 'BSD' }
     s.homepage         = 'https://github.com/pytorch/vision'

ios/LibTorchvision.podspec

@@ -12,3 +12,7 @@ target-version = ["py37"]
 excludes = [
     "gallery",
 ]
+
+[build-system]
+
+requires = ["setuptools", "torch", "wheel"]

pyproject.toml

@@ -0,0 +1,15 @@
+from typing import Tuple
+
+import torchvision
+from torch import Tensor
+
+
+class KineticsWithVideoId(torchvision.datasets.Kinetics):
+    def __getitem__(self, idx: int) -> Tuple[Tensor, Tensor, int]:
+        video, audio, info, video_idx = self.video_clips.get_clip(idx)
+        label = self.samples[video_idx][1]
+
+        if self.transform is not None:
+            video = self.transform(video)
+
+        return video, audio, label, video_idx