Skip to content

Commit f69f2b0

Browse files
authored
Merge branch 'main' into patch-1
2 parents 2077295 + f2b930e commit f69f2b0

38 files changed

+331
-2102
lines changed

.ci/docker/requirements.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ tqdm==4.66.1
1414
numpy==1.24.4
1515
matplotlib
1616
librosa
17-
torch==2.4
17+
torch==2.5
1818
torchvision
19-
torchtext
2019
torchdata
2120
networkx
2221
PyHamcrest
@@ -70,5 +69,5 @@ pycocotools
7069
semilearn==0.3.2
7170
torchao==0.5.0
7271
segment_anything==1.0
73-
torchrec==0.8.0
74-
fbgemm-gpu==0.8.0
72+
torchrec==1.0.0; platform_system == "Linux"
73+
fbgemm-gpu==1.0.0; platform_system == "Linux"

.github/workflows/link_checkPR.yml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
#Checks links in a PR to ensure they are valid. If link is valid but failing, it can be added to the .lycheeignore file
2+
#Code source: https://github.com/lycheeverse/lychee-action/issues/238
3+
4+
name: link check on PR
5+
6+
on:
7+
pull_request:
8+
branches: [main]
9+
10+
jobs:
11+
check-links:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Clone repository
15+
uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0
18+
ref: ${{github.event.pull_request.head.ref}}
19+
repository: ${{github.event.pull_request.head.repo.full_name}}
20+
21+
- name: Check out main branch
22+
run: git checkout main
23+
24+
- name: Dump all links from main
25+
id: dump_links_from_main
26+
uses: lycheeverse/lychee-action@v1
27+
with:
28+
args: |
29+
--dump
30+
--include-fragments
31+
.
32+
output: ./links-main.txt
33+
34+
- name: Stash untracked files
35+
run: git stash push --include-untracked
36+
37+
- name: Check out feature branch
38+
run: git checkout ${{ github.head_ref }}
39+
40+
- name: Apply stashed changes
41+
# Apply stashed changes, ignore errors if stash is empty
42+
run: git stash pop || true
43+
44+
- name: Append links-main.txt to .lycheeignore
45+
run: cat links-main.txt >> .lycheeignore
46+
47+
- name: Check links
48+
uses: lycheeverse/lychee-action@v1
49+
with:
50+
args: |
51+
--no-progress
52+
--include-fragments
53+
.
54+
# Fail action on broken links
55+
fail: true
56+
57+
- name: Suggestions
58+
if: failure()
59+
run: |
60+
echo -e "\nPlease review the links reported in the Check links step above."
61+
echo -e "If a link is valid but fails due to a CAPTCHA challenge, IP blocking, login requirements, etc.,
62+
consider adding such links to .lycheeignore file to bypass future checks.\n"
63+
exit 1

.jenkins/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ sudo apt-get install -y pandoc
2121

2222
#Install PyTorch Nightly for test.
2323
# Nightly - pip install --pre torch torchvision torchaudio -f https://download.pytorch.org/whl/nightly/cu102/torch_nightly.html
24-
# Install 2.4 to merge all 2.4 PRs - uncomment to install nightly binaries (update the version as needed).
24+
# Install 2.5 to merge all 2.4 PRs - uncomment to install nightly binaries (update the version as needed).
2525
# pip uninstall -y torch torchvision torchaudio torchtext torchdata
26-
# pip3 install torch==2.4.0 torchvision torchaudio --no-cache-dir --index-url https://download.pytorch.org/whl/test/cu124
26+
# pip3 install torch==2.5.0 torchvision torchaudio --no-cache-dir --index-url https://download.pytorch.org/whl/test/cu124
2727

2828
# Install two language tokenizers for Translation with TorchText tutorial
2929
python -m spacy download en_core_web_sm

.jenkins/validate_tutorials_built.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
NOT_RUN = [
1212
"beginner_source/basics/intro", # no code
1313
"beginner_source/onnx/intro_onnx",
14-
"beginner_source/translation_transformer",
1514
"beginner_source/profiler",
1615
"beginner_source/saving_loading_models",
1716
"beginner_source/introyt/captumyt",
@@ -22,9 +21,6 @@
2221
"beginner_source/former_torchies/tensor_tutorial_old",
2322
"beginner_source/examples_autograd/polynomial_autograd",
2423
"beginner_source/examples_autograd/polynomial_custom_function",
25-
"beginner_source/torchtext_custom_dataset_tutorial", # not building with 2.3 RC, might be able to turn on with GA
26-
"beginner_source/text_sentiment_ngrams_tutorial", # not building with 2.3 RC, might be able to turn on with GA
27-
"beginner_source/t5_tutorial", # re-enable after this is fixed: https://github.com/pytorch/text/issues/1756
2824
"intermediate_source/mnist_train_nas", # used by ax_multiobjective_nas_tutorial.py
2925
"intermediate_source/fx_conv_bn_fuser",
3026
"intermediate_source/_torch_export_nightly_tutorial", # does not work on release

.lycheeignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Used for links to be ignored during the link check.
2+
# Add link to file along with comment as to why it should be ignored

Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,6 @@ download:
8282
wget -nv -N http://dl.fbaipublicfiles.com/pythia/data/vocab.tar.gz -P $(DATADIR)
8383
tar $(TAROPTS) -xzf $(DATADIR)/vocab.tar.gz -C ./beginner_source/data/
8484

85-
# Download dataset for beginner_source/torchtext_custom_dataset_tutorial.py
86-
wget -nv -N https://www.manythings.org/anki/deu-eng.zip -P $(DATADIR)
87-
unzip -o $(DATADIR)/deu-eng.zip -d beginner_source/data/
88-
8985
# Download PennFudanPed dataset for intermediate_source/torchvision_tutorial.py
9086
wget https://www.cis.upenn.edu/~jshi/ped_html/PennFudanPed.zip -P $(DATADIR)
9187
unzip -o $(DATADIR)/PennFudanPed.zip -d intermediate_source/data/
Loading
Loading
Loading
Loading

beginner_source/README.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,3 @@ Beginner Tutorials
2020
5. nlp/* and deep_learning_nlp_tutorial.rst
2121
Deep Learning for NLP with Pytorch
2222
https://pytorch.org/tutorials/beginner/deep_learning_nlp_tutorial.html
23-
24-
6. transformer_translation.py
25-
Language Translation with Transformers
26-
https://pytorch.org/tutorials/beginner/translation_transformer.html

beginner_source/basics/saveloadrun_tutorial.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
########################
5858
# We can then load the model as demonstrated below.
5959
#
60-
# As described in `Saving and loading torch.nn.Modules <pytorch.org/docs/main/notes/serialization.html#saving-and-loading-torch-nn-modules>`__,
61-
# saving ``state_dict``s is considered the best practice. However,
60+
# As described in `Saving and loading torch.nn.Modules <https://pytorch.org/docs/main/notes/serialization.html#saving-and-loading-torch-nn-modules>`_,
61+
# saving ``state_dict`` is considered the best practice. However,
6262
# below we use ``weights_only=False`` because this involves loading the
6363
# model, which is a legacy use case for ``torch.save``.
6464

0 commit comments

Comments
 (0)