Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/isaaclab/isaaclab/assets/asset_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
import omni.kit.app
import omni.timeline
from isaacsim.core.simulation_manager import IsaacEvents, SimulationManager
from isaacsim.core.utils.stage import get_current_stage

import isaaclab.sim as sim_utils
from isaaclab.sim.utils.stage import get_current_stage

if TYPE_CHECKING:
from .asset_base_cfg import AssetBaseCfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import omni.physics.tensors.impl.api as physx

import isaaclab.utils.math as math_utils
from isaaclab.sim.utils import get_current_stage_id
from isaaclab.sim.utils.stage import get_current_stage_id
from isaaclab.utils.buffers import TimestampedBuffer


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import omni.physics.tensors.impl.api as physx

import isaaclab.utils.math as math_utils
from isaaclab.sim.utils import get_current_stage_id
from isaaclab.sim.utils.stage import get_current_stage_id
from isaaclab.utils.buffers import TimestampedBuffer


Expand Down
2 changes: 1 addition & 1 deletion source/isaaclab/isaaclab/envs/direct_marl_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
from isaaclab.managers import EventManager
from isaaclab.scene import InteractiveScene
from isaaclab.sim import SimulationContext
from isaaclab.sim.utils import attach_stage_to_usd_context, use_stage
from isaaclab.sim.utils.stage import attach_stage_to_usd_context, use_stage
from isaaclab.utils.noise import NoiseModel
from isaaclab.utils.timer import Timer

Expand Down
2 changes: 1 addition & 1 deletion source/isaaclab/isaaclab/envs/direct_rl_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from isaaclab.managers import EventManager
from isaaclab.scene import InteractiveScene
from isaaclab.sim import SimulationContext
from isaaclab.sim.utils import attach_stage_to_usd_context, use_stage
from isaaclab.sim.utils.stage import attach_stage_to_usd_context, use_stage
from isaaclab.utils.noise import NoiseModel
from isaaclab.utils.timer import Timer

Expand Down
2 changes: 1 addition & 1 deletion source/isaaclab/isaaclab/envs/manager_based_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from isaaclab.managers import ActionManager, EventManager, ObservationManager, RecorderManager
from isaaclab.scene import InteractiveScene
from isaaclab.sim import SimulationContext
from isaaclab.sim.utils import attach_stage_to_usd_context, use_stage
from isaaclab.sim.utils.stage import attach_stage_to_usd_context, use_stage
from isaaclab.ui.widgets import ManagerLiveVisualizer
from isaaclab.utils.timer import Timer

Expand Down
2 changes: 1 addition & 1 deletion source/isaaclab/isaaclab/envs/mdp/events.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
import carb
import omni.physics.tensors.impl.api as physx
from isaacsim.core.utils.extensions import enable_extension
from isaacsim.core.utils.stage import get_current_stage
from pxr import Gf, Sdf, UsdGeom, Vt

import isaaclab.sim as sim_utils
import isaaclab.utils.math as math_utils
from isaaclab.actuators import ImplicitActuator
from isaaclab.assets import Articulation, DeformableObject, RigidObject
from isaaclab.managers import EventTermCfg, ManagerTermBase, SceneEntityCfg
from isaaclab.sim.utils.stage import get_current_stage
from isaaclab.terrains import TerrainImporter
from isaaclab.utils.version import compare_versions

Expand Down
2 changes: 1 addition & 1 deletion source/isaaclab/isaaclab/envs/ui/base_env_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
import omni.kit.app
import omni.kit.commands
import omni.usd
from isaacsim.core.utils.stage import get_current_stage
from pxr import PhysxSchema, Sdf, Usd, UsdGeom, UsdPhysics

from isaaclab.sim.utils.stage import get_current_stage
from isaaclab.ui.widgets import ManagerLiveVisualizer

if TYPE_CHECKING:
Expand Down
8 changes: 3 additions & 5 deletions source/isaaclab/isaaclab/markers/visualization_markers.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,14 @@
import torch
from dataclasses import MISSING

import isaacsim.core.utils.stage as stage_utils
import omni.kit.commands
import omni.log
import omni.physx.scripts.utils as physx_utils
from isaacsim.core.utils.stage import get_current_stage
from pxr import Gf, PhysxSchema, Sdf, Usd, UsdGeom, UsdPhysics, Vt

import isaaclab.sim as sim_utils
import isaaclab.sim.utils.stage as stage_utils
from isaaclab.sim.spawners import SpawnerCfg
from isaaclab.sim.utils import attach_stage_to_usd_context
from isaaclab.utils.configclass import configclass
from isaaclab.utils.math import convert_quat

