Skip to content

Commit 5e1833f

Browse files
authored
Merge branch 'main' into patch-1
2 parents ab10ae5 + 0e530ea commit 5e1833f

File tree

85 files changed

+2379
-191
lines changed

Some content is hidden

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

85 files changed

+2379
-191
lines changed

.ci/docker/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ IMAGE_NAME="$1"
1111
shift
1212

1313
export UBUNTU_VERSION="20.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ conda_run() {
2222
}
2323

2424
pip_install() {
25-
as_ci_user conda run -n py_$ANACONDA_PYTHON_VERSION pip install --progress-bar off $*
25+
as_ci_user conda run -n py_$ANACONDA_PYTHON_VERSION pip3 install --progress-bar off $*
2626
}

.ci/docker/requirements.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ tqdm==4.66.1
1313
numpy==1.24.4
1414
matplotlib
1515
librosa
16-
torch==2.3
16+
torch==2.4
1717
torchvision
1818
torchtext
1919
torchdata
@@ -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.5.0
32+
tensordict==0.5.0
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,7 +64,7 @@ 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
7070
torchao==0.0.3

.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.2 for testing - uncomment to install nightly binaries (update the version as needed).
24+
# Install 2.4 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.3.0 torchvision torchaudio --no-cache-dir --index-url https://download.pytorch.org/whl/test/cu121
26+
# pip3 install torch==2.4.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/metadata.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
"intermediate_source/model_parallel_tutorial.py": {
2929
"needs": "linux.16xlarge.nvidia.gpu"
3030
},
31+
"recipes_source/torch_export_aoti_python.py": {
32+
"needs": "linux.g5.4xlarge.nvidia.gpu"
33+
},
3134
"advanced_source/pendulum.py": {
3235
"needs": "linux.g5.4xlarge.nvidia.gpu",
3336
"_comment": "need to be here for the compiling_optimizer_lr_scheduler.py to run."

.jenkins/validate_tutorials_built.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
"intermediate_source/fx_conv_bn_fuser",
3030
"intermediate_source/_torch_export_nightly_tutorial", # does not work on release
3131
"advanced_source/super_resolution_with_onnxruntime",
32-
"advanced_source/python_custom_ops", # https://github.com/pytorch/pytorch/issues/127443
3332
"advanced_source/usb_semisup_learn", # fails with CUDA OOM error, should try on a different worker
3433
"prototype_source/fx_graph_mode_ptq_dynamic",
3534
"prototype_source/vmap_recipe",
@@ -54,8 +53,6 @@
5453
"intermediate_source/flask_rest_api_tutorial",
5554
"intermediate_source/text_to_speech_with_torchaudio",
5655
"intermediate_source/tensorboard_profiler_tutorial", # reenable after 2.0 release.
57-
"intermediate_source/inductor_debug_cpu", # reenable after 2942
58-
"beginner_source/onnx/onnx_registry_tutorial", # reenable after 2941 is fixed.
5956
"intermediate_source/torch_export_tutorial" # reenable after 2940 is fixed.
6057
]
6158

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ We use sphinx-gallery's [notebook styled examples](https://sphinx-gallery.github
2222

2323
Here is how you can create a new tutorial (for a detailed description, see [CONTRIBUTING.md](./CONTRIBUTING.md)):
2424

25+
NOTE: Before submitting a new tutorial, read [PyTorch Tutorial Submission Policy](./tutorial_submission_policy.md).
26+
2527
1. Create a Python file. If you want it executed while inserted into documentation, save the file with the suffix `tutorial` so that the file name is `your_tutorial.py`.
2628
2. Put it in one of the `beginner_source`, `intermediate_source`, `advanced_source` directory based on the level of difficulty. If it is a recipe, add it to `recipes_source`. For tutorials demonstrating unstable prototype features, add to the `prototype_source`.
2729
3. For Tutorials (except if it is a prototype feature), include it in the `toctree` directive and create a `customcarditem` in [index.rst](./index.rst).
@@ -31,7 +33,7 @@ If you are starting off with a Jupyter notebook, you can use [this script](https
3133

3234
## Building locally
3335

34-
The tutorial build is very large and requires a GPU. If your machine does not have a GPU device, you can preview your HTML build without actually downloading the data and running the tutorial code:
36+
The tutorial build is very large and requires a GPU. If your machine does not have a GPU device, you can preview your HTML build without actually downloading the data and running the tutorial code:
3537

3638
1. Install required dependencies by running: `pip install -r requirements.txt`.
3739

@@ -40,8 +42,6 @@ The tutorial build is very large and requires a GPU. If your machine does not ha
4042
- If you have a GPU-powered laptop, you can build using `make docs`. This will download the data, execute the tutorials and build the documentation to `docs/` directory. This might take about 60-120 min for systems with GPUs. If you do not have a GPU installed on your system, then see next step.
4143
- You can skip the computationally intensive graph generation by running `make html-noplot` to build basic html documentation to `_build/html`. This way, you can quickly preview your tutorial.
4244

43-
> If you get **ModuleNotFoundError: No module named 'pytorch_sphinx_theme' make: *** [html-noplot] Error 2** from /tutorials/src/pytorch-sphinx-theme or /venv/src/pytorch-sphinx-theme (while using virtualenv), run `python setup.py install`.
44-
4545
## Building a single tutorial
4646

4747
You can build a single tutorial by using the `GALLERY_PATTERN` environment variable. For example to run only `neural_style_transfer_tutorial.py`, run:
@@ -59,8 +59,8 @@ The `GALLERY_PATTERN` variable respects regular expressions.
5959

6060

6161
## About contributing to PyTorch Documentation and Tutorials
62-
* You can find information about contributing to PyTorch documentation in the
63-
PyTorch Repo [README.md](https://github.com/pytorch/pytorch/blob/master/README.md) file.
62+
* You can find information about contributing to PyTorch documentation in the
63+
PyTorch Repo [README.md](https://github.com/pytorch/pytorch/blob/master/README.md) file.
6464
* Additional information can be found in [PyTorch CONTRIBUTING.md](https://github.com/pytorch/pytorch/blob/master/CONTRIBUTING.md).
6565

6666

_static/css/custom.css

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,24 @@
9191
transition: none;
9292
transform-origin: none;
9393
}
94+
95+
.pytorch-left-menu-search input[type=text] {
96+
background-image: none;
97+
}
98+
99+
.gsc-control-cse {
100+
padding-left: 0px !important;
101+
padding-bottom: 0px !important;
102+
}
103+
104+
.gsc-search-button .gsc-search-button-v2:focus {
105+
border: transparent !important;
106+
outline: none;
107+
box-shadow: none;
108+
}
109+
.gsc-search-button-v2:active {
110+
border: none !important;
111+
}
112+
.gsc-search-button-v2 {
113+
border: none !important;
114+
}
486 KB
Loading
423 KB
Loading

0 commit comments

Comments
 (0)