Skip to content

Commit 2a2d160

Browse files
authored
Merge branch 'release/1.0' into cherry-pick-14622-by-pytorch_bot_bot_
2 parents 488f0e6 + b0462ae commit 2a2d160

24 files changed

+270
-814
lines changed

.ci/docker/requirements-ci.txt

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,21 @@ hypothesis==6.84.2
1616
parameterized==0.9.0
1717

1818
# Doc build requirements, same as https://github.com/pytorch/pytorch/blob/main/.ci/docker/requirements-docs.txt
19-
sphinx==5.3.0
19+
sphinx==7.2.6
20+
sphinxcontrib.katex==0.9.10
21+
breathe==4.36.0 # only if generating C++
22+
exhale==0.3.7 # only if generating C++ docs
23+
docutils==0.18.1,<0.21
24+
sphinx-design==0.6.1
25+
sphinxcontrib-mermaid==1.0.0
26+
myst-parser==3.0.1 # if want to contribute in markdown
27+
sphinx-gallery==0.14.0 # only if hosting interactive tutorials
28+
sphinx-sitemap==2.7.1
2029
sphinx-reredirects==0.1.4
21-
sphinx-gallery==0.14.0
22-
breathe==4.34.0
23-
exhale==0.2.3
24-
docutils==0.16
2530
matplotlib>=3.9.4
31+
sphinx-copybutton==0.5.2
2632
# PyTorch Theme
27-
-e git+https://github.com/pytorch/pytorch_sphinx_theme.git#egg=pytorch_sphinx_theme
28-
myst-parser==0.18.1
29-
sphinx_design==0.4.1
30-
sphinx-copybutton==0.5.0
33+
-e git+https://github.com/pytorch/pytorch_sphinx_theme.git@pytorch_sphinx_theme2#egg=pytorch_sphinx_theme2
3134

3235
# script unit test requirements
3336
yaspin==3.1.0

.ci/scripts/setup-linux.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ else
2323
fi
2424
build_executorch_runner "${BUILD_TOOL}" "${BUILD_MODE}"
2525

26+
# Fix for libcxx version issues with PyTorch prebuilts.
27+
# Tracking in https://github.com/pytorch/executorch/issues/14679.
28+
if [ "$(uname -m)" == "aarch64" ]; then
29+
conda install -y -c conda-forge libstdcxx-ng
30+
fi
31+
2632
if [[ "${GITHUB_BASE_REF:-}" == *main* || "${GITHUB_BASE_REF:-}" == *gh* ]]; then
2733
do_not_use_nightly_on_ci
2834
fi

docs/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
/sphinxbuild_py
44
/sphinxbuild_cpp
55
/src
6+
source/sg_execution_times.rst

docs/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ BUILDDIR = _build
1010

1111
# Put it first so that "make" without argument is like "make help".
1212

13+
html-noplot:
14+
$(SPHINXBUILD) -D plot_gallery=0 -b html $(SPHINXOPTS) "$(SOURCEDIR)" "$(BUILDDIR)/html"
15+
1316
help:
1417
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
1518

docs/source/_static/css/custom.css

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

docs/source/_static/css/progress-bar.css

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

0 commit comments

Comments
 (0)