Skip to content

Commit bb93c53

Browse files
committed
Merge remote-tracking branch 'upstream/main' into main
2 parents 9edf76d + 91f53e2 commit bb93c53

File tree

232 files changed

+7079
-1546
lines changed

Some content is hidden

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

232 files changed

+7079
-1546
lines changed

.vscode/tools/launch.template.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
"type": "python",
2424
"request": "launch",
2525
"args" : ["--task", "Isaac-Reach-Franka-v0", "--headless"],
26-
"program": "${workspaceFolder}/source/standalone/workflows/rsl_rl/train.py",
26+
"program": "${workspaceFolder}/scripts/reinforcement_learning/rsl_rl/train.py",
2727
"console": "integratedTerminal"
2828
},
2929
{
3030
"name": "Python: Play Environment",
3131
"type": "python",
3232
"request": "launch",
3333
"args" : ["--task", "Isaac-Reach-Franka-v0", "--num_envs", "32"],
34-
"program": "${workspaceFolder}/source/standalone/workflows/rsl_rl/play.py",
34+
"program": "${workspaceFolder}/scripts/reinforcement_learning/rsl_rl/play.py",
3535
"console": "integratedTerminal"
3636
}
3737
]

.vscode/tools/settings.template.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@
5555
"arange",
5656
"discretization",
5757
"trimesh",
58-
"uninstanceable"
58+
"uninstanceable",
59+
"coeff",
60+
"prestartup"
5961
],
6062
// This enables python language server. Seems to work slightly better than jedi:
6163
"python.languageServer": "Pylance",

CONTRIBUTORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ Guidelines for modifications:
5555
* Haoran Zhou
5656
* HoJin Jeon
5757
* Hongwei Xiong
58+
* Hongyu Li
5859
* Iretiayo Akinola
5960
* Jack Zeng
6061
* Jan Kerner

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.1
1+
2.0.2

apps/isaaclab.python.headless.kit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[package]
66
title = "Isaac Lab Python Headless"
77
description = "An app for running Isaac Lab headlessly"
8-
version = "2.0.1"
8+
version = "2.0.2"
99

1010
# That makes it browsable in UI with "experience" filter
1111
keywords = ["experience", "app", "isaaclab", "python", "headless"]

apps/isaaclab.python.headless.rendering.kit

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[package]
1010
title = "Isaac Lab Python Headless Camera"
1111
description = "An app for running Isaac Lab headlessly with rendering enabled"
12-
version = "2.0.1"
12+
version = "2.0.2"
1313

1414
# That makes it browsable in UI with "experience" filter
1515
keywords = ["experience", "app", "isaaclab", "python", "camera", "minimal"]
@@ -47,26 +47,11 @@ rtx.translucency.enabled = false
4747
rtx.reflections.enabled = false
4848
rtx.indirectDiffuse.enabled = false
4949
rtx-transient.dlssg.enabled = false
50+
rtx.directLighting.sampledLighting.enabled = true
51+
rtx.directLighting.sampledLighting.samplesPerPixel = 1
5052
rtx.sceneDb.ambientLightIntensity = 1.0
5153
# rtx.shadows.enabled = false
5254

53-
# Optimized denoiser flags for better rendering performance
54-
rtx-transient.dldenoiser.enabled = false
55-
rtx.indirectDiffuse.denoiser.enabled = false
56-
rtx.directLighting.sampledLighting.denoisingTechnique = 0
57-
rtx.reflections.denoiser.enabled = false
58-
59-
# this approximate dome lighting, almost like an ambient light
60-
# for better lighting, enable ambient occlusion at a small cost
61-
rtx.domeLight.upperLowerStrategy=4
62-
rtx.directLighting.sampledLighting.enabled = false
63-
rtx.ambientOcclusion.enabled = false
64-
rtx.ambientOcclusion.denoiserMode = 0
65-
rtx.raytracing.subpixel.mode=1
66-
rtx.raytracing.cached.enabled = false
67-
# Set the DLSS model
68-
rtx.post.dlss.execMode = 2 # can be 0 (Performance), 1 (Balanced), 2 (Quality), or 3 (Auto)
69-
7055
# Avoids replicator warning
7156
rtx.pathtracing.maxSamplesPerLaunch = 1000000
7257
# Avoids silent trimming of tiles
@@ -75,6 +60,13 @@ rtx.viewTile.limit = 1000000
7560
# Disable present thread to improve performance
7661
exts."omni.renderer.core".present.enabled=false
7762

