Merge branch 'main' into patch-3

Author: AlannaBurke

.ci/docker/build.sh

@@ -11,7 +11,7 @@ IMAGE_NAME="$1"
 shift
 
 export UBUNTU_VERSION="22.04"
-export CUDA_VERSION="12.4.1"
+export CUDA_VERSION="12.6.3"
 
 export BASE_IMAGE="nvidia/cuda:${CUDA_VERSION}-devel-ubuntu${UBUNTU_VERSION}"
 echo "Building ${IMAGE_NAME} Docker image"

.ci/docker/requirements.txt

@@ -1,9 +1,10 @@
 # --extra-index-url https://download.pytorch.org/whl/cu117/index.html # Use this to run/publish tutorials against the latest binaries during the RC stage. Comment out after the release. Each release verify the correct cuda version.
 # Refer to ./jenkins/build.sh for tutorial build instructions
 
-sphinx==5.0.0
+sphinx==5.3.0
 sphinx-gallery==0.11.1
-sphinx_design
+sphinx-reredirects==0.1.4
+sphinx-design==0.4.0
 docutils==0.16
 sphinx-copybutton
 sphinx_sitemap==2.6.0
@@ -34,7 +35,6 @@ ax-platform>=0.4.0
 nbformat>=5.9.2
 datasets
 transformers
-torchmultimodal-nightly # needs to be updated to stable as soon as it's avaialable
 onnx
 onnxscript>=0.2.2
 onnxruntime
@@ -63,7 +63,6 @@ gym-super-mario-bros==7.4.0
 pyopengl
 gymnasium[mujoco]==0.27.0
 timm
-iopath
 pygame==2.6.0
 pycocotools
 semilearn==0.3.2

.github/scripts/check_redirects.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+if [ "$CURRENT_BRANCH" == "$BASE_BRANCH" ]; then
+  echo "Running on $BASE_BRANCH branch. Skipping check."
+  exit 0
+fi
+
+
+# Get list of deleted or renamed files in this branch compared to base
+DELETED_FILES=$(git diff --name-status $BASE_BRANCH $CURRENT_BRANCH --diff-filter=DR | awk '{print $2}' | grep -E '\.(rst|py|md)$' | grep -v 'redirects.py')
+# Check if any deleted or renamed files were found
+if [ -z "$DELETED_FILES" ]; then
+  echo "No deleted or renamed files found. Skipping check."
+  exit 0
+fi
+
+echo "Deleted or renamed files:"
+echo "$DELETED_FILES"
+
+# Check if redirects.py has been updated
+REDIRECTS_UPDATED=$(git diff --name-status $BASE_BRANCH $CURRENT_BRANCH --diff-filter=AM | grep 'redirects.py' && echo "yes" || echo "no")
+
+if [ "$REDIRECTS_UPDATED" == "no" ]; then
+  echo "ERROR: Files were deleted or renamed but redirects.py was not updated. Please update .github/scripts/redirects.py to redirect these files."
+  exit 1
+fi
+
+# Check if each deleted file has a redirect entry
+MISSING_REDIRECTS=0
+for FILE in $DELETED_FILES; do
+  # Convert file path to URL path format (remove extension and adjust path)
+  REDIRECT_PATH=$(echo $FILE | sed -E 's/(.+)_source\/(.+)\.(py|rst|md)$/\1\/\2.html/')
+
+  # Check if this path exists in redirects.py as a key. We don't check for values.
+  if ! grep -q "\"$REDIRECT_PATH\":" redirects.py; then
+    echo "ERROR: Missing redirect for deleted file: $FILE (should have entry for \"$REDIRECT_PATH\")"
+    MISSING_REDIRECTS=1
+  fi
+done
+
+if [ $MISSING_REDIRECTS -eq 1 ]; then
+  echo "ERROR: Please add redirects for all deleted/renamed files to redirects.py"
+  exit 1
+fi
+
+echo "All deleted/renamed files have proper redirects. Check passed!"

.github/workflows/check-redirects.yml