Expand Down Expand Up @@ -148,7 +146,7 @@ def __init__(self, cfg: VisualizationMarkersCfg):
# get next free path for the prim
prim_path = stage_utils.get_next_free_path(cfg.prim_path)
# create a new prim
self.stage = get_current_stage()
self.stage = stage_utils.get_current_stage()
self._instancer_manager = UsdGeom.PointInstancer.Define(self.stage, prim_path)
# store inputs
self.prim_path = prim_path
Expand Down Expand Up @@ -398,7 +396,7 @@ def _process_prototype_prim(self, prim: Usd.Prim):
if child_prim.IsA(UsdGeom.Gprim):
# early attach stage to usd context if stage is in memory
# since stage in memory is not supported by the "ChangePropertyCommand" kit command
attach_stage_to_usd_context(attaching_early=True)
stage_utils.attach_stage_to_usd_context(attaching_early=True)

# invisible to secondary rays such as depth images
omni.kit.commands.execute(
Expand Down
3 changes: 1 addition & 2 deletions source/isaaclab/isaaclab/scene/interactive_scene.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import omni.usd
from isaacsim.core.cloner import GridCloner
from isaacsim.core.prims import XFormPrim
from isaacsim.core.utils.stage import get_current_stage
from isaacsim.core.version import get_version
from pxr import PhysxSchema

Expand All @@ -32,7 +31,7 @@
)
from isaaclab.sensors import ContactSensorCfg, FrameTransformerCfg, SensorBase, SensorBaseCfg
from isaaclab.sim import SimulationContext
from isaaclab.sim.utils import get_current_stage_id
from isaaclab.sim.utils.stage import get_current_stage, get_current_stage_id
from isaaclab.terrains import TerrainImporter, TerrainImporterCfg

from .interactive_scene_cfg import InteractiveSceneCfg
Expand Down
2 changes: 1 addition & 1 deletion source/isaaclab/isaaclab/sensors/camera/camera.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
from typing import TYPE_CHECKING, Any, Literal

import carb
import isaacsim.core.utils.stage as stage_utils
import omni.kit.commands
import omni.usd
from isaacsim.core.prims import XFormPrim
from isaacsim.core.version import get_version
from pxr import Sdf, UsdGeom

import isaaclab.sim as sim_utils
import isaaclab.sim.utils.stage as stage_utils
import isaaclab.utils.sensors as sensor_utils
from isaaclab.utils import to_camel_case
from isaaclab.utils.array import convert_to_torch
Expand Down
2 changes: 1 addition & 1 deletion source/isaaclab/isaaclab/sensors/imu/imu.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
from collections.abc import Sequence
from typing import TYPE_CHECKING

import isaacsim.core.utils.stage as stage_utils
from isaacsim.core.simulation_manager import SimulationManager
from pxr import UsdPhysics

import isaaclab.sim as sim_utils
import isaaclab.sim.utils.stage as stage_utils
import isaaclab.utils.math as math_utils
from isaaclab.markers import VisualizationMarkers

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
from collections.abc import Sequence
from typing import TYPE_CHECKING, ClassVar, Literal

import isaacsim.core.utils.stage as stage_utils
import omni.physics.tensors.impl.api as physx
from isaacsim.core.prims import XFormPrim

import isaaclab.sim.utils.stage as stage_utils
import isaaclab.utils.math as math_utils
from isaaclab.sensors.camera import CameraData
from isaaclab.utils.warp import raycast_mesh
Expand Down
2 changes: 1 addition & 1 deletion source/isaaclab/isaaclab/sensors/sensor_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
import omni.kit.app
import omni.timeline
from isaacsim.core.simulation_manager import IsaacEvents, SimulationManager
from isaacsim.core.utils.stage import get_current_stage

import isaaclab.sim as sim_utils
from isaaclab.sim.utils.stage import get_current_stage

if TYPE_CHECKING:
from .sensor_base_cfg import SensorBaseCfg
Expand Down
3 changes: 2 additions & 1 deletion source/isaaclab/isaaclab/sim/schemas/schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@

import omni.log
import omni.physx.scripts.utils as physx_utils
from isaacsim.core.utils.stage import get_current_stage
from omni.physx.scripts import deformableUtils as deformable_utils
from pxr import PhysxSchema, Usd, UsdPhysics

from isaaclab.sim.utils.stage import get_current_stage