63+
# Disabling these settings reduces renderer VRAM usage and improves rendering performance, but at some quality cost
64+
rtx.raytracing.cached.enabled = false
65+
rtx.ambientOcclusion.enabled = false
66+
67+
# Set the DLSS model
68+
rtx.post.dlss.execMode = 0 # can be 0 (Performance), 1 (Balanced), 2 (Quality), or 3 (Auto)
69+
7870
# Avoids unnecessary GPU context initialization
7971
renderer.multiGpu.maxGpuCount=1
8072

apps/isaaclab.python.kit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[package]
66
title = "Isaac Lab Python"
77
description = "An app for running Isaac Lab"
8-
version = "2.0.1"
8+
version = "2.0.2"
99

1010
# That makes it browsable in UI with "experience" filter
1111
keywords = ["experience", "app", "usd"]

apps/isaaclab.python.rendering.kit

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[package]
1010
title = "Isaac Lab Python Camera"
1111
description = "An app for running Isaac Lab with rendering enabled"
12-
version = "2.0.1"
12+
version = "2.0.2"
1313

1414
# That makes it browsable in UI with "experience" filter
1515
keywords = ["experience", "app", "isaaclab", "python", "camera", "minimal"]
@@ -48,26 +48,11 @@ rtx.translucency.enabled = false
4848
rtx.reflections.enabled = false
4949
rtx.indirectDiffuse.enabled = false
5050
rtx-transient.dlssg.enabled = false
51+
rtx.directLighting.sampledLighting.enabled = true
52+
rtx.directLighting.sampledLighting.samplesPerPixel = 1
5153
rtx.sceneDb.ambientLightIntensity = 1.0
5254
# rtx.shadows.enabled = false
5355

54-
# Optimized denoiser flags for better rendering performance
55-
rtx-transient.dldenoiser.enabled = false
56-
rtx.indirectDiffuse.denoiser.enabled = false
57-
rtx.directLighting.sampledLighting.denoisingTechnique = 0
58-
rtx.reflections.denoiser.enabled = false
59-
60-
# this approximate dome lighting, almost like an ambient light
61-
# for better lighting, enable ambient occlusion at a small cost
62-
rtx.domeLight.upperLowerStrategy=4
63-
rtx.directLighting.sampledLighting.enabled = false
64-
rtx.ambientOcclusion.enabled = false
65-
rtx.ambientOcclusion.denoiserMode = 0
66-
rtx.raytracing.subpixel.mode=1
67-
rtx.raytracing.cached.enabled = false
68-
# Set the DLSS model
69-
rtx.post.dlss.execMode = 2 # can be 0 (Performance), 1 (Balanced), 2 (Quality), or 3 (Auto)
70-
7156
# Avoids replicator warning
7257
rtx.pathtracing.maxSamplesPerLaunch = 1000000
7358
# Avoids silent trimming of tiles
@@ -76,6 +61,13 @@ rtx.viewTile.limit = 1000000
7661
# Disable present thread to improve performance
7762
exts."omni.renderer.core".present.enabled=false
7863

64+
# Disabling these settings reduces renderer VRAM usage and improves rendering performance, but at some quality cost
65+
rtx.raytracing.cached.enabled = false
66+
rtx.ambientOcclusion.enabled = false
67+
68+
# Set the DLSS model
69+
rtx.post.dlss.execMode = 0 # can be 0 (Performance), 1 (Balanced), 2 (Quality), or 3 (Auto)
70+
7971
# Avoids unnecessary GPU context initialization
8072
renderer.multiGpu.maxGpuCount=1
8173

apps/isaaclab.python.xr.openxr.kit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[package]
66
title = "Isaac Lab Python OpenXR"
77
description = "An app for running Isaac Lab with OpenXR"
8-
version = "2.0.1"
8+
version = "2.0.2"
99

1010
# That makes it browsable in UI with "experience" filter
1111
keywords = ["experience", "app", "usd"]

docs/conf.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
sys.path.insert(0, os.path.abspath("../source/isaaclab_rl/isaaclab_rl"))
2727
sys.path.insert(0, os.path.abspath("../source/isaaclab_mimic"))
2828
sys.path.insert(0, os.path.abspath("../source/isaaclab_mimic/isaaclab_mimic"))
29+
sys.path.insert(0, os.path.abspath("../source/isaaclab_assets"))
30+
sys.path.insert(0, os.path.abspath("../source/isaaclab_assets/isaaclab_assets"))
2931

3032
# -- Project information -----------------------------------------------------
3133

@@ -127,6 +129,7 @@
127129
# Mock out modules that are not available on RTD
128130
autodoc_mock_imports = [
129131
"torch",
132+
"torchvision",
130133
"numpy",
131134
"matplotlib",
132135
"scipy",

0 commit comments

Comments
 (0)