Commit Graph

100 Commits

Author SHA1 Message Date
Saran Tunyasuvunakool d49d4bf64c Make unsupported feature checking optional in put_model.
PiperOrigin-RevId: 654141976
Change-Id: I35b5f1e4c5b07e32075e847d4a757698a0b603c1
2024-07-19 15:23:32 -07:00
Saran Tunyasuvunakool db1d51a1f5 Add more fields to mjx.Option and mjx.Statistic for MuJoCo compatibility.
Also add metadata fields to the Python bindings of mjModel and mjOption,
and fix dtype of a number of fields.

PiperOrigin-RevId: 654138876
Change-Id: If2bbe41bf3dfdb350d60b5289afc65fffb397ce9
2024-07-19 15:13:01 -07:00
Erik Frey 85532b74e1 Speed up hfield JIT time by reducing XLA code generation overhead.
PiperOrigin-RevId: 653766462
Change-Id: I9d7e7fa3a4d33ae0fa9d00babd5c5478eb4eff88
2024-07-18 15:01:43 -07:00
Saran Tunyasuvunakool dbe18f5740 Add additional MuJoCo fields to MJX structs.
PiperOrigin-RevId: 653270676
Change-Id: I5f7a62d3bd542abc0d618e63d2426663e7d6406f
2024-07-17 10:04:52 -07:00
Erik Frey c145b79f6e Using typing instead of collections.abc. Fixes #1763
PiperOrigin-RevId: 651186508
Change-Id: I844ec884b802837554b0b60f2414d6bc37f2da14
2024-07-10 16:21:00 -07:00
Taylor Howell 28e5ba2d29 Copybara import of the project:
--
8857485483508e2c82c6a827daee8b457f88d1c8 by Taylor <taylor.athaniel.howell@gmail.com>:

velcoity -> velocity

COPYBARA_INTEGRATE_REVIEW=https://github.com/google-deepmind/mujoco/pull/1733 from thowell:docs 8857485483508e2c82c6a827daee8b457f88d1c8
PiperOrigin-RevId: 642779993
Change-Id: I84d15237314af8b823fe616f72bd79a088a21d61
2024-06-12 16:42:30 -07:00
Google DeepMind 238736393b #mjx Make Data.time strongly typed.
PiperOrigin-RevId: 641774798
Change-Id: I5e13e3cefeb7942083f623f29757a459656062dd
2024-06-09 20:56:33 -07:00
Erik Frey 4c3d9461ae Elliptic friction in MJX.
PiperOrigin-RevId: 641384367
Change-Id: I510c565940324fbbf392ce537ce27e0cb9af3eb1
2024-06-07 16:05:58 -07:00
Baruch Tabanpour c511d02265 Add hfield. Fixes #1655 #1491 #1695
PiperOrigin-RevId: 638447127
Change-Id: Ib1e5020a8407bc100145a6b382e985c03dd4a848
2024-05-29 16:21:34 -07:00
Baruch Tabanpour 7ca8a629a2 Speed up primitive sdf slightly.
PiperOrigin-RevId: 637105250
Change-Id: Iec73b0b30d5222617d01622771afbc95a646da45
2024-05-24 20:01:54 -07:00
Baruch Tabanpour 86e6fc6de7 Fixes #1668
PiperOrigin-RevId: 634483090
Change-Id: I30b55bbf419e57a7b2966dfca4da6bb57d5879ad
2024-05-16 11:58:09 -07:00
Baruch Tabanpour c6b1293e58 Add contact force support function. #1555
PiperOrigin-RevId: 632591177
Change-Id: I15aa00686d9f885330506d2d63443c700cc029f6
2024-05-10 13:41:45 -07:00
Baruch Tabanpour 8d1f65c01a Add act to mjx viewer.
PiperOrigin-RevId: 629451047
Change-Id: I0baf546d3d91632291e93dec39f4dba7c329d370
2024-04-30 10:13:20 -07:00
Erik Frey 719476c274 Fix bug in `mjx.ray` and speed up ray-mesh by ~30% for large meshes.
PiperOrigin-RevId: 629209303
Change-Id: I39466e9a2dc55ec48dcca1780e8abef903d1c754
2024-04-29 15:48:00 -07:00
Baruch Tabanpour e9709900b4 Add gravcomp.
PiperOrigin-RevId: 627791303
Change-Id: I87c9254967eb492d0c38153ff41d7458ffb69136
2024-04-24 11:19:34 -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
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
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
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
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
Baruch Tabanpour 9f1651b7bd Raise error for gravcomp.
PiperOrigin-RevId: 624292351
Change-Id: Ia8cfce33f990616035772fb88c34fb1434c73220
2024-04-12 14:25:34 -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 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
Baruch Tabanpour f2e107f7aa Fix deep penetration for sphere/capsule-convex.
PiperOrigin-RevId: 615539264
Change-Id: I6a5aac0574ddcb39bae8aafaf63f9561ca69288b
2024-03-13 14:12:42 -07:00
Baruch Tabanpour a49f3f63fc Remove disable_jit in test.
PiperOrigin-RevId: 614824680
Change-Id: I15f1441dfb1a70b98e5a221c0e15b06572860748
2024-03-11 16:03:40 -07:00
Baruch Tabanpour 22cd96fbbc Speed up convex-convex collisions.
PiperOrigin-RevId: 613450874
Change-Id: Ie66e0a078e2ff51a136b949dd9459847e1fe957d
2024-03-06 21:48:51 -08:00
Baruch Tabanpour 224fbd00c8 Fix egregious bug in broadphase.
PiperOrigin-RevId: 612856292
Change-Id: I622ca00509c27f351ce5efefc139b2f2e141c8e9
2024-03-05 08:48:09 -08:00
Baruch Tabanpour 419be4c605 Add crude broadphase impl.
PiperOrigin-RevId: 611643683
Change-Id: Id7816dadd7e9f1b8855268b815353c61540c4e0c
2024-02-29 17:12:58 -08:00
Copybara-Service f9c46e2abb Merge pull request #1447 from jaro-sevcik:mjx-factor-m-parallel
PiperOrigin-RevId: 611348280
Change-Id: I19ef25c732d43bba0b0a8c296b197948c69d5b52
2024-02-28 22:31:01 -08:00
Jaroslav Sevcik 803f0cb0d9 Clean up factor_m 2024-02-28 01:19:12 -08:00
Copybara-Service a5ea87b0e6 Merge pull request #1446 from jaro-sevcik:mjx-solve-m-parallel
PiperOrigin-RevId: 610984251
Change-Id: Ifd69480643df236fe2d6b9f77d1b029d2650acff
2024-02-27 22:21:11 -08:00
Baruch Tabanpour 2e43f18bee Update barkour notebook.
PiperOrigin-RevId: 610906071
Change-Id: Ie67b86888e195bbd8a8e879547e65fbc2c864534
2024-02-27 16:09:20 -08:00
Baruch Tabanpour 2067e2083a Add cameras to MJX. Fixes #1422
PiperOrigin-RevId: 610870732
Change-Id: Iaa39bd00f56046c595dc961281ac23446ca5bdf2
2024-02-27 14:17:21 -08:00
Jaroslav Sevcik 7688e03eea Remove unnecessary parens 2024-02-27 00:10:21 -08:00
Jaroslav Sevcik 29d6e10375 Update independent elements in solve_m in parallel 2024-02-25 20:27:28 +00:00