From d564a2ad9e0d4345348db6bb2612f6cbb099a771 Mon Sep 17 00:00:00 2001 From: zhouhaoran Date: Fri, 29 Nov 2024 10:27:56 +0800 Subject: [PATCH 1/4] Fix setting noise_model in direct_marl_env Change-Id: If8238d7ddfbec9b8c3b2c7cfe75619bd2fe8a4d1 --- source/extensions/omni.isaac.lab/docs/CHANGELOG.rst | 9 +++++++++ .../omni/isaac/lab/envs/direct_marl_env.py | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/source/extensions/omni.isaac.lab/docs/CHANGELOG.rst b/source/extensions/omni.isaac.lab/docs/CHANGELOG.rst index 3050693e4b..b74e9ee64d 100644 --- a/source/extensions/omni.isaac.lab/docs/CHANGELOG.rst +++ b/source/extensions/omni.isaac.lab/docs/CHANGELOG.rst @@ -1,6 +1,15 @@ Changelog --------- +0.27.16 (2024-11-29) +~~~~~~~~~~~~~~~~~~~~ + +Fixed +^^^^^ + +* Fixed the order of the incoming parameters in :class:`omni.isaac.lab.envs.DirectMARLEnv` to correctly use ``NoiseModel`` in marl-envs. + + 0.27.15 (2024-11-09) ~~~~~~~~~~~~~~~~~~~~ diff --git a/source/extensions/omni.isaac.lab/omni/isaac/lab/envs/direct_marl_env.py b/source/extensions/omni.isaac.lab/omni/isaac/lab/envs/direct_marl_env.py index 70c0b3f662..c7a2afc656 100644 --- a/source/extensions/omni.isaac.lab/omni/isaac/lab/envs/direct_marl_env.py +++ b/source/extensions/omni.isaac.lab/omni/isaac/lab/envs/direct_marl_env.py @@ -175,13 +175,13 @@ def __init__(self, cfg: DirectMARLEnvCfg, render_mode: str | None = None, **kwar # setup noise cfg for adding action and observation noise if self.cfg.action_noise_model: self._action_noise_model: dict[AgentID, NoiseModel] = { - agent: noise_model.class_type(self.num_envs, noise_model, self.device) + agent: noise_model.class_type(noise_model, num_envs=self.num_envs, device=self.device) for agent, noise_model in self.cfg.action_noise_model.items() if noise_model is not None } if self.cfg.observation_noise_model: self._observation_noise_model: dict[AgentID, NoiseModel] = { - agent: noise_model.class_type(self.num_envs, noise_model, self.device) + agent: noise_model.class_type(noise_model, num_envs=self.num_envs, device=self.device) for agent, noise_model in self.cfg.observation_noise_model.items() if noise_model is not None } From 5b9b40a36b72f494b5c360075bda35a6e6027701 Mon Sep 17 00:00:00 2001 From: zhouhaoran Date: Fri, 29 Nov 2024 10:33:10 +0800 Subject: [PATCH 2/4] add name inCONTRIBUTORS Change-Id: Ic9c2d4ae77295726c59078b2547388eebf53ee31 --- CONTRIBUTORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index d7b4042e53..dc8565218b 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -33,6 +33,7 @@ Guidelines for modifications: ## Contributors +* Haoran Zhou * Alice Zhou * Amr Mousa * Andrej Orsula From 5da75f7ad2168a83ef7af046835f03f200ac768b Mon Sep 17 00:00:00 2001 From: Kelly Guo Date: Wed, 4 Dec 2024 18:08:23 -0500 Subject: [PATCH 3/4] Update extension.toml Signed-off-by: Kelly Guo --- source/extensions/omni.isaac.lab/config/extension.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/extensions/omni.isaac.lab/config/extension.toml b/source/extensions/omni.isaac.lab/config/extension.toml index 73169e308c..d02ff50fce 100644 --- a/source/extensions/omni.isaac.lab/config/extension.toml +++ b/source/extensions/omni.isaac.lab/config/extension.toml @@ -1,7 +1,7 @@ [package] # Note: Semantic Versioning is used: https://semver.org/ -version = "0.27.17" +version = "0.27.18" # Description title = "Isaac Lab framework for Robot Learning" From 9bc80a36bb2380a29166aaf52815fc749c536eb4 Mon Sep 17 00:00:00 2001 From: Kelly Guo Date: Wed, 4 Dec 2024 18:09:36 -0500 Subject: [PATCH 4/4] Update CONTRIBUTORS.md Signed-off-by: Kelly Guo --- CONTRIBUTORS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 8a4c6244a9..631d74a7eb 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -33,7 +33,6 @@ Guidelines for modifications: ## Contributors -* Haoran Zhou * Alice Zhou * Amr Mousa * Andrej Orsula @@ -48,6 +47,7 @@ Guidelines for modifications: * Felix Yu * Gary Lvov * Giulio Romualdi +* Haoran Zhou * HoJin Jeon * Jan Kerner * Jean Tampon