Commit Graph

132 Commits

Author SHA1 Message Date
Baruch Tabanpour e9709900b4 Add gravcomp.
PiperOrigin-RevId: 627791303
Change-Id: I87c9254967eb492d0c38153ff41d7458ffb69136
2024-04-24 11:19:34 -07:00
Copybara-Service 68e33f4c4e Merge pull request #1601 from Andrew-Luo1:main
PiperOrigin-RevId: 627779916
Change-Id: I656984b53556360b1ba88ca6adc8ea1cf2e9d215
2024-04-24 10:49:13 -07:00
Baruch Tabanpour 0a60d555c6 Fix small bug in testspeed.
PiperOrigin-RevId: 627773755
Change-Id: Iebbcaa41cfdde126312e388d368843a4754abfb8
2024-04-24 10:30:45 -07:00
Baruch Tabanpour d15db54537 Add support functions for id2name and name2id.
PiperOrigin-RevId: 627525330
Change-Id: Ic8069f64c94ef4b8f96f62b88ece62a8b296d870
2024-04-23 15:35:59 -07:00
Andrew 554771f6b3 Merge branch 'main' of https://github.com/Andrew-Luo1/mujoco_apg_tutorial into main 2024-04-23 13:50:08 +02:00
Andrew 9530aa11e3 add a reference 2024-04-23 13:50:00 +02:00
andrew-luo1 a8aa15af4d clean up text 2024-04-23 08:16:38 +02:00
Andrew a1d53711bc revert pyproject 2024-04-23 06:17:47 +02:00
Andrew Luo e6b95f3cfc Merge branch 'google-deepmind:main' into main 2024-04-23 06:12:20 +02:00
Erik Frey c6ab354bd7 Remove type annotations unavailable in python < 3.10. Fixes #1590
PiperOrigin-RevId: 627188913
Change-Id: I9adc627349a4001291ac6d05080b761fee155ab0
2024-04-22 16:22:36 -07:00
Erik Frey 71333938ec Add support for condim to MJX.
PiperOrigin-RevId: 627136131
Change-Id: Ia62eb20cb80395b569c7fc7f4d4ef87e12eaaf40
2024-04-22 13:20:57 -07:00
Alessio Quaglino c2d0c5dd1b Add cylinder collisions using SDFs.
PiperOrigin-RevId: 626998709
Change-Id: I669a639b1cabf5ed522c73a07e54684d675fa396
2024-04-22 05:07:43 -07:00
Andrew 001d2dfa85 comments 2024-04-21 22:29:58 +02:00
Andrew eb6624bd86 further clean up text, add comments, remove irrelevant observations in get_obs, regenerate apg outputs 2024-04-21 22:06:36 +02:00
Andrew Luo f3a9d7790a Merge branch 'google-deepmind:main' into main 2024-04-21 17:15:31 +02:00
Erik Frey 3b64217b96 Remove deprecated mjx.device_* functions. They are not suited to upcoming condim support.
PiperOrigin-RevId: 626486447
Change-Id: Ibd41874bb3903123567168ebbac563399788d2f2
2024-04-19 15:34:28 -07:00
Andrew ab7d8fe167 update comments 2024-04-19 06:44:59 +02:00
Andrew 3e12452bc9 git clone mujoco menagerie rather than import anymal_c locally 2024-04-19 06:30:57 +02:00
Erik Frey a4df912018 Prepare MJX for condim.
This is a refactor of collision_driver and some of its surrounding code in order to prepare for condim in MJX.  In this change we reify types that are needed for condim: dim, efc_address, efc_type.  We make explicit the way contacts are organized and grouped to guarantee that dim and efc_type are statically defined.

This change simplifies the way meshes are organized on device and slightly speeds up mesh collisions for cases where a single mesh is instanced across many geoms.

