Merge branch 'main' into tutorial-audit-T228126880

Author: svekars

.ci/docker/requirements.txt

@@ -1,9 +1,10 @@
 # --extra-index-url https://download.pytorch.org/whl/cu117/index.html # Use this to run/publish tutorials against the latest binaries during the RC stage. Comment out after the release. Each release verify the correct cuda version.
 # Refer to ./jenkins/build.sh for tutorial build instructions
 
-sphinx==5.0.0
+sphinx==5.3.0
 sphinx-gallery==0.11.1
-sphinx_design
+sphinx-reredirects==0.1.4
+sphinx-design==0.4.0
 docutils==0.16
 sphinx-copybutton
 sphinx_sitemap==2.6.0

.jenkins/build.sh

@@ -151,6 +151,12 @@ elif [[ "${JOB_TYPE}" == "manager" ]]; then
   # Step 7: push new HTML files and static files to gh-pages
   if [[ "$COMMIT_SOURCE" == "refs/heads/master" || "$COMMIT_SOURCE" == "refs/heads/main" ]]; then
     git clone https://github.com/pytorch/tutorials.git -b gh-pages gh-pages
+    # Clean up directories that contain tutorials
+    
+    for dir in beginner intermediate prototype recipes advanced distributed vision text audio; do
+      rm -rf "gh-pages/$dir"
+    done
+    
     cp -r docs/* gh-pages/
     pushd gh-pages
     # DANGER! DO NOT REMOVE THE `set +x` SETTING HERE!

beginner_source/saving_loading_models.py

@@ -227,43 +227,30 @@
 # normalization layers to evaluation mode before running inference.
 # Failing to do this will yield inconsistent inference results.
 #
-# Export/Load Model in TorchScript Format
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+# Saving an Exported Program
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
-# One common way to do inference with a trained model is to use
-# `TorchScript <https://pytorch.org/docs/stable/jit.html>`__, an intermediate
-# representation of a PyTorch model that can be run in Python as well as in a
-# high performance environment like C++. TorchScript is actually the recommended model format
-# for scaled inference and deployment.
+# If you are using ``torch.export``, you can save and load your ``ExportedProgram`` using the
+# ``torch.export.save()`` and ``torch.export.load()`` APIs. with the ``.pt2`` file extension:
 #
-# .. note::
-#    Using the TorchScript format, you will be able to load the exported model and
-#    run inference without defining the model class.
-#
-# **Export:**
-#
-# .. code:: python
-#
-#    model_scripted = torch.jit.script(model) # Export to TorchScript
-#    model_scripted.save('model_scripted.pt') # Save
-#
-# **Load:**
+# .. code-block:: python
+# 
+#    class SimpleModel(torch.nn.Module):
+#         def forward(self, x):
+#             return x + 10
 #
-# .. code:: python
+#    # Create a sample input
+#    sample_input = torch.randn(5)
+# 
+#    # Export the model
+#    exported_program = torch.export.export(SimpleModel(), sample_input)
 #
-#    model = torch.jit.load('model_scripted.pt')
-#    model.eval()
+#    # Save the exported program
+#    torch.export.save(exported_program, 'exported_program.pt2')
 #
-# Remember that you must call ``model.eval()`` to set dropout and batch
-# normalization layers to evaluation mode before running inference.
-# Failing to do this will yield inconsistent inference results.
+#    # Load the exported program
+#    saved_exported_program = torch.export.load('exported_program.pt2')
 #
-# For more information on TorchScript, feel free to visit the dedicated
-# `tutorials <https://pytorch.org/tutorials/beginner/Intro_to_TorchScript_tutorial.html>`__.
-# You will get familiar with the tracing conversion and learn how to
-# run a TorchScript module in a `C++ environment <https://pytorch.org/tutorials/advanced/cpp_export.html>`__.
-
-
 
 ######################################################################
 # Saving & Loading a General Checkpoint for Inference and/or Resuming Training

conf.py

@@ -45,7 +45,7 @@
 import plotly.io as pio
 from pathlib import Path
 pio.renderers.default = 'sphinx_gallery'
-
+from redirects import redirects
 
 import sphinx_gallery.gen_rst
 import multiprocessing
@@ -121,7 +121,8 @@ def wrapper(*args, **kwargs):
     'sphinx_copybutton',
     'sphinx_gallery.gen_gallery',
     'sphinx_design',
-    'sphinx_sitemap'
+    'sphinx_sitemap',
+    'sphinx_reredirects'
 ]
 
 intersphinx_mapping = {

prototype_source/pt2e_quant_xpu_inductor.rst

@@ -85,6 +85,7 @@ We will start by performing the necessary imports, capturing the FX Graph from t
         exported_model = export_for_training(
             model,
             example_inputs,
+            strict=True
         ).module()
 
 

recipes_source/bundled_inputs.rst

@@ -0,0 +1,6 @@
+redirects = {
+    "intermediate/flask_rest_api_tutorial": "../index.html",
+    "beginner/ptcheat.html": "../index.html",
+    "beginner/deploy_seq2seq_hybrid_frontend_tutorial.html": "../index.html",
+    "recipes/bundled_inputs.html": "../index.html",
+}