@@ -0,0 +1,25 @@
+name: Check Redirects for Deleted or Renamed Files
+
+on:
+  pull_request:
+    paths:
+     - '*/**/*.rst'
+     - '*/**/*.py'
+     - '*/**/*.md'
+
+jobs:
+  check-redirects:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Run redirect check script
+        run: |
+            chmod +x ./.github/scripts/check_redirects.sh
+            ./.github/scripts/check_redirects.sh
+        env:
+          BASE_BRANCH: ${{ github.base_ref }}
+          CURRENT_BRANCH: ${{ github.head_ref }}

.github/workflows/link_checkPR.yml

@@ -43,7 +43,12 @@ jobs:
       - name: Skip Message
         if: steps.skip-label.outputs.result == 'true'
         run: echo "Link check was skipped due to the presence of the 'skip-link-check' label."
-        
+
+      # Per tj-actions, a delete file is not a changed file so this ensures lint checking does not occur on deleted files
+      - name: No Files to Check
+        if: steps.skip-label.outputs.result == 'false' && steps.changed-files.outputs.any_changed == 'true'
+        run: echo "No relevant files were changed in this PR that require link checking."
+      
       - name: Suggestions
         if: failure()
         run: |

.jenkins/build.sh

@@ -151,6 +151,12 @@ elif [[ "${JOB_TYPE}" == "manager" ]]; then
   # Step 7: push new HTML files and static files to gh-pages
   if [[ "$COMMIT_SOURCE" == "refs/heads/master" || "$COMMIT_SOURCE" == "refs/heads/main" ]]; then
     git clone https://github.com/pytorch/tutorials.git -b gh-pages gh-pages
+    # Clean up directories that contain tutorials
+    
+    for dir in beginner intermediate prototype recipes advanced distributed vision text audio; do
+      rm -rf "gh-pages/$dir"
+    done
+    
     cp -r docs/* gh-pages/
     pushd gh-pages
     # DANGER! DO NOT REMOVE THE `set +x` SETTING HERE!

.jenkins/validate_tutorials_built.py

@@ -48,7 +48,6 @@
     "recipes_source/recipes/timer_quick_start",
     "recipes_source/recipes/amp_recipe",
     "recipes_source/recipes/Captum_Recipe",
-    "intermediate_source/flask_rest_api_tutorial",
     "intermediate_source/text_to_speech_with_torchaudio",
     "intermediate_source/tensorboard_profiler_tutorial", # reenable after 2.0 release.
     "advanced_source/semi_structured_sparse", # reenable after 3303 is fixed.

.lycheeignore

@@ -13,8 +13,5 @@ https://pytorch.org/tutorials/beginner/colab/n
 # Ignore local host link from intermediate_source/tensorboard_tutorial.rst
 http://localhost:6006
 
-# Ignore local host link from recipes_source/deployment_with_flask.rst
-http://localhost:5000/predict 
-
 # Ignore local host link from advanced_source/cpp_frontend.rst 
 https://www.uber.com/blog/deep-neuroevolution/

Makefile

@@ -78,10 +78,6 @@ download:
 	wget -nv -N https://download.pytorch.org/models/resnet18-5c106cde.pth -P $(DATADIR)
 	cp $(DATADIR)/resnet18-5c106cde.pth prototype_source/data/resnet18_pretrained_float.pth
 
-	# Download vocab for beginner_source/flava_finetuning_tutorial.py
-	wget -nv -N http://dl.fbaipublicfiles.com/pythia/data/vocab.tar.gz -P $(DATADIR)
-	tar $(TAROPTS) -xzf $(DATADIR)/vocab.tar.gz -C ./beginner_source/data/
-
 	# Download PennFudanPed dataset for intermediate_source/torchvision_tutorial.py
 	wget https://www.cis.upenn.edu/~jshi/ped_html/PennFudanPed.zip -P $(DATADIR)
 	unzip -o $(DATADIR)/PennFudanPed.zip -d intermediate_source/data/