Skip to content

Commit c5b3004

Browse files
committed
Remove deprecated omni.log
1 parent 4b16fbd commit c5b3004

5 files changed

Lines changed: 36 additions & 27 deletions

File tree

isaaclab_arena/scripts/imitation_learning/generate_dataset.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@
7070
import asyncio
7171
import gymnasium as gym
7272
import inspect
73+
import logging
7374
import numpy as np
7475
import os
7576
import random
7677
import torch
7778

7879
import isaaclab_mimic.envs # noqa: F401
79-
import omni
8080
from isaaclab.envs import ManagerBasedRLMimicEnv
8181
from isaaclab.envs.mdp.recorders.recorders_cfg import ActionStateRecorderManagerCfg
8282
from isaaclab.managers import DatasetExportMode, RecorderTerm, RecorderTermCfg
@@ -91,6 +91,8 @@
9191
from isaaclab_mimic.datagen.generation import env_loop, setup_async_generation
9292
from isaaclab_mimic.datagen.utils import setup_output_paths
9393

94+
logger = logging.getLogger(__name__)
95+
9496

9597
class PreStepFlatCameraObservationsRecorder(RecorderTerm):
9698
"""Recorder term that records the camera observations in each step."""
@@ -199,7 +201,7 @@ def main():
199201

