Skip to content

Commit de3fa85

Browse files
authored
Merge branch 'main' into fix/ppo-mujoco-colab
2 parents 120f5b0 + 6d169f6 commit de3fa85

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

.ci/docker/requirements.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Refer to ./jenkins/build.sh for tutorial build instructions
33

44
sphinx==5.3.0
5-
sphinx-gallery==0.11.1
5+
sphinx-gallery==0.17.1
66
sphinx-reredirects==0.1.4
77
sphinx-design==0.4.0
88
docutils==0.16
@@ -31,7 +31,8 @@ pytorch-lightning
3131
torchx
3232
torchrl==0.7.2
3333
tensordict==0.7.2
34-
ax-platform>=0.4.0
34+
# For ax_multiobjective_nas_tutorial.py
35+
ax-platform>=0.4.0,<0.5.0
3536
nbformat>=5.9.2
3637
datasets
3738
transformers

conf.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,10 @@ def wrapper(*args, **kwargs):
8585
raise RuntimeError(f"Error in subprocess: {result}")
8686
return wrapper
8787

88-
sphinx_gallery.gen_rst.generate_file_rst = call_in_subprocess(sphinx_gallery.gen_rst.generate_file_rst)
88+
# Windows does not support multiprocessing with fork and mac has issues with
89+
# fork so we do not monkey patch sphinx gallery to run in subprocesses.
90+
if os.getenv("TUTORIALS_ISOLATE_BUILD", "1") == "1" and not sys.platform.startswith("win") and not sys.platform == "darwin":
91+
sphinx_gallery.gen_rst.generate_file_rst = call_in_subprocess(sphinx_gallery.gen_rst.generate_file_rst)
8992

9093
try:
9194
import torchvision

custom_directives.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ def run(self):
8888
if 'intro' in self.options:
8989
intro = self.options['intro'][:195] + '...'
9090
else:
91-
_, blocks = sphinx_gallery.gen_rst.split_code_and_text_blocks(abs_fname)
91+
block_parser = sphinx_gallery.gen_rst.BlockParser(abs_fname, {"filetype_parsers": {}})
92+
_, blocks, _ = block_parser.split_code_and_text_blocks(abs_fname)
9293
intro, _ = sphinx_gallery.gen_rst.extract_intro_and_title(abs_fname, blocks[0][1])
9394

9495
thumbnail_rst = ''

0 commit comments

Comments
 (0)