Skip to content

Commit 7aae4e6

Browse files
authored
Merge branch 'pytorch:main' into main
2 parents 372f0c9 + 4c18d79 commit 7aae4e6

File tree

171 files changed

+5202
-7572
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+5202
-7572
lines changed

.ci/docker/Dockerfile

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,11 @@ RUN bash ./install_user.sh && rm install_user.sh
1515
COPY ./common/install_docs_reqs.sh install_docs_reqs.sh
1616
RUN bash ./install_docs_reqs.sh && rm install_docs_reqs.sh
1717

18-
# Install conda and other packages
19-
ENV ANACONDA_PYTHON_VERSION=3.10
20-
ENV CONDA_CMAKE yes
21-
ENV DOCS yes
22-
ENV PATH /opt/conda/envs/py_$ANACONDA_PYTHON_VERSION/bin:/opt/conda/bin:$PATH
23-
COPY ./requirements.txt /opt/conda/
24-
COPY ./common/install_conda.sh install_conda.sh
25-
COPY ./common/common_utils.sh common_utils.sh
26-
RUN bash ./install_conda.sh && rm install_conda.sh common_utils.sh /opt/conda/requirements.txt
18+
COPY ./common/install_pip_requirements.sh install_pip_requirements.sh
19+
COPY ./requirements.txt requirements.txt
20+
RUN bash ./install_pip_requirements.sh && rm install_pip_requirements.sh
21+
22+
RUN ln -s /usr/bin/python3 /usr/bin/python
2723

2824
USER ci-user
2925
CMD ["bash"]

.ci/docker/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set -exu
1010
IMAGE_NAME="$1"
1111
shift
1212

13-
export UBUNTU_VERSION="20.04"
13+
export UBUNTU_VERSION="22.04"
1414
export CUDA_VERSION="12.4.1"
1515

1616
export BASE_IMAGE="nvidia/cuda:${CUDA_VERSION}-devel-ubuntu${UBUNTU_VERSION}"

.ci/docker/common/common_utils.sh

Lines changed: 0 additions & 26 deletions
This file was deleted.

