Merge branch 'main' into eurosat-windows-macos

Author: pmeier

.circleci/config.yml

@@ -1069,7 +1069,8 @@ jobs:
             # Don't use "checkout" step since it uses ssh, which cannot git push
             # https://circleci.com/docs/2.0/configuration-reference/#checkout
             set -ex
-            tag=${CIRCLE_TAG:1:5}
+            # Change v1.12.1rc1 into 1.12 (only major.minor)
+            tag=$(echo $CIRCLE_TAG | sed -e 's/v*\([0-9]*\.[0-9]*\).*/\1/')
             target=${tag:-main}
             ~/workspace/.circleci/build_docs/commit_docs.sh ~/workspace $target
 

.circleci/config.yml.in

@@ -84,9 +84,10 @@ def workflow_pair(btype, os_type, python_version, cu_version, unicode, prefix=""
 
     if upload:
         w.append(generate_upload_workflow(base_workflow_name, os_type, btype, cu_version, filter_branch=filter_branch))
-        if filter_branch == "nightly" and os_type in ["linux", "win"]:
-            pydistro = "pip" if btype == "wheel" else "conda"
-            w.append(generate_smoketest_workflow(pydistro, base_workflow_name, filter_branch, python_version, os_type))
+        # disable smoke tests, they are broken and needs to be fixed
+        # if filter_branch == "nightly" and os_type in ["linux", "win"]:
+        #     pydistro = "pip" if btype == "wheel" else "conda"
+        #     w.append(generate_smoketest_workflow(pydistro, base_workflow_name, filter_branch, python_version, os_type))
 
     return w
 

.circleci/regenerate.py

@@ -20,6 +20,8 @@
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
 
+import os
+
 import pytorch_sphinx_theme
 import torchvision
 
@@ -80,11 +82,16 @@
 # built documents.
 #
 # The short X.Y version.
-# TODO: change to [:2] at v1.0
 version = "main (" + torchvision.__version__ + " )"
 # The full version, including alpha/beta/rc tags.
-# TODO: verify this works as expected
 release = "main"
+VERSION = os.environ.get("VERSION", None)
+if VERSION:
+    # Turn 1.11.0aHASH into 1.11 (major.minor only)
+    version = ".".join(version.split(".")[:2])
+    html_title = " ".join((project, version, "documentation"))
+    release = version
+
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/source/conf.py

@@ -179,7 +179,7 @@ to::
     import torch
     from torchvision import datasets, transforms as T
 
-    transform = T.Compose([T.Resize(256), T.CenterCrop(224), T.ToTensor()])
+    transform = T.Compose([T.Resize(256), T.CenterCrop(224), T.PILToTensor(), T.ConvertImageDtype(torch.float)])
     dataset = datasets.ImageNet(".", split="train", transform=transform)
 
     means = []

docs/source/models.rst

@@ -22,7 +22,7 @@
 def show(imgs):
     if not isinstance(imgs, list):
         imgs = [imgs]
-    fix, axs = plt.subplots(ncols=len(imgs), squeeze=False)
+    fig, axs = plt.subplots(ncols=len(imgs), squeeze=False)
     for i, img in enumerate(imgs):
         img = img.detach()
         img = F.to_pil_image(img)

gallery/plot_visualization_utils.py

@@ -10,3 +10,4 @@ addopts =
     --ignore-glob=test/test_prototype_*.py
 testpaths =
     test
+xfail_strict = True

pytest.ini

@@ -163,7 +163,7 @@ def load_data(traindir, valdir, args):
                 weights = prototype.models.get_weight(args.weights)
                 preprocessing = weights.transforms()
             else:
-                preprocessing = prototype.transforms.ImageNetEval(
+                preprocessing = prototype.transforms.ImageClassificationEval(
                     crop_size=val_crop_size, resize_size=val_resize_size, interpolation=interpolation
                 )
 

references/classification/train.py

@@ -41,7 +41,12 @@ def __call__(self, img, target):
 
 class DetectionPresetEval:
     def __init__(self):
-        self.transforms = T.ToTensor()
+        self.transforms = T.Compose(
+            [
+                T.PILToTensor(),
+                T.ConvertImageDtype(torch.float),
+            ]
+        )
 
     def __call__(self, img, target):
         return self.transforms(img, target)

references/detection/presets.py

@@ -57,7 +57,7 @@ def get_transform(train, args):
             weights = prototype.models.get_weight(args.weights)
             return weights.transforms()
         else:
-            return prototype.transforms.CocoEval()
+            return prototype.transforms.ObjectDetectionEval()
 
 
 def get_args_parser(add_help=True):