Skip to content

Commit 6daad0b

Browse files
authored
Merge branch 'pytorch:main' into main
2 parents 801adf7 + 9b8204b commit 6daad0b

File tree

247 files changed

+11798
-10927
lines changed

Some content is hidden

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

247 files changed

+11798
-10927
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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ set -exu
1010
IMAGE_NAME="$1"
1111
shift
1212

13-
export UBUNTU_VERSION="20.04"
13+
export UBUNTU_VERSION="22.04"
14+
export CUDA_VERSION="12.4.1"
1415

15-
export BASE_IMAGE="ubuntu:${UBUNTU_VERSION}"
16+
export BASE_IMAGE="nvidia/cuda:${CUDA_VERSION}-devel-ubuntu${UBUNTU_VERSION}"
1617
echo "Building ${IMAGE_NAME} Docker image"
1718

1819
docker build \

.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: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ sphinx-gallery==0.11.1
66
sphinx_design
77
docutils==0.16
88
sphinx-copybutton
9+
sphinx_sitemap==2.6.0
910
pypandoc==1.12
1011
pandocfilters
1112
markdown
1213
tqdm==4.66.1
1314
numpy==1.24.4
1415
matplotlib
1516
librosa
16-
torch==2.3
17+
torch==2.6
1718
torchvision
18-
torchtext
1919
torchdata
2020
networkx
2121
PyHamcrest
@@ -28,10 +28,10 @@ tensorboard
2828
jinja2==3.1.3
2929
pytorch-lightning
3030
torchx
31-
torchrl==0.3.0
32-
tensordict==0.3.0
33-
ax-platform
34-
nbformat>==5.9.2
31+
torchrl==0.7.2
32+
tensordict==0.7.2
33+
ax-platform>=0.4.0
34+
nbformat>=5.9.2
3535
datasets
3636
transformers
3737
torchmultimodal-nightly # needs to be updated to stable as soon as it's avaialable
@@ -64,8 +64,10 @@ pyopengl
6464
gymnasium[mujoco]==0.27.0
6565
timm
6666
iopath
67-
pygame==2.1.2
67+
pygame==2.6.0
6868
pycocotools
6969
semilearn==0.3.2
70-
torchao==0.0.3
70+
torchao==0.5.0
7171
segment_anything==1.0
72+
torchrec==1.0.0; platform_system == "Linux"
73+
fbgemm-gpu==1.1.0; platform_system == "Linux"

.github/scripts/docathon-label-sync.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ def main():
2525
issue_number = int(re.findall(r'#(\d{1,5})', pull_request_body)[0])
2626
issue = repo.get_issue(issue_number)
2727
issue_labels = issue.labels
28-
docathon_label_present = any(label.name == 'docathon-h2-2023' for label in issue_labels)
28+
docathon_label_present = any(label.name == 'docathon-h1-2024' for label in issue_labels)
2929

3030
# if the issue has a docathon label, add all labels from the issue to the PR.
3131
if not docathon_label_present:
32-
print("The 'docathon-h2-2023' label is not present in the issue.")
32+
print("The 'docathon-h1-2024' label is not present in the issue.")
3333
return
3434
pull_request_labels = pull_request.get_labels()
3535
issue_label_names = [label.name for label in issue_labels]
3636
labels_to_add = [label for label in issue_label_names if label not in pull_request_labels]
3737
if not labels_to_add:
3838
print("The pull request already has the same labels.")
3939
return
40-
pull_request.set_labels(*labels_to_add)
40+
pull_request.add_to_labels(*labels_to_add)
4141
print("Labels added to the pull request!")
4242

4343

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

0 commit comments

Comments
 (0)