.ci/docker/common/install_base.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ install_ubuntu() {
1010
apt-get install -y --no-install-recommends \
1111
build-essential \
1212
ca-certificates \
13-
cmake=3.16* \
13+
cmake=3.22* \
1414
curl \
1515
git \
1616
wget \
@@ -27,7 +27,9 @@ install_ubuntu() {
2727
libglfw3-dev \
2828
sox \
2929
libsox-dev \
30-
libsox-fmt-all
30+
libsox-fmt-all \
31+
python3-pip \
32+
python3-dev
3133

3234
# Cleanup package manager
3335
apt-get autoclean && apt-get clean

.ci/docker/common/install_conda.sh

Lines changed: 0 additions & 55 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
set -ex
4+
5+
# Install pip packages
6+
pip install --upgrade pip
7+
pip install -r ./requirements.txt

.ci/docker/requirements.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ tqdm==4.66.1
1414
numpy==1.24.4
1515
matplotlib
1616
librosa
17-
torch==2.4
17+
torch==2.6
1818
torchvision
1919
torchdata
2020
networkx
@@ -28,8 +28,8 @@ tensorboard
2828
jinja2==3.1.3
2929
pytorch-lightning
3030
torchx
31-
torchrl==0.5.0
32-
tensordict==0.5.0
31+
torchrl==0.7.2
32+
tensordict==0.7.2
3333
ax-platform>=0.4.0
3434
nbformat>=5.9.2
3535
datasets
@@ -69,5 +69,5 @@ pycocotools
6969
semilearn==0.3.2
7070
torchao==0.5.0
7171
segment_anything==1.0
72-
torchrec==0.8.0
73-
fbgemm-gpu==0.8.0
72+
torchrec==1.0.0; platform_system == "Linux"
73+
fbgemm-gpu==1.1.0; platform_system == "Linux"
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
#Runs once a month and checks links in the repo to ensure they are valid
2+
#If action fails, it creates an issue with the failing links and an "incorrect link" label
3+
#If link is valid but failing, it can be added to the .lycheeignore file
4+
#Action can also be run manually as needed.
5+
6+
7+
name: Monthly Link Check
8+
on:
9+
schedule:
10+
- cron: '0 0 1 * *' # Runs at midnight on the first day of every month
11+
workflow_dispatch: # Allows manual triggering of the workflow
12+
jobs:
13+
linkChecker:
14+
runs-on: ubuntu-latest
15+
permissions:
16+
issues: write
17+
steps:
18+
- uses: actions/checkout@v4
19+
with:
20+
fetch-depth: 1
21+
- name: Check Links
22+
id: lychee
23+
uses: lycheeverse/lychee-action@v2
24+
with:
25+
args: --accept=200,403,429 --base . --verbose --no-progress './**/*.md' './**/*.html' './**/*.rst'
26+
token: ${{ secrets.CUSTOM_TOKEN }}
27+
fail: true
28+
29+
- name: Create Issue From File
30+
if: failure() && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
31+
uses: peter-evans/create-issue-from-file@v5
32+
with:
33+
title: Broken links detected in docs 🔗
34+
content-filepath: ./lychee/out.md
35+
labels: 'incorrect link'
36+
#token: ${{ secrets.CUSTOM_TOKEN }}
37+
38+
39+
- name: Suggestions
40+
if: failure()
41+
run: |
42+
echo -e "\nPlease review the links reported in the Check links step above."
43+
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"
44+
exit 1

.github/workflows/StalePRs.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ jobs:
5757
const STALE_CLOSE_THRESHOLD_MS = 1000 * 60 * 60 * 24 * 30;
5858
5959
const STALE_MESSAGE =
60-
"Looks like this PR hasn't been updated in a while so we're going to go ahead and mark this as `Stale`. <br>" +
61-
"Feel free to remove the `Stale` label if you feel this was a mistake. <br>" +
62-
"If you are unable to remove the `Stale` label please contact a maintainer in order to do so. <br>" +
60+
"Looks like this PR hasn't been updated in a while so we're going to go ahead and mark this as `stale`. <br>" +
61+
"Feel free to remove the `stale` label if you feel this was a mistake. <br>" +
62+
"If you are unable to remove the `stale` label please contact a maintainer in order to do so. <br>" +
6363
"If you want the bot to never mark this PR stale again, add the `no-stale` label.<br>" +
64-
"`Stale` pull requests will automatically be closed after 30 days of inactivity.<br>";
64+
"`stale` pull requests will automatically be closed after 30 days of inactivity.<br>";
6565
6666
let numAPIRequests = 0;
6767
let numProcessed = 0;
@@ -79,7 +79,7 @@ jobs:
7979
8080
// Check if the PR is stale, according to our configured thresholds.
8181
let staleThresholdMillis;
82-
if (labels.includes("Stale")) {
82+
if (labels.includes("stale")) {
8383
core.info(`[${pull.number}] PR is labeled stale, checking whether we should close it.`);
8484
staleThresholdMillis = STALE_CLOSE_THRESHOLD_MS;
8585
} else {
@@ -97,7 +97,7 @@ jobs:
9797
9898
// At this point, we know we should do something.
9999
// For PRs already labeled stale, close them.
100-
if (labels.includes("Stale")) {
100+
if (labels.includes("stale")) {
101101
core.info(`[${pull.number}] Closing PR.`);
102102
numAPIRequests += 1;
103103
await github.rest.issues.update({
@@ -123,7 +123,7 @@ jobs:
123123
owner: "pytorch",
124124
repo: "tutorials",
125125
issue_number: pull.number,
126-
labels: ["Stale"],
126+
labels: ["stale"],
127127
});
128128
}
129129
}

.github/workflows/build-tutorials.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ jobs:
4444
4545
- name: Checkout Tutorials
4646
uses: actions/checkout@v3
47+
with:
48+
fetch-depth: 0
4749

4850
- name: Setup Linux
4951
uses: pytorch/pytorch/.github/actions/setup-linux@main
@@ -115,6 +117,8 @@ jobs:
115117
116118
- name: Checkout Tutorials
117119
uses: actions/checkout@v3
120+
with:
121+
fetch-depth: 0
118122

119123
- name: Setup Linux
120124
uses: pytorch/pytorch/.github/actions/setup-linux@main

0 commit comments

Comments
 (0)