Merge branch 'main' into patch-1

Author: svekars

.ci/docker/Dockerfile

@@ -15,15 +15,11 @@ RUN bash ./install_user.sh && rm install_user.sh
 COPY ./common/install_docs_reqs.sh install_docs_reqs.sh
 RUN bash ./install_docs_reqs.sh && rm install_docs_reqs.sh
 
-# Install conda and other packages
-ENV ANACONDA_PYTHON_VERSION=3.10
-ENV CONDA_CMAKE yes
-ENV DOCS yes
-ENV PATH /opt/conda/envs/py_$ANACONDA_PYTHON_VERSION/bin:/opt/conda/bin:$PATH
-COPY ./requirements.txt /opt/conda/
-COPY ./common/install_conda.sh install_conda.sh
-COPY ./common/common_utils.sh common_utils.sh
-RUN bash ./install_conda.sh && rm install_conda.sh common_utils.sh /opt/conda/requirements.txt
+COPY ./common/install_pip_requirements.sh install_pip_requirements.sh
+COPY ./requirements.txt requirements.txt
+RUN bash ./install_pip_requirements.sh && rm install_pip_requirements.sh
+
+RUN ln -s /usr/bin/python3 /usr/bin/python
 
 USER ci-user
 CMD ["bash"]

.ci/docker/build.sh

@@ -10,7 +10,7 @@ set -exu
 IMAGE_NAME="$1"
 shift
 
-export UBUNTU_VERSION="20.04"
+export UBUNTU_VERSION="22.04"
 export CUDA_VERSION="12.4.1"
 
 export BASE_IMAGE="nvidia/cuda:${CUDA_VERSION}-devel-ubuntu${UBUNTU_VERSION}"

.ci/docker/common/common_utils.sh