from ..utils import (
apply_nested,
find_global_fixed_joint_prim,
Expand Down
7 changes: 3 additions & 4 deletions source/isaaclab/isaaclab/sim/simulation_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

import carb
import flatdict
import isaacsim.core.utils.stage as stage_utils
import omni.log
import omni.physx
import omni.usd
Expand All @@ -32,7 +31,7 @@
from isaacsim.core.version import get_version
from pxr import Gf, PhysxSchema, Sdf, Usd, UsdPhysics

from isaaclab.sim.utils import create_new_stage_in_memory, use_stage
import isaaclab.sim.utils.stage as stage_utils

from .simulation_cfg import SimulationCfg
from .spawners import DomeLightCfg, GroundPlaneCfg
Expand Down Expand Up @@ -134,7 +133,7 @@ def __init__(self, cfg: SimulationCfg | None = None):

# create stage in memory if requested
if self.cfg.create_stage_in_memory:
self._initial_stage = create_new_stage_in_memory()
self._initial_stage = stage_utils.create_new_stage_in_memory()
else:
self._initial_stage = omni.usd.get_context().get_stage()

Expand Down Expand Up @@ -613,7 +612,7 @@ async def reset_async(self, soft: bool = False):

def _init_stage(self, *args, **kwargs) -> Usd.Stage:
_ = super()._init_stage(*args, **kwargs)
with use_stage(self.get_initial_stage()):
with stage_utils.use_stage(self.get_initial_stage()):
# a stage update here is needed for the case when physics_dt != rendering_dt, otherwise the app crashes
# when in headless mode
self.set_setting("/app/player/playSimulations", False)
Expand Down
11 changes: 2 additions & 9 deletions source/isaaclab/isaaclab/sim/spawners/from_files/from_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,9 @@
except ModuleNotFoundError:
from pxr import Semantics

from isaacsim.core.utils.stage import get_current_stage

from isaaclab.sim import converters, schemas
from isaaclab.sim.utils import (
bind_physics_material,
bind_visual_material,
clone,
is_current_stage_in_memory,
select_usd_variants,
)
from isaaclab.sim.utils import bind_physics_material, bind_visual_material, clone, select_usd_variants
from isaaclab.sim.utils.stage import get_current_stage, is_current_stage_in_memory
from isaaclab.utils.assets import check_usd_path_with_timeout

if TYPE_CHECKING:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
from typing import TYPE_CHECKING

import isaacsim.core.utils.prims as prim_utils
from isaacsim.core.utils.stage import get_current_stage
from pxr import PhysxSchema, Usd, UsdPhysics, UsdShade

from isaaclab.sim.utils import clone, safe_set_attribute_on_usd_schema
from isaaclab.sim.utils.stage import get_current_stage

if TYPE_CHECKING:
from . import physics_materials_cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import omni.log
from pxr import Usd

from isaaclab.sim.utils import attach_stage_to_usd_context, clone, safe_set_attribute_on_usd_prim
from isaaclab.sim.utils.stage import attach_stage_to_usd_context, clone, safe_set_attribute_on_usd_prim
from isaaclab.utils.assets import NVIDIA_NUCLEUS_DIR

if TYPE_CHECKING:
Expand Down
3 changes: 2 additions & 1 deletion source/isaaclab/isaaclab/sim/spawners/sensors/sensors.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
import omni.log
from pxr import Sdf, Usd

from isaaclab.sim.utils import attach_stage_to_usd_context, clone
from isaaclab.sim.utils import clone
from isaaclab.sim.utils.stage import attach_stage_to_usd_context
from isaaclab.utils import to_camel_case

if TYPE_CHECKING:
Expand Down
5 changes: 2 additions & 3 deletions source/isaaclab/isaaclab/sim/spawners/wrappers/wrappers.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@

import carb
import isaacsim.core.utils.prims as prim_utils
import isaacsim.core.utils.stage as stage_utils
from isaacsim.core.utils.stage import get_current_stage
from pxr import Sdf, Usd

import isaaclab.sim as sim_utils
import isaaclab.sim.utils.stage as stage_utils
from isaaclab.sim.spawners.from_files import UsdFileCfg

if TYPE_CHECKING:
Expand Down Expand Up @@ -48,7 +47,7 @@ def spawn_multi_asset(
The created prim at the first prim path.
"""
# get stage handle
stage = get_current_stage()
stage = stage_utils.get_current_stage()

# resolve: {SPAWN_NS}/AssetName
# note: this assumes that the spawn namespace already exists in the stage
Expand Down
6 changes: 6 additions & 0 deletions source/isaaclab/isaaclab/sim/utils/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Copyright (c) 2022-2025, The Isaac Lab Project Developers (https://github.com/isaac-sim/IsaacLab/blob/main/CONTRIBUTORS.md).
# All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause

from .utils import * # noqa: F401, F403
Loading
Loading