[v0.2.3] Hab2 fixup : merging main and resolving conflicts #1022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: vincentpierre <vincentpierre@users.noreply.github.com>
* updated md files * updated habitat2_gym_tutorial * updated Habitat2_Quickstart * updated Habitat_Lab * updated docs * partially removed YACS (note there are some inpedendent parts of code that still rely on YACS) * made all DictConfig imports to be from omegaconf using if TYPE_CHECKING * removed link to the outdated notebook * fixed tests * [Hydra Migration] Removing yacs and migratting the dataset generation code of rearrange (#1001) * removing yacs and migratting the dataset generation code of rearrange * addressing comments * typechecking corrections Co-authored-by: vincentpierre <vincentpierre@users.noreply.github.com> * renaming SensorConfig to LabSensorConfig * fixing svg link * fixing svg; * using relative path is better for svg * addressed comments * [0.2.3][Hydra Migration] Made agents to be of type Dict[str, AgentConfig] and added migration readme (#1007) * made habitat.simulator.agents be a Dict[str, AgentConfig] * addressed comments * refactored sim agents configuration * moved rearrange agents declarations to agents folder; finised agents configuration updates; updated docs * updated get_config import * Cfg sys migration readme (#2) * added habitat-lab config readme * addressed most of the comments * added main_agent alias * renamed habitat config reagme and added baselines config readme * Update habitat-lab/habitat/config/default.py Co-authored-by: Vincent-Pierre BERGES <28320361+vincentpierre@users.noreply.github.com> * added desctiption for the agents_order field * added a dot :) Co-authored-by: Vincent-Pierre BERGES <28320361+vincentpierre@users.noreply.github.com> * fixing conflicts Co-authored-by: Vincent-Pierre BERGES <28320361+vincentpierre@users.noreply.github.com> Co-authored-by: vincentpierre <vincentpierre@users.noreply.github.com>
* Fix broken links in MANIFEST.in
facebook-github-bot
added
the
CLA Signed
* Unpin habitat-lab requirements * Reorder dependencies * Fix mypy config * remove unnecessary mypy args * Update mypy version * Fix python lint * Fix pre-commit mypy further * fix mypy ignored errors * fixing mypy * fixing mypy * more accurate type:ignores * adding docs/ to exclude mypy * trying to fix python_lint * exlude arguments * exlude arguments * Container needs to be a string Co-authored-by: Aaron Gokaslan <aaronGokaslan@gmail.com> Co-authored-by: vincentpierre <vincentpierre@users.noreply.github.com>
|
May want to merge main again for the fixed mypy checks. |
|
@vincentpierre Shouldn't this PR be tagged as |
vincentpierre
changed the title
ASzot
approved these changes
Dec 3, 2022
ASzot
added a commit
that referenced
this pull request
Dec 7, 2022
* [bugfix] Reconfigure the sim even if the sim is not None * addressing comments, better way to decide wether or not to reconfigure sim_obj * same fix for the robot base * Added back caching to pick task * Fixed up nav to obj task * Fixed up open and close skills * Added back inits for nav to obj * Batched HRL policy * Updated task conditions * Fixed key mismatch in TP-SRL * Fixed issue with nav to obj skill * Fixed early stop issue * Fixed bad filter condition * Updated training configs * Refactored and cleaned up config files * Fixed up reward. Renamed configs * Added wandb resume * Refactored eval with debug sensor code. * Added get policy info * Hopefully fixed resuming, added safe drop * Added improved Fetch model * Removed refactored files * Added back default * Removed habitat folder * Fixed pick task * Fixed navigation skill * Removed redundancy in skill training configs * Addressed some comments * Removed nav pick * Update .gitignore Co-authored-by: Vincent-Pierre BERGES <28320361+vincentpierre@users.noreply.github.com> * PR comments * [v0.2.3] Hab2 fixup : merging main and resolving conflicts (#1022) * [v0.2.3] Add robot document (#1018) * [v0.2.3] [Stretch] play stretch demo (#1014) * [Fix] Documentation gym example path (#1016) Co-authored-by: vincentpierre <vincentpierre@users.noreply.github.com> * [0.2.3]Hydra migration 3 v2 (#1000) * updated md files * updated habitat2_gym_tutorial * updated Habitat2_Quickstart * updated Habitat_Lab * updated docs * partially removed YACS (note there are some inpedendent parts of code that still rely on YACS) * made all DictConfig imports to be from omegaconf using if TYPE_CHECKING * removed link to the outdated notebook * fixed tests * [Hydra Migration] Removing yacs and migratting the dataset generation code of rearrange (#1001) * removing yacs and migratting the dataset generation code of rearrange * addressing comments * typechecking corrections Co-authored-by: vincentpierre <vincentpierre@users.noreply.github.com> * renaming SensorConfig to LabSensorConfig * fixing svg link * fixing svg; * using relative path is better for svg * addressed comments * [0.2.3][Hydra Migration] Made agents to be of type Dict[str, AgentConfig] and added migration readme (#1007) * made habitat.simulator.agents be a Dict[str, AgentConfig] * addressed comments * refactored sim agents configuration * moved rearrange agents declarations to agents folder; finised agents configuration updates; updated docs * updated get_config import * Cfg sys migration readme (#2) * added habitat-lab config readme * addressed most of the comments * added main_agent alias * renamed habitat config reagme and added baselines config readme * Update habitat-lab/habitat/config/default.py Co-authored-by: Vincent-Pierre BERGES <28320361+vincentpierre@users.noreply.github.com> * added desctiption for the agents_order field * added a dot :) Co-authored-by: Vincent-Pierre BERGES <28320361+vincentpierre@users.noreply.github.com> * fixing conflicts Co-authored-by: Vincent-Pierre BERGES <28320361+vincentpierre@users.noreply.github.com> Co-authored-by: vincentpierre <vincentpierre@users.noreply.github.com> * Fix links in MANIFEST.in (#991) * Fix broken links in MANIFEST.in * fixig video_render_view * fixing issue with gym maker * editing test that changed with recent config modifications * [v0.2.3] Fixing mypy (#1023) * Unpin habitat-lab requirements * Reorder dependencies * Fix mypy config * remove unnecessary mypy args * Update mypy version * Fix python lint * Fix pre-commit mypy further * fix mypy ignored errors * fixing mypy * fixing mypy * more accurate type:ignores * adding docs/ to exclude mypy * trying to fix python_lint * exlude arguments * exlude arguments * Container needs to be a string Co-authored-by: Aaron Gokaslan <aaronGokaslan@gmail.com> Co-authored-by: vincentpierre <vincentpierre@users.noreply.github.com> * removing the gym envs keys that were removed Co-authored-by: Jimmy Yang <55121504+jimmytyyang@users.noreply.github.com> Co-authored-by: vincentpierre <vincentpierre@users.noreply.github.com> Co-authored-by: Ruslan <partsey2412@gmail.com> Co-authored-by: Mikaël Dallaire Côté <110583667+0mdc@users.noreply.github.com> Co-authored-by: Aaron Gokaslan <aaronGokaslan@gmail.com> * Merged * Removed bad file and fixed IK * Env fixes * Fixed precommit * Fixed eval and fixed wandb logging * Fix for the resume in VER and the force threshold for open tasks * Update habitat-baselines/habitat_baselines/rl/ddppo/policy/resnet_policy.py Co-authored-by: Aaron Gokaslan <skylion.aaron@gmail.com> * tp-srl fixes * tp-srl fixes * Fixed more tests * Cleaned up nav action * Added tests for all tasks in baseline trainer * Corrected test overrides * Improved agents loop in resnet_policy Improved agents loop in resnet_policy Co-authored-by: Ruslan <partsey2412@gmail.com> * Fixed policy docs and improvements. Added docs to spawn robot method. * [0.2.3] 959 PR review suggested changes (#1029) * removed habitat-baselines/habitat_baselines/config path prefix * improved adding render view uuids to the gym obs_keys * made config keys lowercase * Updated docs * Update habitat-lab/habitat/tasks/rearrange/rearrange_task.py Co-authored-by: Vincent-Pierre BERGES <28320361+vincentpierre@users.noreply.github.com> * Update habitat-baselines/habitat_baselines/rl/ddppo/policy/resnet_policy.py Co-authored-by: Aaron Gokaslan <skylion.aaron@gmail.com> * Fixed formatting * tp-srl config fix * fixing documentation ? Co-authored-by: vincentpierre <vincentpierre@users.noreply.github.com> Co-authored-by: ASzot <me@andrewszot.com> Co-authored-by: Vincent-Pierre BERGES <28320361+vincentpierre@users.noreply.github.com> Co-authored-by: Jimmy Yang <55121504+jimmytyyang@users.noreply.github.com> Co-authored-by: Ruslan <partsey2412@gmail.com> Co-authored-by: Mikaël Dallaire Côté <110583667+0mdc@users.noreply.github.com> Co-authored-by: Aaron Gokaslan <aaronGokaslan@gmail.com> Co-authored-by: Aaron Gokaslan <skylion.aaron@gmail.com> Co-authored-by: Oleksandr <maksymets.o@gmail.com> Co-authored-by: Oleksandr Maksymets <maksymets@gmail.com> Co-authored-by: SergioArnaud <sercharnaud@gmail.com>
dannymcy
pushed a commit
to dannymcy/habitat-lab
that referenced
this pull request
Jul 8, 2024
…okresearch#959) * [bugfix] Reconfigure the sim even if the sim is not None * addressing comments, better way to decide wether or not to reconfigure sim_obj * same fix for the robot base * Added back caching to pick task * Fixed up nav to obj task * Fixed up open and close skills * Added back inits for nav to obj * Batched HRL policy * Updated task conditions * Fixed key mismatch in TP-SRL * Fixed issue with nav to obj skill * Fixed early stop issue * Fixed bad filter condition * Updated training configs * Refactored and cleaned up config files * Fixed up reward. Renamed configs * Added wandb resume * Refactored eval with debug sensor code. * Added get policy info * Hopefully fixed resuming, added safe drop * Added improved Fetch model * Removed refactored files * Added back default * Removed habitat folder * Fixed pick task * Fixed navigation skill * Removed redundancy in skill training configs * Addressed some comments * Removed nav pick * Update .gitignore Co-authored-by: Vincent-Pierre BERGES <28320361+vincentpierre@users.noreply.github.com> * PR comments * [v0.2.3] Hab2 fixup : merging main and resolving conflicts (facebookresearch#1022) * [v0.2.3] Add robot document (facebookresearch#1018) * [v0.2.3] [Stretch] play stretch demo (facebookresearch#1014) * [Fix] Documentation gym example path (facebookresearch#1016) Co-authored-by: vincentpierre <vincentpierre@users.noreply.github.com> * [0.2.3]Hydra migration 3 v2 (facebookresearch#1000) * updated md files * updated habitat2_gym_tutorial * updated Habitat2_Quickstart * updated Habitat_Lab * updated docs * partially removed YACS (note there are some inpedendent parts of code that still rely on YACS) * made all DictConfig imports to be from omegaconf using if TYPE_CHECKING * removed link to the outdated notebook * fixed tests * [Hydra Migration] Removing yacs and migratting the dataset generation code of rearrange (facebookresearch#1001) * removing yacs and migratting the dataset generation code of rearrange * addressing comments * typechecking corrections Co-authored-by: vincentpierre <vincentpierre@users.noreply.github.com> * renaming SensorConfig to LabSensorConfig * fixing svg link * fixing svg; * using relative path is better for svg * addressed comments * [0.2.3][Hydra Migration] Made agents to be of type Dict[str, AgentConfig] and added migration readme (facebookresearch#1007) * made habitat.simulator.agents be a Dict[str, AgentConfig] * addressed comments * refactored sim agents configuration * moved rearrange agents declarations to agents folder; finised agents configuration updates; updated docs * updated get_config import * Cfg sys migration readme (facebookresearch#2) * added habitat-lab config readme * addressed most of the comments * added main_agent alias * renamed habitat config reagme and added baselines config readme * Update habitat-lab/habitat/config/default.py Co-authored-by: Vincent-Pierre BERGES <28320361+vincentpierre@users.noreply.github.com> * added desctiption for the agents_order field * added a dot :) Co-authored-by: Vincent-Pierre BERGES <28320361+vincentpierre@users.noreply.github.com> * fixing conflicts Co-authored-by: Vincent-Pierre BERGES <28320361+vincentpierre@users.noreply.github.com> Co-authored-by: vincentpierre <vincentpierre@users.noreply.github.com> * Fix links in MANIFEST.in (facebookresearch#991) * Fix broken links in MANIFEST.in * fixig video_render_view * fixing issue with gym maker * editing test that changed with recent config modifications * [v0.2.3] Fixing mypy (facebookresearch#1023) * Unpin habitat-lab requirements * Reorder dependencies * Fix mypy config * remove unnecessary mypy args * Update mypy version * Fix python lint * Fix pre-commit mypy further * fix mypy ignored errors * fixing mypy * fixing mypy * more accurate type:ignores * adding docs/ to exclude mypy * trying to fix python_lint * exlude arguments * exlude arguments * Container needs to be a string Co-authored-by: Aaron Gokaslan <aaronGokaslan@gmail.com> Co-authored-by: vincentpierre <vincentpierre@users.noreply.github.com> * removing the gym envs keys that were removed Co-authored-by: Jimmy Yang <55121504+jimmytyyang@users.noreply.github.com> Co-authored-by: vincentpierre <vincentpierre@users.noreply.github.com> Co-authored-by: Ruslan <partsey2412@gmail.com> Co-authored-by: Mikaël Dallaire Côté <110583667+0mdc@users.noreply.github.com> Co-authored-by: Aaron Gokaslan <aaronGokaslan@gmail.com> * Merged * Removed bad file and fixed IK * Env fixes * Fixed precommit * Fixed eval and fixed wandb logging * Fix for the resume in VER and the force threshold for open tasks * Update habitat-baselines/habitat_baselines/rl/ddppo/policy/resnet_policy.py Co-authored-by: Aaron Gokaslan <skylion.aaron@gmail.com> * tp-srl fixes * tp-srl fixes * Fixed more tests * Cleaned up nav action * Added tests for all tasks in baseline trainer * Corrected test overrides * Improved agents loop in resnet_policy Improved agents loop in resnet_policy Co-authored-by: Ruslan <partsey2412@gmail.com> * Fixed policy docs and improvements. Added docs to spawn robot method. * [0.2.3] 959 PR review suggested changes (facebookresearch#1029) * removed habitat-baselines/habitat_baselines/config path prefix * improved adding render view uuids to the gym obs_keys * made config keys lowercase * Updated docs * Update habitat-lab/habitat/tasks/rearrange/rearrange_task.py Co-authored-by: Vincent-Pierre BERGES <28320361+vincentpierre@users.noreply.github.com> * Update habitat-baselines/habitat_baselines/rl/ddppo/policy/resnet_policy.py Co-authored-by: Aaron Gokaslan <skylion.aaron@gmail.com> * Fixed formatting * tp-srl config fix * fixing documentation ? Co-authored-by: vincentpierre <vincentpierre@users.noreply.github.com> Co-authored-by: ASzot <me@andrewszot.com> Co-authored-by: Vincent-Pierre BERGES <28320361+vincentpierre@users.noreply.github.com> Co-authored-by: Jimmy Yang <55121504+jimmytyyang@users.noreply.github.com> Co-authored-by: Ruslan <partsey2412@gmail.com> Co-authored-by: Mikaël Dallaire Côté <110583667+0mdc@users.noreply.github.com> Co-authored-by: Aaron Gokaslan <aaronGokaslan@gmail.com> Co-authored-by: Aaron Gokaslan <skylion.aaron@gmail.com> Co-authored-by: Oleksandr <maksymets.o@gmail.com> Co-authored-by: Oleksandr Maksymets <maksymets@gmail.com> Co-authored-by: SergioArnaud <sercharnaud@gmail.com>
HHYHRHY
pushed a commit
to SgtVincent/EMOS
that referenced
this pull request
Aug 31, 2024
…okresearch#959) * [bugfix] Reconfigure the sim even if the sim is not None * addressing comments, better way to decide wether or not to reconfigure sim_obj * same fix for the robot base * Added back caching to pick task * Fixed up nav to obj task * Fixed up open and close skills * Added back inits for nav to obj * Batched HRL policy * Updated task conditions * Fixed key mismatch in TP-SRL * Fixed issue with nav to obj skill * Fixed early stop issue * Fixed bad filter condition * Updated training configs * Refactored and cleaned up config files * Fixed up reward. Renamed configs * Added wandb resume * Refactored eval with debug sensor code. * Added get policy info * Hopefully fixed resuming, added safe drop * Added improved Fetch model * Removed refactored files * Added back default * Removed habitat folder * Fixed pick task * Fixed navigation skill * Removed redundancy in skill training configs * Addressed some comments * Removed nav pick * Update .gitignore Co-authored-by: Vincent-Pierre BERGES <28320361+vincentpierre@users.noreply.github.com> * PR comments * [v0.2.3] Hab2 fixup : merging main and resolving conflicts (facebookresearch#1022) * [v0.2.3] Add robot document (facebookresearch#1018) * [v0.2.3] [Stretch] play stretch demo (facebookresearch#1014) * [Fix] Documentation gym example path (facebookresearch#1016) Co-authored-by: vincentpierre <vincentpierre@users.noreply.github.com> * [0.2.3]Hydra migration 3 v2 (facebookresearch#1000) * updated md files * updated habitat2_gym_tutorial * updated Habitat2_Quickstart * updated Habitat_Lab * updated docs * partially removed YACS (note there are some inpedendent parts of code that still rely on YACS) * made all DictConfig imports to be from omegaconf using if TYPE_CHECKING * removed link to the outdated notebook * fixed tests * [Hydra Migration] Removing yacs and migratting the dataset generation code of rearrange (facebookresearch#1001) * removing yacs and migratting the dataset generation code of rearrange * addressing comments * typechecking corrections Co-authored-by: vincentpierre <vincentpierre@users.noreply.github.com> * renaming SensorConfig to LabSensorConfig * fixing svg link * fixing svg; * using relative path is better for svg * addressed comments * [0.2.3][Hydra Migration] Made agents to be of type Dict[str, AgentConfig] and added migration readme (facebookresearch#1007) * made habitat.simulator.agents be a Dict[str, AgentConfig] * addressed comments * refactored sim agents configuration * moved rearrange agents declarations to agents folder; finised agents configuration updates; updated docs * updated get_config import * Cfg sys migration readme (#2) * added habitat-lab config readme * addressed most of the comments * added main_agent alias * renamed habitat config reagme and added baselines config readme * Update habitat-lab/habitat/config/default.py Co-authored-by: Vincent-Pierre BERGES <28320361+vincentpierre@users.noreply.github.com> * added desctiption for the agents_order field * added a dot :) Co-authored-by: Vincent-Pierre BERGES <28320361+vincentpierre@users.noreply.github.com> * fixing conflicts Co-authored-by: Vincent-Pierre BERGES <28320361+vincentpierre@users.noreply.github.com> Co-authored-by: vincentpierre <vincentpierre@users.noreply.github.com> * Fix links in MANIFEST.in (facebookresearch#991) * Fix broken links in MANIFEST.in * fixig video_render_view * fixing issue with gym maker * editing test that changed with recent config modifications * [v0.2.3] Fixing mypy (facebookresearch#1023) * Unpin habitat-lab requirements * Reorder dependencies * Fix mypy config * remove unnecessary mypy args * Update mypy version * Fix python lint * Fix pre-commit mypy further * fix mypy ignored errors * fixing mypy * fixing mypy * more accurate type:ignores * adding docs/ to exclude mypy * trying to fix python_lint * exlude arguments * exlude arguments * Container needs to be a string Co-authored-by: Aaron Gokaslan <aaronGokaslan@gmail.com> Co-authored-by: vincentpierre <vincentpierre@users.noreply.github.com> * removing the gym envs keys that were removed Co-authored-by: Jimmy Yang <55121504+jimmytyyang@users.noreply.github.com> Co-authored-by: vincentpierre <vincentpierre@users.noreply.github.com> Co-authored-by: Ruslan <partsey2412@gmail.com> Co-authored-by: Mikaël Dallaire Côté <110583667+0mdc@users.noreply.github.com> Co-authored-by: Aaron Gokaslan <aaronGokaslan@gmail.com> * Merged * Removed bad file and fixed IK * Env fixes * Fixed precommit * Fixed eval and fixed wandb logging * Fix for the resume in VER and the force threshold for open tasks * Update habitat-baselines/habitat_baselines/rl/ddppo/policy/resnet_policy.py Co-authored-by: Aaron Gokaslan <skylion.aaron@gmail.com> * tp-srl fixes * tp-srl fixes * Fixed more tests * Cleaned up nav action * Added tests for all tasks in baseline trainer * Corrected test overrides * Improved agents loop in resnet_policy Improved agents loop in resnet_policy Co-authored-by: Ruslan <partsey2412@gmail.com> * Fixed policy docs and improvements. Added docs to spawn robot method. * [0.2.3] 959 PR review suggested changes (facebookresearch#1029) * removed habitat-baselines/habitat_baselines/config path prefix * improved adding render view uuids to the gym obs_keys * made config keys lowercase * Updated docs * Update habitat-lab/habitat/tasks/rearrange/rearrange_task.py Co-authored-by: Vincent-Pierre BERGES <28320361+vincentpierre@users.noreply.github.com> * Update habitat-baselines/habitat_baselines/rl/ddppo/policy/resnet_policy.py Co-authored-by: Aaron Gokaslan <skylion.aaron@gmail.com> * Fixed formatting * tp-srl config fix * fixing documentation ? Co-authored-by: vincentpierre <vincentpierre@users.noreply.github.com> Co-authored-by: ASzot <me@andrewszot.com> Co-authored-by: Vincent-Pierre BERGES <28320361+vincentpierre@users.noreply.github.com> Co-authored-by: Jimmy Yang <55121504+jimmytyyang@users.noreply.github.com> Co-authored-by: Ruslan <partsey2412@gmail.com> Co-authored-by: Mikaël Dallaire Côté <110583667+0mdc@users.noreply.github.com> Co-authored-by: Aaron Gokaslan <aaronGokaslan@gmail.com> Co-authored-by: Aaron Gokaslan <skylion.aaron@gmail.com> Co-authored-by: Oleksandr <maksymets.o@gmail.com> Co-authored-by: Oleksandr Maksymets <maksymets@gmail.com> Co-authored-by: SergioArnaud <sercharnaud@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation and Context
How Has This Been Tested
Types of changes
Checklist