Skip to content

Commit 94ce315

Browse files
committed
Final cleanup
1 parent aef645e commit 94ce315

18 files changed

Lines changed: 214 additions & 852 deletions

source/isaaclab_experimental/isaaclab_experimental/envs/MANAGER_BASED_WARP_MIGRATION_PLAN.md

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

source/isaaclab_experimental/isaaclab_experimental/envs/manager_based_env_warp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,7 @@ def _reset_idx(self, env_ids: Sequence[int]):
919919
info = self.observation_manager.reset(env_mask=env_mask)
920920
self.extras["log"].update(info)
921921
# -- action manager
922-
info = self.action_manager.reset(mask=env_mask)
922+
info = self.action_manager.reset(env_mask=env_mask)
923923
self.extras["log"].update(info)
924924
# -- event manager
925925
info = self.event_manager.reset(env_mask=env_mask)

source/isaaclab_experimental/isaaclab_experimental/envs/manager_based_rl_env_warp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -636,12 +636,12 @@ def _reset_idx(
636636
action_info = self._manager_call_switch.call_stage(
637637
stage="ActionManager_reset",
638638
stable_calls=[{"fn": self.action_manager.reset, "kwargs": {"env_ids": env_ids}}],
639-
warp_calls=[{"fn": self.action_manager.reset, "kwargs": {"mask": env_mask}}],
639+
warp_calls=[{"fn": self.action_manager.reset, "kwargs": {"env_mask": env_mask}}],
640640
)
641641
reward_info = self._manager_call_switch.call_stage(
642642
stage="RewardManager_reset",
643643
stable_calls=[{"fn": self.reward_manager.reset, "kwargs": {"env_ids": env_ids}}],
644-
warp_calls=[{"fn": self.reward_manager.reset, "kwargs": {"mask": env_mask}}],
644+
warp_calls=[{"fn": self.reward_manager.reset, "kwargs": {"env_mask": env_mask}}],
645645
)
646646
if self._manager_call_switch.get_mode_for_manager("ObservationManager") == ManagerCallMode.WARP_CAPTURED:
647647
obs_info = {}

source/isaaclab_experimental/isaaclab_experimental/envs/mdp/actions/joint_actions.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ def __init__(self, cfg: actions_cfg.JointActionCfg, env: ManagerBasedEnv) -> Non
148148

149149
# parse offset
150150
if isinstance(cfg.offset, (float, int)):
151-
self._offset = wp.array([float(cfg.offset)], dtype=wp.float32, device=self.device)
151+
self._offset = wp.array([float(cfg.offset)] * self.action_dim, dtype=wp.float32, device=self.device)
152152
elif isinstance(cfg.offset, dict):
153153
offset_per_joint = [0.0] * self.action_dim
154154
# resolve the dictionary config
@@ -253,15 +253,15 @@ def process_actions(self, actions: wp.array, action_offset: int = 0):
253253
device=self.device,
254254
)
255255

256-
def reset(self, mask: wp.array | None = None) -> None:
256+
def reset(self, env_mask: wp.array | None = None) -> None:
257257
"""Resets the action term (mask-based)."""
258-
if mask is None:
258+
if env_mask is None:
259259
self._raw_actions.fill_(0.0)
260260
return
261261
wp.launch(
262262
kernel=_zero_masked_2d,
263263
dim=(self.num_envs, self.action_dim),
264-
inputs=[mask, self._raw_actions],
264+
inputs=[env_mask, self._raw_actions],
265265
device=self.device,
266266
)
267267

0 commit comments

Comments
 (0)