200202
# check if the mimic API from this environment contains decprecated signatures
201203
if "action_noise_dict" not in inspect.signature(env.target_eef_pose_to_action).parameters:
202-
omni.log.warn(
204+
logger.warning(
203205
f'The "noise" parameter in the "{env_name}" environment\'s mimic API "target_eef_pose_to_action", '
204206
"is deprecated. Please update the API to take action_noise_dict instead."
205207
)

isaaclab_arena/scripts/imitation_learning/record_demos.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,19 @@
8686

8787
# Third-party imports
8888
import gymnasium as gym
89+
import logging
8990
import os
9091
import time
9192
import torch
9293

9394
import isaaclab_mimic.envs # noqa: F401
9495

95-
# Omniverse logger
96-
import omni.log
9796
import omni.ui as ui
9897
from isaaclab.devices import Se3Keyboard, Se3KeyboardCfg, Se3SpaceMouse, Se3SpaceMouseCfg
9998
from isaaclab.devices.openxr import remove_camera_configs
10099
from isaaclab.devices.teleop_device_factory import create_teleop_device
100+
101+
logger = logging.getLogger(__name__)
101102
from isaaclab_mimic.ui.instruction_display import InstructionDisplay, show_subtask_instructions
102103

103104
# Imports have to follow simulation startup.
@@ -196,7 +197,7 @@ def create_environment_config(
196197
env_name, env_cfg = arena_builder.build_registered()
197198

198199
except Exception as e:
199-
omni.log.error(f"Failed to parse environment configuration: {e}")
200+
logger.error(f"Failed to parse environment configuration: {e}")
200201
exit(1)
201202

202203
# extract success checking function to invoke in the main loop
@@ -205,7 +206,7 @@ def create_environment_config(
205206
success_term = env_cfg.terminations.success
206207
env_cfg.terminations.success = None
207208
else:
208-
omni.log.warn(
209+
logger.warning(
209210
"No success termination term was found in the environment."
210211
" Will not be able to mark recorded demos as successful."
211212
)
@@ -246,7 +247,7 @@ def create_environment(env_cfg: ManagerBasedRLEnvCfg | DirectRLEnvCfg, env_name:
246247
env = gym.make(env_name, cfg=env_cfg).unwrapped
247248
return env
248249
except Exception as e:
249-
omni.log.error(f"Failed to create environment: {e}")
250+
logger.error(f"Failed to create environment: {e}")
250251
exit(1)
251252

252253

@@ -271,26 +272,26 @@ def setup_teleop_device(callbacks: dict[str, Callable]) -> object:
271272
if hasattr(env_cfg, "teleop_devices") and args_cli.teleop_device in env_cfg.teleop_devices.devices:
272273
teleop_interface = create_teleop_device(args_cli.teleop_device, env_cfg.teleop_devices.devices, callbacks)
273274
else:
274-
omni.log.warn(f"No teleop device '{args_cli.teleop_device}' found in environment config. Creating default.")
275+
logger.warning(f"No teleop device '{args_cli.teleop_device}' found in environment config. Creating default.")
275276
# Create fallback teleop device
276277
if args_cli.teleop_device.lower() == "keyboard":
277278
teleop_interface = Se3Keyboard(Se3KeyboardCfg(pos_sensitivity=0.2, rot_sensitivity=0.5))
278279
elif args_cli.teleop_device.lower() == "spacemouse":
279280
teleop_interface = Se3SpaceMouse(Se3SpaceMouseCfg(pos_sensitivity=0.2, rot_sensitivity=0.5))
280281
else:
281-
omni.log.error(f"Unsupported teleop device: {args_cli.teleop_device}")
282-
omni.log.error("Supported devices: keyboard, spacemouse, avp_handtracking")
282+
logger.error(f"Unsupported teleop device: {args_cli.teleop_device}")
283+
logger.error("Supported devices: keyboard, spacemouse, avp_handtracking")
283284
exit(1)
284285

285286
# Add callbacks to fallback device
286287
for key, callback in callbacks.items():
287288
teleop_interface.add_callback(key, callback)
288289
except Exception as e:
289-
omni.log.error(f"Failed to create teleop device: {e}")
290+
logger.error(f"Failed to create teleop device: {e}")
290291
exit(1)
291292

292293
if teleop_interface is None:
293-
omni.log.error("Failed to create teleop interface")
294+
logger.error("Failed to create teleop interface")
294295
exit(1)
295296

296297
return teleop_interface

isaaclab_arena/scripts/imitation_learning/teleop.py

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@
5757
"""Rest everything follows."""
5858

5959

60+
import logging
6061
import torch
6162

6263
import isaaclab_tasks # noqa: F401
63-
import omni.log
6464
from isaaclab.devices import Se3Gamepad, Se3GamepadCfg, Se3Keyboard, Se3KeyboardCfg, Se3SpaceMouse, Se3SpaceMouseCfg
6565
from isaaclab.devices.openxr import remove_camera_configs
6666
from isaaclab.devices.teleop_device_factory import create_teleop_device
@@ -70,6 +70,8 @@
7070
if args_cli.enable_pinocchio:
7171
import isaaclab_tasks.manager_based.manipulation.pick_place # noqa: F401
7272

73+
logger = logging.getLogger(__name__)
74+
7375

7476
def main() -> None:
7577
"""
@@ -103,12 +105,12 @@ def main() -> None:
103105
env = gym.make(env_name, cfg=env_cfg).unwrapped
104106
# check environment name (for reach , we don't allow the gripper)
105107
if "Reach" in args_cli.task:
106-
omni.log.warn(
108+
logger.warning(
107109
f"The environment '{args_cli.task}' does not support gripper control. The device command will be"
108110
" ignored."
109111
)
110112
except Exception as e:
111-
omni.log.error(f"Failed to create environment: {e}")
113+
logger.error(f"Failed to create environment: {e}")
112114
simulation_app.close()
113115
return
114116

@@ -180,7 +182,7 @@ def stop_teleoperation() -> None:
180182
args_cli.teleop_device, env_cfg.teleop_devices.devices, teleoperation_callbacks
181183
)
182184
else:
183-
omni.log.warn(f"No teleop device '{args_cli.teleop_device}' found in environment config. Creating default.")
185+
logger.warning(f"No teleop device '{args_cli.teleop_device}' found in environment config. Creating default.")
184186
# Create fallback teleop device
185187
sensitivity = args_cli.sensitivity
186188
if args_cli.teleop_device.lower() == "keyboard":
@@ -196,8 +198,8 @@ def stop_teleoperation() -> None:
196198
Se3GamepadCfg(pos_sensitivity=0.1 * sensitivity, rot_sensitivity=0.1 * sensitivity)
197199
)
198200
else:
199-
omni.log.error(f"Unsupported teleop device: {args_cli.teleop_device}")
200-
omni.log.error("Supported devices: keyboard, spacemouse, gamepad, avp_handtracking")
201+
logger.error(f"Unsupported teleop device: {args_cli.teleop_device}")
202+
logger.error("Supported devices: keyboard, spacemouse, gamepad, avp_handtracking")
201203
env.close()
202204
simulation_app.close()
203205
return
@@ -207,15 +209,15 @@ def stop_teleoperation() -> None:
207209
try:
208210
teleop_interface.add_callback(key, callback)
209211
except (ValueError, TypeError) as e:
210-
omni.log.warn(f"Failed to add callback for key {key}: {e}")
212+
logger.warning(f"Failed to add callback for key {key}: {e}")
211213
except Exception as e:
212-
omni.log.error(f"Failed to create teleop device: {e}")
214+
logger.error(f"Failed to create teleop device: {e}")
213215
env.close()
214216
simulation_app.close()
215217
return
216218

217219
if teleop_interface is None:
218-
omni.log.error("Failed to create teleop interface")
220+
logger.error("Failed to create teleop interface")
219221
env.close()
220222
simulation_app.close()
221223
return
@@ -250,7 +252,7 @@ def stop_teleoperation() -> None:
250252
should_reset_recording_instance = False
251253
print("Environment reset complete")
252254
except Exception as e:
253-
omni.log.error(f"Error during simulation step: {e}")
255+
logger.error(f"Error during simulation step: {e}")
254256
break
255257

256258
# close the simulator

isaaclab_arena/scripts/reinforcement_learning/play.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@
5353
"""Rest everything follows."""
5454

5555
import gymnasium as gym
56+
import logging
5657
import os
5758
import time
5859
import torch
5960

6061
import isaaclab_tasks # noqa: F401
61-
import omni.log
6262
from isaaclab.envs import DirectMARLEnv, multi_agent_to_single_agent
6363
from isaaclab.utils.assets import retrieve_file_path
6464
from isaaclab.utils.dict import print_dict
@@ -71,6 +71,8 @@
7171

7272
# PLACEHOLDER: Extension template (do not remove this comment)
7373

74+
logger = logging.getLogger(__name__)
75+
7476

7577
def main():
7678
"""Play with RSL-RL agent."""
@@ -81,7 +83,7 @@ def main():
8183
env_name, env_cfg = arena_builder.build_registered()
8284

8385
except Exception as e:
84-
omni.log.error(f"Failed to parse environment configuration: {e}")
86+
logger.error(f"Failed to parse environment configuration: {e}")
8587
exit(1)
8688

8789
agent_cfg = get_agent_cfg(args_cli)

isaaclab_arena/scripts/reinforcement_learning/train.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@
8484
"""Rest everything follows."""
8585

8686
import gymnasium as gym
87+
import logging
8788
import os
8889
import torch
8990
from datetime import datetime
9091

9192
import isaaclab_tasks # noqa: F401
92-
import omni.log
9393
from isaaclab.envs import DirectMARLEnv, ManagerBasedRLEnvCfg, multi_agent_to_single_agent
9494
from isaaclab.utils.dict import print_dict
9595
from isaaclab.utils.io import dump_yaml
@@ -102,6 +102,8 @@
102102

103103
# PLACEHOLDER: Extension template (do not remove this comment)
104104

105+
logger = logging.getLogger(__name__)
106+
105107
torch.backends.cuda.matmul.allow_tf32 = True
106108
torch.backends.cudnn.allow_tf32 = True
107109
torch.backends.cudnn.deterministic = False
@@ -116,7 +118,7 @@ def main():
116118
env_name, env_cfg = arena_builder.build_registered()
117119

118120
except Exception as e:
119-
omni.log.error(f"Failed to parse environment configuration: {e}")
121+
logger.error(f"Failed to parse environment configuration: {e}")
120122
exit(1)
121123

122124
agent_cfg = get_agent_cfg(args_cli)
@@ -158,7 +160,7 @@ def main():
158160
if isinstance(env_cfg, ManagerBasedRLEnvCfg):
159161
env_cfg.export_io_descriptors = args_cli.export_io_descriptors
160162
else:
161-
omni.log.warn(
163+
logger.warning(
162164
"IO descriptors are only supported for manager based RL environments. No IO descriptors will be exported."
163165
)
164166

0 commit comments

Comments
 (0)