Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Comparing for eventual rebase #2039

Draft
wants to merge 93 commits into
base: main
Choose a base branch
from
Draft

Comparing for eventual rebase #2039

wants to merge 93 commits into from
+3,802 −449

Conversation

zephirefaith
Copy link
Contributor

Motivation and Context

How Has This Been Tested

Types of changes

  • [Docs change] Addition or changes to the documentation
  • [Refactoring] Large changes to the code that improve its functionality or performance
  • [Dependency Upgrade] Upgrades one or several dependencies in habitat
  • [Bug Fix] (non-breaking change which fixes an issue)
  • [Development] A pull request that add new features to the habitat-lab task and environment codebase. Development Pull Requests must be small (less that 500 lines of code change), have unit testing, very extensive documentation and examples. These are typically new tasks, environments, sensors, etc... The review process for these Pull Request is longer because these changes will be maintained by our core team of developers, so make sure your changes are easy to understand!
  • [Experiment] A pull request that add new features to the habitat-baselines training codebase. Experiments Pull Requests can be any size, must have smoke/integration tests and be isolated from the rest of the code. Your code additions should not rely on other habitat-baselines code. This is to avoid dependencies between different parts of habitat-baselines. You must also include a README that will document how to use your new feature or trainer. You will be the maintainer of this code, if the code becomes stale or is not supported often enough, we will eventually remove it.

Checklist

  • My code follows the code style of this project.
  • I have updated the documentation if required.
  • I have read the CONTRIBUTING document.
  • I have completed my CLA (see CONTRIBUTING)
  • I have added tests to cover my changes if required.

Ram81 and others added 30 commits April 29, 2024 16:28
@Ram81
Add task config for multi-agent
2944319
@zephirefaith
changes to run barebone w/llm
8c22953
@zephirefaith
basic plumbing into hitl
e16ddbd
@zephirefaith
fixing precommit
7849ef6
@zephirefaith
adding visual sensors
e4631d5
@zephirefaith
config patching, remove unneeded super() calls
0c0ed67
@zephirefaith
frankenstein hitl+llm config
c8a9857
@zephirefaith
bandaids to get to working V0
77880a3
@zephirefaith
Merge branch 'main' of github.com:facebookresearch/habitat-lab into z…
eed48c1 
…f/hitl-llm-interfacing
@zephirefaith
making visual sensor changes configurable with explicit flags
21ce0c4
@zephirefaith
delete sensors we do not need
e74a92d
@zephirefaith
multi-threading + partial obs
8e912e4
@zephirefaith
speeding up the humanoid
f62a4e9
@zephirefaith
logging
c71b55f
@zephirefaith
Merge branch 'main' of github.com:facebookresearch/habitat-lab into z…
622f582 
…f/hitl-llm-interfacing
@zephirefaith
moving habitat-llm stuff to dedicated file/module
05ac703
@zephirefaith
+header,+-logging,-llm util
998dd6d
@zephirefaith
remove unused config
ff0fb40
@zephirefaith
optional logging, -llb-deps
a87b1ba
@aclegg3 @0mdc
Disable new clone protection for git lfs (#1961)
a0ab1c2
@0mdc
HITL - Make client loading state available to applications. (#1955)
48fdfdb 
* Make client loading state available to applications.

* Simplify code.
@0mdc
Add buttons and modal dialog boxes. (#1956)
0963a59
@0mdc
Add configuration to enable new connections by default. (#1960)
4e8650c
@0mdc
Add textboxes. (#1957)
8a653c2
@0mdc
HITL - Add picture-in-picture viewports. (#1958)
783506e 
* Add viewports.

* Add viewports to rearrange_v2.

* Improve viewport rect description.
@0mdc
HITL - Add object visbility handling and hide "self" in viewports. (#…
e7e76ab 
…1959)

* Add object visiblity and viewport visbility layers.

* Hide self in viewports.

* Don't render viewports if networking is disabled.
@0mdc
Add autogenerated navmeshes to gitignore. (#1963)
8a93681
@0mdc
HITL - Rearrange State Machine (#1964)
74c8df7 
* Add viewports.

* Add viewports to rearrange_v2.

* Add object visiblity and viewport visbility layers.

* Hide self in viewports.

* Don't render viewports if networking is disabled.

* Turn rearrange_v2 into a state machine. Add lobby.

* Disable rearrange_v2 test.

* Config changes.

* Change episode termination states.

* Add comment to lobby start session delay.
@0mdc
HITL - Rearrange session handling (#1965)
bb2167d 
* Add session management.

* Formatting changes.

* Add clarifications to episode resolution.

* Document temporary hack to check for client-side loading status.

* Review pass - variable renaming and camera matrix chaching.
@0mdc
HITL - Data collection (#1967)
a9a2912 
* Add session management.

* Formatting changes.

* Add clarifications to episode resolution.

* Document temporary hack to check for client-side loading status.

* Add session recorder, ui events and data upload.

* Change path handling in session upload code.
zephirefaith and others added 29 commits June 5, 2024 13:23
@zephirefaith
receptacle naming
95522f3
@zephirefaith
turn off magic desnapping
7fa8f17
@zephirefaith
termination condition for single-learn case
93ed72d
@zephirefaith
adding termination event; bypassing planning when done
2191f56
@zephirefaith
clean-up
3031983
@0mdc
Disable new connections by default.
74829eb
@0mdc
Move agent head sensors to match GUI camera.
7f3ccf1
@0mdc
Disable RGB sensors.
6e0cdfb
@zephirefaith
adding task % progress
41583e0
@zephirefaith
guard each agent's obs
677d971
@0mdc
Disable humanoid sensor auto-update.
9b5ca88
@0mdc
Disable task success text. Add task success to data output.
3e3324e
@0mdc
Adjust episode termination signals for single-learn.
b983eb3
@0mdc
Add skip episode app state.
1757301
@0mdc
Fix config typo.
c455f7f
@zephirefaith
hot-fix for inaccessible receptacles
5f756d5
@zephirefaith
Merge branch '0mdc/phase3' of https://github.com/facebookresearch/hab…
859c0c5 
…itat-lab into 0mdc/phase3
@zephirefaith
guard if no fur found for rec
a6021cc
@zephirefaith
guards
9bb5ec1
@zephirefaith
typo
4a0d292
@zephirefaith
first finish thread then reset env
08f9fb3
@zephirefaith
receptacle ID can be furniture ID
fe9d887
@0mdc
Formatting fix.
de568e2
@0mdc
Change data collection output folder.
21aeea3
@zephirefaith
handle error termination from user/agent
776f0c7
@zephirefaith
sending error information
12e4f56
@0mdc
Record episode status.
f4fe7de
@zephirefaith
guarding against exceptions and absence of handles
744dc38
Merge branch '0mdc/phase3' of https://github.com/facebookresearch/hab…
cc1584c 
…itat-lab into 0mdc/phase3
@facebook-github-bot facebook-github-bot added the CLA Signed Do not delete this pull request or issue due to inactivity. label Aug 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
CLA Signed Do not delete this pull request or issue due to inactivity.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@zephirefaith @facebook-github-bot @Ram81 @aclegg3 @0mdc