Commit Graph

160 Commits

Author SHA1 Message Date
Simon Alibert c015252e20
Remove batch length restrictions in select_action (#123) 2024-05-04 15:33:55 +02:00
Alexander Soare c1668924ab
Fix missing `policy.to(device)` in policy factory (#126) 2024-05-01 17:26:58 +01:00
Alexander Soare d1855a202a
Refactor TD-MPC (#103)
Co-authored-by: Cadene <re.cadene@gmail.com>
Co-authored-by: Simon Alibert <75076266+aliberts@users.noreply.github.com>
2024-05-01 16:40:04 +01:00
Alexander Soare a4891095e4
Use PytorchModelHubMixin to save models as safetensors (#125)
Co-authored-by: Remi <re.cadene@gmail.com>
2024-05-01 16:17:18 +01:00
Alexander Soare 01d5490d44
Follow `transformers` single file naming conventions (#124) 2024-05-01 13:09:42 +01:00
Alexander Soare 986583dc5c
Nest ACT model in ACT Policy (#122) 2024-04-30 17:17:40 +01:00
Alexander Soare 9d60dce6f3
Tidy up yaml configs (#121) 2024-04-30 16:08:59 +01:00
Simon Alibert 2765877f28
Speed up CI, add more checks (#115)
- Split pytest and end-to-end tests into separate jobs
- Add poetry check to ensure pyproject.toml and poetry.lock are in sync
- Add ruff format --diff to ensure style formatting is applied (fails if ruff would reformat anything)
2024-04-29 23:05:55 +02:00
Quentin Gallouédec 508bd92d03
Remove `update` method from the policy (#99)
Co-authored-by: Alexander Soare <alexander.soare159@gmail.com>
2024-04-29 12:27:58 +02:00
Alexander Soare ccffa9e406
Fix policy defaults (#113) 2024-04-29 08:26:59 +01:00
Simon Alibert 791506dfb8
Remove warnings (#111)
- Replace `use_pretrained_backbone` with `pretrained_backbone_weights`
- Bump diffusers' minimum version `0.26.3` -> `0.27.2`
- Add ignore flags in CI's pytest
- Change Box observation spaces in simulation environments
- Set `version_base="1.2"` in Hydra initializations
- Bump einops' minimum version `0.7.0` -> `0.8.0`
2024-04-29 00:31:33 +02:00
Alexander Soare 45f351c618
Make sure targets are normalized too (#106) 2024-04-26 11:18:39 +01:00
Remi e760e4cd63
Move normalization to policy for act and diffusion (#90)
Co-authored-by: Alexander Soare <alexander.soare159@gmail.com>
2024-04-25 11:47:38 +02:00
Simon Alibert 7ad1909641
Tests cleaning & simplification (#81) 2024-04-18 14:47:42 +02:00
Alexander Soare dd9c6eed15 Add temporary patch in TD-MPC 2024-04-17 16:27:57 +01:00
Alexander Soare 2298ddf226 wip 2024-04-17 16:21:37 +01:00
Alexander Soare 63e5ec6483 revert some formatting changes 2024-04-17 11:40:49 +01:00
Alexander Soare c50a13ab31 draft 2024-04-17 10:50:54 +01:00
Alexander Soare cb3978b5f3 backup wip 2024-04-16 18:12:39 +01:00
Alexander Soare 0eb899de73 Merge remote-tracking branch 'upstream/main' into unify_policy_api 2024-04-16 17:30:41 +01:00
Alexander Soare a9496fde39 revision 1 2024-04-16 17:15:51 +01:00
Alexander Soare 23be5e1e7b backup wip 2024-04-16 16:31:44 +01:00
Alexander Soare 9c2f10bd04 ready for review 2024-04-16 13:43:58 +01:00
Alexander Soare 03b08eb74e backup wip 2024-04-16 12:51:32 +01:00
Alexander Soare 5608e659e6 backup wip 2024-04-15 19:06:44 +01:00
Alexander Soare 14f3ffb412 Merge remote-tracking branch 'upstream/main' into refactor_dp 2024-04-15 17:08:28 +01:00
Alexander Soare 30023535f9 revision 1 2024-04-15 10:56:43 +01:00
Alexander Soare 40d417ef60 Make sure to make remove all traces of omegaconf from policy config 2024-04-15 09:59:18 +01:00
Alexander Soare ef4bd9e25c Use dataclass config for ACT 2024-04-15 09:39:23 +01:00
Alexander Soare 34f00753eb remove policy.py 2024-04-12 17:13:25 +01:00
Alexander Soare 55e484124a draft pr 2024-04-12 17:03:59 +01:00
Alexander Soare 6d0a45a97d ready for review 2024-04-12 11:36:52 +01:00
Alexander Soare 5666ec3ec7 backup wip 2024-04-11 18:33:54 +01:00
Alexander Soare 94cc22da9e Merge remote-tracking branch 'upstream/main' into refactor_dp 2024-04-11 17:52:10 +01:00
Alexander Soare 976a197f98 backup wip 2024-04-11 17:51:35 +01:00
Cadene 7c8eb7ff19 Merge remote-tracking branch 'origin/user/rcadene/2024_03_31_remove_torchrl' into user/rcadene/2024_03_31_remove_torchrl 2024-04-10 11:34:51 +00:00
Cadene 06573d7f67 online training works (loss goes down), remove repeat_action, eval_policy outputs episodes data, eval_policy uses max_episodes_rendered 2024-04-10 11:34:01 +00:00
Alexander Soare e6c6c2367f Merge remote-tracking branch 'upstream/user/rcadene/2024_03_31_remove_torchrl' into refactor_act 2024-04-09 08:36:28 +01:00
Cadene 6902e01db0 tests are passing for aloha/act policies, removes abstract policy 2024-04-09 03:28:56 +00:00
Cadene 73dfa3c8e3 tests for tdmpc and diffusion policy are passing 2024-04-09 02:50:32 +00:00
Alexander Soare 9c96349926 Merge remote-tracking branch 'upstream/user/rcadene/2024_03_31_remove_torchrl' into refactor_act 2024-04-08 15:44:00 +01:00
Cadene 70aaf1c4cb test_datasets.py are passing! 2024-04-08 14:16:57 +00:00
Alexander Soare 0b4c42f4ff typos 2024-04-08 14:59:37 +01:00
Alexander Soare 62b18a7607 Add type hints 2024-04-08 14:51:45 +01:00
Alexander Soare 86365adf9f revision 2024-04-08 14:44:46 +01:00
Alexander Soare 863f28ffd8 ready for review 2024-04-08 13:10:19 +01:00
Alexander Soare 1bab4a1dd5 Eval reproduction works with gym_aloha 2024-04-08 10:23:26 +01:00
Alexander Soare e982c732f1 Merge remote-tracking branch 'Cadene/user/rcadene/2024_03_31_remove_torchrl' into refactor_act_remove_torchrl 2024-04-08 09:25:45 +01:00
Cadene 4371a5570d Remove latency, tdmpc policy passes tests (TODO: make it work with online RL) 2024-04-07 16:01:22 +00:00
Alexander Soare 8d2463f45b backup wip 2024-04-05 18:46:30 +01:00
Alexander Soare ab2286025b Merge remote-tracking branch 'Cadene/user/rcadene/2024_03_31_remove_torchrl' into refactor_act_remove_torchrl 2024-04-05 18:06:00 +01:00
Alexander Soare 1e71196fe3 backup wip 2024-04-05 17:38:29 +01:00
Cadene f56b1a0e16 WIP tdmpc 2024-04-05 13:40:31 +00:00
Alexander Soare 0b8d27ff2c Merge remote-tracking branch 'Cadene/user/rcadene/2024_03_31_remove_torchrl' into refactor_act_remove_torchrl 2024-04-05 12:48:11 +01:00
Cadene c17dffe944 policies/utils.py 2024-04-05 11:47:15 +00:00
Alexander Soare 8ba88ba250 Merge remote-tracking branch 'Cadene/user/rcadene/2024_03_31_remove_torchrl' into refactor_act_remove_torchrl 2024-04-05 12:34:14 +01:00
Cadene a420714ee4 fix: action_is_pad was missing in compute_loss 2024-04-05 11:33:39 +00:00
Alexander Soare 9d77f5773d Merge remote-tracking branch 'Cadene/user/rcadene/2024_03_31_remove_torchrl' into refactor_act_remove_torchrl 2024-04-05 11:41:11 +01:00
Alexander Soare edb125b351 backup wip 2024-04-05 11:03:28 +01:00
Cadene 5af00d0c1e fix train.py, stats, eval.py (training is running) 2024-04-05 09:31:39 +00:00
Alexander Soare 3a4dfa82fe backup wip 2024-04-04 18:34:41 +01:00
Cadene 1cdfbc8b52 WIP
WIP

WIP train.py works, loss going down

WIP eval.py

Fix

WIP (eval running, TODO: verify results reproduced)

Eval works! (testing reproducibility)

WIP

pretrained model pusht reproduces same results as torchrl

pretrained model pusht reproduces same results as torchrl

Remove AbstractPolicy, Move all queues in select_action

WIP test_datasets passed (TODO: re-enable NormalizeTransform)
2024-04-04 15:31:03 +00:00
Alexander Soare 278336a39a backup wip 2024-04-03 19:23:22 +01:00
Alexander Soare 110ac5ffa1 backup wip 2024-04-03 14:21:07 +01:00
Alexander Soare 65ef8c30d0 backup wip 2024-04-02 19:13:49 +01:00
Alexander Soare 2b928eedd4 backup wip 2024-04-02 19:11:53 +01:00
Alexander Soare 1a1308d62f fix environment seeding
add fixes for reproducibility

only try to start env if it is closed

revision

fix normalization and data type

Improve README

Improve README

Tests are passing, Eval pretrained model works, Add gif

Update gif

Update gif

Update gif

Update gif

Update README

Update README

update minor

Update README.md

Co-authored-by: Simon Alibert <75076266+aliberts@users.noreply.github.com>

Update README.md

Co-authored-by: Simon Alibert <75076266+aliberts@users.noreply.github.com>

Address suggestions

Update thumbnail + stats

Update thumbnail + stats

Update README.md

Co-authored-by: Alexander Soare <alexander.soare159@gmail.com>

Add more comments

Add test_examples.py
2024-03-26 10:10:43 +00:00
Simon Alibert bcfdba109f Update pre-commit & run on all files 2024-03-25 17:29:35 +01:00
Alexander Soare 72d3c3120b Merge remote-tracking branch 'upstream/main' into fix_pusht_diffusion 2024-03-21 10:20:52 +00:00
Alexander Soare acf1174447 ready for review 2024-03-21 10:18:50 +00:00
Simon Alibert 4631d36c05 Add get_safe_torch_device in policies 2024-03-20 18:38:55 +01:00
Alexander Soare d323993569 backup wip 2024-03-20 15:01:27 +00:00
Alexander Soare 4b7ec81dde remove abstracmethods, fix online training 2024-03-20 14:49:41 +00:00
Alexander Soare 32e3f71dd1 backup wip 2024-03-20 09:49:16 +00:00
Alexander Soare 5332766a82 revision 2024-03-20 09:45:45 +00:00
Alexander Soare 4f1955edfd Clear action queue when environment is reset 2024-03-20 08:31:06 +00:00
Alexander Soare 896a11f60e backup wip 2024-03-19 18:50:04 +00:00
Alexander Soare ea17f4ce50 backup wip 2024-03-19 16:02:09 +00:00
Alexander Soare 88347965c2 revert dp changes, make act and tdmpc batch friendly 2024-03-18 19:18:21 +00:00
Alexander Soare a222c88c99 Merge branch 'user/alexander-soare/train_pusht' into user/alexander-soare/multistep_policy_and_serial_env 2024-03-14 16:06:21 +00:00
Alexander Soare ba91976944 wip: still needs batch logic for act and tdmp 2024-03-14 15:24:10 +00:00
Alexander Soare 98484ac68e ready for review 2024-03-12 21:59:01 +00:00
Alexander Soare 9512d1d2f3 Merge branch 'main' into user/alexander-soare/train_pusht 2024-03-12 19:41:27 +00:00
Remi Cadene 9d002032d1 Add Aloha env and ACT policy
WIP Aloha env tests pass

Rendering works (fps look fast tho? TODO action bounding is too wide [-1,1])

Update README

Copy past from act repo

Remove download.py add a WIP for Simxarm

Remove download.py add a WIP for Simxarm

Add act yaml (TODO: try train.py)

Training can runs (TODO: eval)

Add tasks without end_effector that are compatible with dataset, Eval can run (TODO: training and pretrained model)

Add AbstractEnv, Refactor AlohaEnv, Add rendering_hook in env, Minor modifications, (TODO: Refactor Pusht and Simxarm)

poetry lock

fix bug in compute_stats for action normalization

fix more bugs in normalization

fix training

fix import

PushtEnv inheriates AbstractEnv, Improve factory Normalization

Add _make_env to EnvAbstract

Add call_rendering_hooks to pusht env

SimxarmEnv inherites from AbstractEnv (NOT TESTED)

Add aloha tests artifacts + update pusht stats

fix image normalization: before env was in [0,1] but dataset in [0,255], and now both in [0,255]

Small fix on simxarm

Add next to obs

Add top camera to Aloha env (TODO: make it compatible with set of cameras)

Add top camera to Aloha env (TODO: make it compatible with set of cameras)
2024-03-12 10:27:48 +00:00
Alexander Soare 87fcc536f9 wip - still need to verify full training run 2024-03-11 18:45:21 +00:00
Alexander Soare 2a01487494 early training loss as expected 2024-03-11 13:34:04 +00:00
Simon Alibert 134009f337 Remove init files 2024-03-10 16:38:49 +01:00
Simon Alibert 6c867d78ef Integrate pusht env from diffusion 2024-03-10 16:33:03 +01:00
Simon Alibert 302b78962c Integrate diffusion policy 2024-03-10 15:31:17 +01:00
Simon Alibert 59397fb44a Move tdmpc files 2024-03-09 18:44:36 +01:00
Simon Alibert a6d353c419 Fix 2024-03-05 17:00:17 +01:00
Remi e990f3e148
Merge pull request #6 from Cadene/user/rcadene/2024_03_04_diffusion
Make diffusion work
2024-03-04 18:30:40 +01:00
Remi Cadene cfc304e870 Refactor env queue, Training diffusion works (Still not converging) 2024-03-04 11:00:51 +00:00
Remi Cadene fddd9f0311 Add possibility for the policy to provide a sequence of actions to the env 2024-03-03 14:02:24 +00:00
Remi Cadene 0f2fa4d9ef Add obs queue to pusht, Set n_obs_steps=2 for diffusion (Not fully tested) 2024-03-03 13:21:31 +00:00
Simon Alibert b33ec5a630 Add run on cpu-only compatibility 2024-03-03 12:47:26 +01:00
Remi Cadene 80785f8d0e Small fix, Refactor diffusion, Diffusion runs (TODO: remove normalization in diffusion) 2024-03-02 17:04:39 +00:00
Remi Cadene 45b4ecb727 pre-commit run -a 2024-03-02 15:58:21 +00:00
Remi Cadene 1ae6205269 Add Normalize, non_blocking=True in tdmpc, tdmpc run (TODO: diffusion) 2024-03-02 15:53:29 +00:00
Cadene ca948c1e5b fix zip strict=False 2024-03-01 00:45:23 +00:00