PiperOrigin-RevId: 626119500
Change-Id: Ic0c8599bcda2326f2e19cd3246a673e56097886b
2024-04-18 12:43:36 -07:00
Google DeepMind 8b7f1094f1 Fix jax deprecation warning for jax.tree_map.
PiperOrigin-RevId: 626092308
Change-Id: I78145efe62ae118726c1755856d7cb9b1abd988a
2024-04-18 11:13:35 -07:00
Andrew 5d2986f9c7 change default option on brax apg 2024-04-18 05:05:28 +02:00
Andrew 568e1f2d59 refine text 2024-04-18 04:50:21 +02:00
Andrew bfad82d475 fix typos 2024-04-17 14:23:10 +02:00
Andrew 8043e95c00 revert pyproject 2024-04-17 12:12:33 +02:00
Andrew ad86492986 Merge branch 'main' of https://github.com/Andrew-Luo1/mujoco_apg_tutorial into main 2024-04-17 11:59:21 +02:00
Andrew 9b2274593d update text 2024-04-17 11:59:09 +02:00
Andrew Luo 4ae47dd4ec Merge branch 'google-deepmind:main' into main 2024-04-17 11:13:32 +02:00
Andrew 7a7c33a23b benchmark against ppo 2024-04-17 11:07:46 +02:00
Andrew 7db18c4081 upload videos 2024-04-17 08:02:05 +02:00
Andrew daaf81fa56 slightly stabler quadruped training 2024-04-16 04:54:22 +02:00
Baruch Tabanpour 0fa0437313 Add cylinder plane.
PiperOrigin-RevId: 625099227
Change-Id: I02cb86c3e8c7fd5914a082f1e8a3bae6274b3c8e
2024-04-15 15:18:04 -07:00
Baruch Tabanpour 38fa5083eb Fix support for deep penetration in plane-convex.
PiperOrigin-RevId: 625088511
Change-Id: I30bd4d475f4bfde98b5ae6254dd67bbe0fc09c08
2024-04-15 14:42:41 -07:00
Andrew f19e7be8c6 all demos in tutorial work locally 2024-04-15 21:29:05 +02:00
Andrew 27cddcb712 add anymal_c model foor mjx demo 2024-04-15 08:22:54 +02:00
andrew-luo1 df262402cf add diagram for apg notebook 2024-04-15 08:12:43 +02:00
Baruch Tabanpour 9f1651b7bd Raise error for gravcomp.
PiperOrigin-RevId: 624292351
Change-Id: Ia8cfce33f990616035772fb88c34fb1434c73220
2024-04-12 14:25:34 -07:00
Gabe Oppenheimer 225619c964 Update MuJoCo internal version to be the external version +1
PiperOrigin-RevId: 623607403
Change-Id: Ia8f6516bb6b2fb6a3ecb8273b59e61667098f308
2024-04-10 14:32:54 -07:00
Alessio Quaglino 2b3f336bd3 Add ellipsoid sdf collisions to MJX.
Co-authored-by: Baruch Tabanpour <btaba@google.com>
PiperOrigin-RevId: 623415479
Change-Id: Id061c8e083357d063f1ccddf0989f2fafe415eed
2024-04-10 01:41:10 -07:00
Tom Erez b441923598 Add userdata support to MJX.
PiperOrigin-RevId: 622948369
Change-Id: I5eca0afcb8cd50f53eacc57a78bfdf68ccde12e7
2024-04-08 14:14:12 -07:00
Baruch Tabanpour d7f131e086 Add ellipsoid plane.
Co-authored-by: Alessio Quaglino <quaglino@google.com>
PiperOrigin-RevId: 621208833
Change-Id: I270c1ae0cecd7dd2d9b41da4e4d0b6378b105aaf
2024-04-02 09:49:46 -07:00
Baruch Tabanpour d258d5e152 Check all edge pairs in convex-convex.
PiperOrigin-RevId: 620004680
Change-Id: I5d75c0fd21ed3d3e420eed762cfc5a7e04896032
2024-03-28 11:33:46 -07:00
Baruch Tabanpour 2019d42ca6 Small change to testspeed file.
PiperOrigin-RevId: 618323795
Change-Id: I3a6307b8ae6d9af0d17c0ae85eae673d60112ddf
2024-03-22 17:04:49 -07:00
Baruch Tabanpour 624becca52 Fix some more bugs in sphere/capsule-convex collisions.
PiperOrigin-RevId: 617646119
Change-Id: Ie0c99ccbe1dd2a18663d45a111e77fed4112e638
2024-03-20 15:46:13 -07:00
Erik Frey 9b86329797 Add 01-10 humanoids for benchmarking.
PiperOrigin-RevId: 617318016
Change-Id: Ic5dc0623266d4d6bef6da97d03370010e2817a2a
2024-03-19 15:48:48 -07:00
Baruch Tabanpour b4694ee331 Fix bug in MJX viewer.
PiperOrigin-RevId: 617297574
Change-Id: I34fb797db47308a8b2f29a6c54f2b59d77f84a32
2024-03-19 14:36:15 -07:00
Baruch Tabanpour e95159b4f6 Small fix to mjx tutorial.
PiperOrigin-RevId: 616235636
Change-Id: I38675c032bdca8f26ab0550896928d097ee86653
2024-03-15 14:00:28 -07:00
Baruch Tabanpour 2386353b02 Throw an error for margin/gap with meshes.
PiperOrigin-RevId: 615937263
Change-Id: I3289cf1b1fec93385cc78a01e53866427453db59
2024-03-14 16:21:05 -07:00
Erik Frey 02c62c118c Fix bug where treedef for mjx.make_data doesn't match mjx.put_data.
PiperOrigin-RevId: 615928973
Change-Id: I08af97ac0300b9d51c1f4b46d48dde98d24197fa
2024-03-14 15:51:15 -07:00
Baruch Tabanpour e5811ce2b4 Further improve edge contact for capsule-convex.
PiperOrigin-RevId: 615900645
Change-Id: I7fd495b10b7b3121da7aa5ed15cde413d916bc84
2024-03-14 14:15:44 -07:00
Baruch Tabanpour f818a16ae4 Fix the bugfix for capsule-convex collisions.
PiperOrigin-RevId: 615809115
Change-Id: I183336630a76a9ada5b0730559b49779dd94f8e5
2024-03-14 09:41:33 -07:00