Merge branch 'pytorch:main' into master

Author: woongjoonchoi

.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

@@ -15,9 +15,8 @@ tqdm==4.66.1
 numpy==1.24.4
 matplotlib
 librosa
-torch==2.4
+torch==2.5
 torchvision
-torchtext
 torchdata
 networkx
 PyHamcrest
@@ -71,5 +70,5 @@ pycocotools
 semilearn==0.3.2
 torchao==0.5.0
 segment_anything==1.0
-torchrec==0.8.0
-fbgemm-gpu==0.8.0
+torchrec==1.0.0; platform_system == "Linux"
+fbgemm-gpu==1.0.0; platform_system == "Linux"

.ci/docker/common/install_pip_requirements.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/requirements.txt

@@ -0,0 +1,52 @@
+#Checks links in a PR to ensure they are valid. If link is valid but failing, it can be added to the .lycheeignore file
+#Use the skip-link-check label on a PR to skip checking links on a PR
+
+name: link check on PR
+
+on:
+  pull_request:
+    branches: [main]
+
+jobs:
+  linkChecker:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Get Changed Files
+        id: changed-files
+        uses: tj-actions/changed-files@v41
+
+      - name: Check for Skip Label
+        id: skip-label
+        uses: actions/github-script@v6
+        with:
+          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: --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"
+          exit 1

.github/workflows/StalePRs.yml

@@ -21,9 +21,9 @@ sudo apt-get install -y pandoc
 
 #Install PyTorch Nightly for test.
 # Nightly - pip install --pre torch torchvision torchaudio -f https://download.pytorch.org/whl/nightly/cu102/torch_nightly.html
-# Install 2.4 to merge all 2.4 PRs - uncomment to install nightly binaries (update the version as needed).
+# Install 2.5 to merge all 2.4 PRs - uncomment to install nightly binaries (update the version as needed).
 # pip uninstall -y torch torchvision torchaudio torchtext torchdata
-# pip3 install torch==2.4.0 torchvision torchaudio --no-cache-dir --index-url https://download.pytorch.org/whl/test/cu124
+# pip3 install torch==2.5.0 torchvision torchaudio --no-cache-dir --index-url https://download.pytorch.org/whl/test/cu124
 
 # Install two language tokenizers for Translation with TorchText tutorial
 python -m spacy download en_core_web_sm