Skip to content

Commit e31d496

Browse files
authored
Merge branch 'main' into rwiltz/add_arena_g1_locomanip_retargeting
Signed-off-by: Kelly Guo <kellyg@nvidia.com>
2 parents 30a470c + 7b16b67 commit e31d496

File tree

112 files changed

+2950
-1077
lines changed

Some content is hidden

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

112 files changed

+2950
-1077
lines changed

CONTRIBUTORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ Guidelines for modifications:
3636
* Pascal Roth
3737
* Sheikh Dawood
3838
* Ossama Ahmed
39+
* Greg Attra
3940

4041
## Contributors
4142

docs/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@
157157
"omni.client",
158158
"omni.physx",
159159
"omni.physics",
160+
"usdrt",
160161
"pxr.PhysxSchema",
161162
"pxr.PhysicsSchemaTools",
162163
"omni.replicator",
503 KB
Loading

docs/source/how-to/cloudxr_teleoperation.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,18 @@ teleoperation in Isaac Lab.
2424

2525
See :ref:`manus-vive-handtracking` for more information on supported hand-tracking peripherals.
2626

27+
.. note::
28+
29+
**Meta Quest 3 and Pico 4 Ultra Support (Early Access)**
30+
31+
Meta Quest 3 and Pico 4 Ultra are now supported via the `CloudXR Early Access program`_.
32+
Join the program by mentioning isaac use cases. Once approved, you'll receive email to set up NGC,
33+
then download `CloudXR.js with Isaac Teleop samples`_ and follow its guide.
34+
Pico 4 Ultra must use HTTPS mode (see NGC documentation for details). General availability
35+
will be provided in a future version of Isaac Lab.
36+
37+
.. _`CloudXR Early Access program`: https://developer.nvidia.com/cloudxr-sdk-early-access-program/join
38+
.. _`CloudXR.js with Isaac Teleop samples`: https://catalog.ngc.nvidia.com/orgs/nvidia/resources/cloudxr-js-early-access?version=6.0.0-beta
2739

2840
Overview
2941
--------

docs/source/overview/reinforcement-learning/rl_frameworks.rst

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,26 @@ Training Performance
7171
--------------------
7272

7373
We performed training with each RL library on the same ``Isaac-Humanoid-v0`` environment
74-
with ``--headless`` on a single RTX PRO 6000 GPU using 4096 environments
75-
and logged the total training time for 65.5M steps for each RL library.
76-
74+
with ``--headless`` on a single NVIDIA GeForce RTX 4090 and logged the total training time
75+
for 65.5M steps (4096 environments x 32 rollout steps x 500 iterations).
7776

7877
+--------------------+-----------------+
7978
| RL Library | Time in seconds |
8079
+====================+=================+
81-
| RL-Games | 207 |
80+
| RL-Games | 201 |
8281
+--------------------+-----------------+
83-
| SKRL | 208 |
82+
| SKRL | 201 |
8483
+--------------------+-----------------+
85-
| RSL RL | 199 |
84+
| RSL RL | 198 |
8685
+--------------------+-----------------+
87-
| Stable-Baselines3 | 322 |
86+
| Stable-Baselines3 | 287 |
8887
+--------------------+-----------------+
88+
89+
Training commands (check for the *'Training time: XXX seconds'* line in the terminal output):
90+
91+
.. code:: bash
92+
93+
python scripts/reinforcement_learning/rl_games/train.py --task Isaac-Humanoid-v0 --max_iterations 500 --headless
94+
python scripts/reinforcement_learning/skrl/train.py --task Isaac-Humanoid-v0 --max_iterations 500 --headless
95+
python scripts/reinforcement_learning/rsl_rl/train.py --task Isaac-Humanoid-v0 --max_iterations 500 --headless
96+
python scripts/reinforcement_learning/sb3/train.py --task Isaac-Humanoid-v0 --max_iterations 500 --headless

docs/source/overview/showroom.rst

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,30 @@ A few quick showroom scripts to run and checkout:
193193
:alt: Multiple assets managed through the same simulation handles
194194

195195

196+
- Use the RigidObjectCollection spawn and view manipulation to demonstrate bin-packing example:
197+
198+
.. tab-set::
199+
:sync-group: os
200+
201+
.. tab-item:: :icon:`fa-brands fa-linux` Linux
202+
:sync: linux
203+
204+
.. code:: bash
205+
206+
./isaaclab.sh -p scripts/demos/bin_packing.py
207+
208+
.. tab-item:: :icon:`fa-brands fa-windows` Windows
209+
:sync: windows
210+
211+
.. code:: batch
212+
213+
isaaclab.bat -p scripts\demos\bin_packing.py
214+
215+
.. image:: ../_static/demos/bin_packing.jpg
216+
:width: 100%
217+
:alt: Spawning random number of random asset per env_id using combination of MultiAssetSpawner and RigidObjectCollection
218+
219+
196220

197221
- Use the interactive scene and spawn a simple parallel robot for pick and place:
198222

scripts/benchmarks/benchmark_cameras.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,11 +245,10 @@
245245
import time
246246
import torch
247247

248-
import isaacsim.core.utils.prims as prim_utils
249248
import psutil
250-
from isaacsim.core.utils.stage import create_new_stage
251249

252250
import isaaclab.sim as sim_utils
251+
import isaaclab.sim.utils.prims as prim_utils
253252
from isaaclab.assets import RigidObject, RigidObjectCfg
254253
from isaaclab.scene.interactive_scene import InteractiveScene
255254
from isaaclab.sensors import (
@@ -261,6 +260,7 @@
261260
TiledCameraCfg,
262261
patterns,
263262
)
263+
from isaaclab.sim.utils.stage import create_new_stage
264264
from isaaclab.utils.math import orthogonalize_perspective_depth, unproject_depth
265265

266266
from isaaclab_tasks.utils import load_cfg_from_registry

scripts/demos/arms.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@
3535
import numpy as np
3636
import torch
3737

38-
import isaacsim.core.utils.prims as prim_utils
39-
4038
import isaaclab.sim as sim_utils
39+
import isaaclab.sim.utils.prims as prim_utils
4140
from isaaclab.assets import Articulation
4241
from isaaclab.utils.assets import ISAAC_NUCLEUS_DIR
4342

0 commit comments

Comments
 (0)