Merge branch 'main' into onnnxxnxnxnxnxnnx

pytorch · Nov 27, 2024 · 8c7d5cf · 8c7d5cf
2 parents c91fd7c + acbfd8d
commit 8c7d5cf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,7 @@ docs/source/auto_examples/
 docs/source/gen_modules/
 docs/source/generated/
 docs/source/models/generated/
+docs/source/sg_execution_times.rst
 # pytorch-sphinx-theme gets installed here
 docs/src
 
@@ -42,3 +43,5 @@ xcuserdata/
 # direnv
 .direnv
 .envrc
+
+scripts/release_notes/data.json
diff --git a/torchvision/datasets/lsun.py b/torchvision/datasets/lsun.py
@@ -55,7 +55,7 @@ def __len__(self) -> int:
 
 
 class LSUN(VisionDataset):
-    """`LSUN <https://www.yf.io/p/lsun>`_ dataset.
+    """`LSUN <https://paperswithcode.com/dataset/lsun>`_ dataset.
 
     You will need to install the ``lmdb`` package to use this dataset: run
     ``pip install lmdb``

diff --git a/torchvision/models/googlenet.py b/torchvision/models/googlenet.py
@@ -171,7 +171,7 @@ def eager_outputs(self, x: Tensor, aux2: Tensor, aux1: Optional[Tensor]) -> Goog
 
     def forward(self, x: Tensor) -> GoogLeNetOutputs:
         x = self._transform_input(x)
-        x, aux1, aux2 = self._forward(x)
+        x, aux2, aux1 = self._forward(x)
         aux_defined = self.training and self.aux_logits
         if torch.jit.is_scripting():
             if not aux_defined: