Skip to content

Commit

Permalink
More ms3 docs (#227)
Browse files Browse the repository at this point in the history
* use shared version in docs and pip

* work

* support upload videos in docs

* work

* Update .gitignore

* docs

* Update teleoperation.md

* work

* work

* docs, move some code around

* Update quickstart.md

* some benchmarking results

* new theme with better github support

* examples

* Update teleoperation.md

* docs

* work

* Update custom_tasks.md

* work

* Update sapien_env.py

* work

* more docs

* work
  • Loading branch information
StoneT2000 authored Mar 7, 2024
1 parent 49d2b50 commit 6cf6a61
Show file tree
Hide file tree
Showing 92 changed files with 883 additions and 406 deletions.
9 changes: 5 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,11 @@ imgui.ini

# directories that should be ignored in general
# but can be excluded explicitly
tmp/
data/
demos/
videos/
/tmp
/data
/demos
/videos
/examples/benchmarking/videos

# testing
.coverage*
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ cd ManiSkill2 && pip install -e .
A GPU with the Vulkan driver installed is required to enable rendering in ManiSkill2. The rigid-body environments, powered by SAPIEN, are ready to use after installation. Test your installation:

```bash
# Run an episode (at most 200 steps) of "PickCube-v0" (a rigid-body environment) with random actions
# Run an episode (at most 200 steps) of "PickCube-v1" (a rigid-body environment) with random actions
# Or specify an environment by "-e ${ENV_ID}"
python -m mani_skill2.examples.demo_random_action
```
Expand All @@ -79,7 +79,7 @@ Here is a basic example of how to make an [Gym/Gymnasium](https://github.com/far
import gymnasium as gym
import mani_skill2.envs

env = gym.make("PickCube-v0", obs_mode="rgbd", control_mode="pd_joint_delta_pos", render_mode="human")
env = gym.make("PickCube-v1", obs_mode="rgbd", control_mode="pd_joint_delta_pos", render_mode="human")
print("Observation space", env.observation_space)
print("Action space", env.action_space)

Expand Down
3 changes: 3 additions & 0 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,6 @@ Start a server to watch changes
# In docs/
sphinx-autobuild ./source ./build/html
```


For github links for the time being must double check they link the right branch/commit
5 changes: 3 additions & 2 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sphinx==6.2.1
sphinx-autobuild
sphinx-book-theme
pydata_sphinx_theme
# For spelling
sphinxcontrib.spelling
# Type hints support
Expand All @@ -9,4 +9,5 @@ sphinx-autodoc-typehints
sphinx_copybutton
# Markdown parser
myst-parser
sphinx-subfigure
sphinx-subfigure
sphinxcontrib-video
Binary file added docs/source/_static/videos/demo.mp4
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

36 changes: 27 additions & 9 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from mani_skill2 import __version__
# Configuration file for the Sphinx documentation builder.
#
# For the full list of built-in configuration values, see the documentation:
Expand All @@ -6,11 +7,11 @@
# -- Project information -----------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information

project = "ManiSkill3"
copyright = "2024, ManiSkill3 Contributors"
author = "ManiSkill3 Contributors"
release = "3.0.0"
version = "3.0.0"
project = "ManiSkill"
copyright = "2024, ManiSkill Contributors"
author = "ManiSkill Contributors"
release = __version__
version = __version__

# -- General configuration ---------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
Expand All @@ -22,6 +23,7 @@
"sphinx_copybutton",
"myst_parser",
"sphinx_subfigure",
"sphinxcontrib.video",
]

# https://myst-parser.readthedocs.io/en/latest/syntax/optional.html
Expand All @@ -36,12 +38,28 @@
# -- Options for HTML output -------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output

html_theme = "sphinx_book_theme"
html_theme = "pydata_sphinx_theme"
html_theme_options = {
"use_edit_page_button": True,
"icon_links": [
{
"name": "GitHub",
"url": "https://github.com/haosulab/maniskill2",
"icon": "fa-brands fa-github",
}
],
"external_links": [
{"name": "Changelog", "url": "https://github.com/haosulab/maniskill2/releases"},
]

}
html_context = {
"display_github": True,
"github_user": "haosulab",
"github_repo": "ManiSkill2",
"github_version": "main",
"conf_py_path": "/source/"
}
"github_version": "dev",
"conf_py_path": "/source/",
"doc_path": "docs/source"
}

html_static_path = ['_static']
1 change: 0 additions & 1 deletion docs/source/datasets/teleoperation.md

This file was deleted.

115 changes: 0 additions & 115 deletions docs/source/getting_started/quickstart.md

This file was deleted.

22 changes: 22 additions & 0 deletions docs/source/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# ManiSkill

ManiSkill is a feature-rich GPU-accelerated robotics benchmark built on top of [SAPIEN](https://github.com/haosulab/sapien) designed to provide accessible support for a wide array of applications from robot learning, learning from demonstrations, sim2real/real2sim, and more.

Features:

* GPU parallelized simulation enabling 200,000+ FPS on some tasks
* GPU parallelized rendering enabling 10,000+ FPS on some tasks, massively outperforming other benchmarks
* Flexible API to build custom tasks of any complexity
* Variety of verified robotics tasks with diverse dynamics and visuals
* Reproducible baselines in Reinforcement Learning and Learning from Demonstrations, spread across tasks from dextrous manipulation to mobile manipulation


## User Guide

A user guide on how to use ManiSkill with GPU parallelized simulation for your robotics and machine learning workflows
```{toctree}
:maxdepth: 2
user_guide/index
tasks/index
```
48 changes: 0 additions & 48 deletions docs/source/index.rst

This file was deleted.

1 change: 1 addition & 0 deletions docs/source/tasks/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Tasks
Loading

0 comments on commit 6cf6a61

Please sign in to comment.