@@ -10,7 +10,7 @@ install_ubuntu() {
   apt-get install -y --no-install-recommends \
     build-essential \
     ca-certificates \
-    cmake=3.16* \
+    cmake=3.22* \
     curl \
     git \
     wget \
@@ -27,7 +27,9 @@ install_ubuntu() {
     libglfw3-dev \
     sox \
     libsox-dev \
-    libsox-fmt-all
+    libsox-fmt-all \
+    python3-pip \
+    python3-dev
 
   # Cleanup package manager
   apt-get autoclean && apt-get clean

.ci/docker/common/install_base.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+# Install pip packages
+pip install --upgrade pip
+pip install -r ./requirements.txt

.ci/docker/common/install_conda.sh

@@ -57,11 +57,11 @@ jobs:
             const STALE_CLOSE_THRESHOLD_MS = 1000 * 60 * 60 * 24 * 30;
 
             const STALE_MESSAGE =
-              "Looks like this PR hasn't been updated in a while so we're going to go ahead and mark this as `Stale`. <br>" +
-              "Feel free to remove the `Stale` label if you feel this was a mistake. <br>" +
-              "If you are unable to remove the `Stale` label please contact a maintainer in order to do so. <br>" +
+              "Looks like this PR hasn't been updated in a while so we're going to go ahead and mark this as `stale`. <br>" +
+              "Feel free to remove the `stale` label if you feel this was a mistake. <br>" +
+              "If you are unable to remove the `stale` label please contact a maintainer in order to do so. <br>" +
               "If you want the bot to never mark this PR stale again, add the `no-stale` label.<br>" +
-              "`Stale` pull requests will automatically be closed after 30 days of inactivity.<br>";
+              "`stale` pull requests will automatically be closed after 30 days of inactivity.<br>";
 
             let numAPIRequests = 0;
             let numProcessed = 0;
@@ -79,7 +79,7 @@ jobs:
 
               // Check if the PR is stale, according to our configured thresholds.
               let staleThresholdMillis;
-              if (labels.includes("Stale")) {
+              if (labels.includes("stale")) {
                 core.info(`[${pull.number}] PR is labeled stale, checking whether we should close it.`);
                 staleThresholdMillis = STALE_CLOSE_THRESHOLD_MS;
               } else {
@@ -97,7 +97,7 @@ jobs:
 
               // At this point, we know we should do something.
               // For PRs already labeled stale, close them.
-              if (labels.includes("Stale")) {
+              if (labels.includes("stale")) {
                 core.info(`[${pull.number}] Closing PR.`);
                 numAPIRequests += 1;
                 await github.rest.issues.update({
@@ -123,7 +123,7 @@ jobs:
                   owner: "pytorch",
                   repo: "tutorials",
                   issue_number: pull.number,
-                  labels: ["Stale"],
+                  labels: ["stale"],
                 });
               }
             }

.ci/docker/common/install_pip_requirements.sh

@@ -1,5 +1,5 @@
 #Checks links in a PR to ensure they are valid. If link is valid but failing, it can be added to the .lycheeignore file
-#Code source: https://github.com/lycheeverse/lychee-action/issues/238
+#Use the skip-link-check label on a PR to skip checking links on a PR
 
 name: link check on PR
 
@@ -8,56 +8,45 @@ on:
     branches: [main]
 
 jobs:
-  check-links:
+  linkChecker:
     runs-on: ubuntu-latest
+
     steps:
-      - name: Clone repository
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
         with:
-          fetch-depth: 0
-          ref: ${{github.event.pull_request.head.ref}}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
+          fetch-depth: 1
 
-      - name: Check out main branch
-        run: git checkout main
+      - name: Get Changed Files
+        id: changed-files
+        uses: tj-actions/changed-files@v41
 
-      - name: Dump all links from main
-        id: dump_links_from_main
-        uses: lycheeverse/lychee-action@v1
+      - name: Check for Skip Label
+        id: skip-label
+        uses: actions/github-script@v6
         with:
-          args: |
-            --dump
-            --include-fragments
-            .
-          output: ./links-main.txt
-
-      - name: Stash untracked files
-        run: git stash push --include-untracked
-
-      - name: Check out feature branch
-        run: git checkout ${{ github.head_ref }}
-
-      - name: Apply stashed changes
-        # Apply stashed changes, ignore errors if stash is empty
-        run: git stash pop || true
-
-      - name: Append links-main.txt to .lycheeignore
-        run: cat links-main.txt >> .lycheeignore
-
-      - name: Check links
+          script: |
+            const labels = await github.rest.issues.listLabelsOnIssue({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number
+            });
+            return labels.data.some(label => label.name === 'skip-link-check');
+          
+      - name: Check Links
+        if: steps.skip-label.outputs.result == 'false'
         uses: lycheeverse/lychee-action@v1
         with:
-          args: |
-            --no-progress
-            --include-fragments
-            .
-          # Fail action on broken links
+          args: --accept=200,403,429 --base . --verbose --no-progress ${{ steps.changed-files.outputs.all_changed_files }}
+          token: ${{ secrets.CUSTOM_TOKEN }}
           fail: true
-
+          
+      - 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."
+        
       - name: Suggestions
         if: failure()
         run: |
           echo -e "\nPlease review the links reported in the Check links step above."
-          echo -e "If a link is valid but fails due to a CAPTCHA challenge, IP blocking, login requirements, etc.,
-          consider adding such links to .lycheeignore file to bypass future checks.\n"
+          echo -e "If a link is valid but fails due to a CAPTCHA challenge, IP blocking, login requirements, etc., consider adding such links to .lycheeignore file to bypass future checks.\n"
           exit 1

.github/workflows/StalePRs.yml

@@ -33,7 +33,7 @@
   },
   "recipes_source/torch_export_aoti_python.py": {
     "needs": "linux.g5.4xlarge.nvidia.gpu"
-  }, 
+  },
   "advanced_source/pendulum.py": {
     "needs": "linux.g5.4xlarge.nvidia.gpu",
     "_comment": "need to be here for the compiling_optimizer_lr_scheduler.py to run."
@@ -58,6 +58,9 @@
   "intermediate_source/scaled_dot_product_attention_tutorial.py": {
     "needs": "linux.g5.4xlarge.nvidia.gpu"
   },
+  "intermediate_source/transformer_building_blocks.py": {
+    "needs": "linux.g5.4xlarge.nvidia.gpu"
+  },
   "recipes_source/torch_compile_user_defined_triton_kernel_tutorial.py": {
     "needs": "linux.g5.4xlarge.nvidia.gpu"
   },

.github/workflows/link_checkPR.yml

@@ -10,6 +10,7 @@
 
 NOT_RUN = [
     "beginner_source/basics/intro",  # no code
+    "beginner_source/introyt/introyt_index", # no code
     "beginner_source/onnx/intro_onnx",
     "beginner_source/profiler",
     "beginner_source/saving_loading_models",
@@ -24,6 +25,7 @@
     "intermediate_source/mnist_train_nas",  # used by ax_multiobjective_nas_tutorial.py
     "intermediate_source/fx_conv_bn_fuser",
     "intermediate_source/_torch_export_nightly_tutorial",  # does not work on release
+    "intermediate_source/transformer_building_blocks",  # does not work on release
     "advanced_source/super_resolution_with_onnxruntime",
     "advanced_source/usb_semisup_learn", # fails with CUDA OOM error, should try on a different worker
     "prototype_source/fx_graph_mode_ptq_dynamic",

.jenkins/metadata.json

@@ -1,2 +1,14 @@
 # Used for links to be ignored during the link check.
 # Add link to file along with comment as to why it should be ignored
+
+#Example link in some of the tutorials that should be ignored
+file:///f:/libtmp/some_file
+
+#Ignore links with "file:///" to catch any other example links
+file:\/\/\/.*
+
+# Ignore colab link in the setting of conf.py
+https://pytorch.org/tutorials/beginner/colab/n
+
+# Ignore local host link from intermediate_source/tensorboard_tutorial.rst
+http://localhost:6006

.jenkins/validate_tutorials_built.py

@@ -93,22 +93,5 @@
 }
 
 .pytorch-left-menu-search input[type=text] {
-    background-image: none;
-}
-
-.gsc-control-cse {
-   padding-left: 0px !important;
-   padding-bottom: 0px !important;
-}
-
-.gsc-search-button .gsc-search-button-v2:focus {
-   border: transparent !important;
-   outline: none;
-   box-shadow: none;
-}
-.gsc-search-button-v2:active {
-   border: none !important;
-}
-.gsc-search-button-v2 {
-   border: none !important;
+    background-image: url("../images/search-icon.svg");
 }