jaxsim 0.2.1.dev47__tar.gz → 0.2.1.dev54__tar.gz

{jaxsim-0.2.1.dev47 → jaxsim-0.2.1.dev54}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaxsim
-Version: 0.2.1.dev47
+Version: 0.2.1.dev54
 Home-page: https://github.com/ami-iit/jaxsim
 Author: Diego Ferigo
 Author-email: diego.ferigo@iit.it
@@ -37,7 +37,7 @@ Requires-Dist: jaxlib>=0.4.13
 Requires-Dist: jaxlie>=1.3.0
 Requires-Dist: jax_dataclasses>=1.4.0
 Requires-Dist: pptree
-Requires-Dist: rod>=0.2.0
+Requires-Dist: rod>=0.3.0
 Requires-Dist: typing_extensions; python_version < "3.12"
 Provides-Extra: style
 Requires-Dist: black[jupyter]~=24.0; extra == "style"

{jaxsim-0.2.1.dev47 → jaxsim-0.2.1.dev54}/environment.yml

@@ -12,7 +12,7 @@ dependencies:
   - jaxlie >= 1.3.0
   - jax-dataclasses >= 1.4.0
   - pptree
-  - rod >= 0.2.0
+  - rod >= 0.3.0
   - typing_extensions # python<3.12
   # ====================================
   # Optional dependencies from setup.cfg
@@ -41,18 +41,15 @@ dependencies:
   - pip
   - sphinx
   - sphinx-autodoc-typehints
+  - sphinx-book-theme
   - sphinx-copybutton
   - sphinx-design
   - sphinx_fontawesome
   - sphinx-jinja2-compat
   - sphinx-multiversion
   - sphinx_rtd_theme
-  - sphinx-book-theme
   - sphinx-toolbox
   # ========================================
   # Other dependencies for GitHub Codespaces
   # ========================================
-  # System dependencies to run the tests
-  - gz-sim7
-  # Other packages
   - ipython

{jaxsim-0.2.1.dev47 → jaxsim-0.2.1.dev54}/setup.cfg

@@ -57,7 +57,7 @@ install_requires =
 	jaxlie >= 1.3.0
 	jax_dataclasses >= 1.4.0
 	pptree
-	rod >= 0.2.0
+	rod >= 0.3.0
 	typing_extensions ; python_version < '3.12'
 
 [options.packages.find]

{jaxsim-0.2.1.dev47 → jaxsim-0.2.1.dev54}/src/jaxsim/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.2.1.dev47'
-__version_tuple__ = version_tuple = (0, 2, 1, 'dev47')
+__version__ = version = '0.2.1.dev54'
+__version_tuple__ = version_tuple = (0, 2, 1, 'dev54')

{jaxsim-0.2.1.dev47 → jaxsim-0.2.1.dev54}/src/jaxsim/mujoco/loaders.py

@@ -203,10 +203,10 @@ class RodModelToMjcf:
             joints_dict[joint_name].type = "fixed"
 
         # Convert the ROD model to URDF.
-        urdf_string = rod.urdf.exporter.UrdfExporter.sdf_to_urdf_string(
+        urdf_string = rod.urdf.exporter.UrdfExporter(
+            gazebo_preserve_fixed_joints=False, pretty=True
+        ).to_urdf_string(
             sdf=rod.Sdf(model=rod_model, version="1.7"),
-            gazebo_preserve_fixed_joints=False,
-            pretty=True,
         )
 
         # -------------------------------------

{jaxsim-0.2.1.dev47 → jaxsim-0.2.1.dev54}/src/jaxsim/parsers/kinematic_graph.py

@@ -121,7 +121,8 @@ class KinematicGraph(Sequence[descriptions.LinkDescription]):
         # Also here, we assume the model is fixed-base, therefore the first frame will
         # have last_link_idx + 1. These frames are not part of the physics model.
         for index, frame in enumerate(self.frames):
-            frame.index = index + len(self.link_names())
+            with frame.mutable_context(mutability=Mutability.MUTABLE_NO_VALIDATION):
+                frame.index = int(index + len(self.link_names()))
 
         # Number joints so that their index matches their child link index
         links_dict = {l.name: l for l in iter(self)}

{jaxsim-0.2.1.dev47 → jaxsim-0.2.1.dev54}/src/jaxsim/parsers/rod/parser.py

@@ -6,6 +6,7 @@ import jax.numpy as jnp
 import numpy as np
 import rod
 
+import jaxsim.utils
 from jaxsim import logging
 from jaxsim.math.quaternion import Quaternion
 from jaxsim.parsers import descriptions, kinematic_graph
@@ -25,6 +26,7 @@ class SDFData(NamedTuple):
 
     link_descriptions: List[descriptions.LinkDescription]
     joint_descriptions: List[descriptions.JointDescription]
+    frame_descriptions: List[descriptions.LinkDescription]
     collision_shapes: List[descriptions.CollisionShape]
 
     sdf_model: rod.Model | None = None
@@ -70,6 +72,8 @@ def extract_model_data(
 
     # Jaxsim supports only models compatible with URDF, i.e. those having all links
     # directly attached to their parent joint without additional roto-translations.
+    # Furthermore, the following switch also post-processes frames such that their
+    # pose is expressed wrt the parent link they are rigidly attached to.
     sdf_model.switch_frame_convention(frame_convention=rod.FrameConvention.Urdf)
 
     # Log type of base link
@@ -113,6 +117,23 @@ def extract_model_data(
     # Create a dictionary to find easily links
     links_dict: Dict[str, descriptions.LinkDescription] = {l.name: l for l in links}
 
+    # ============
+    # Parse frames
+    # ============
+
+    # Parse the frames (unconnected)
+    frames = [
+        descriptions.LinkDescription(
+            name=f.name,
+            mass=jnp.array(0.0, dtype=float),
+            inertia=jnp.zeros(shape=(3, 3)),
+            parent=links_dict[f.attached_to],
+            pose=f.pose.transform() if f.pose is not None else jnp.eye(4),
+        )
+        for f in sdf_model.frames()
+        if f.attached_to in links_dict
+    ]
+
     # =========================
     # Process fixed-base models
     # =========================
@@ -309,6 +330,7 @@ def extract_model_data(
         model_name=sdf_model.name,
         link_descriptions=links,
         joint_descriptions=joints,
+        frame_descriptions=frames,
         collision_shapes=collisions,
         fixed_base=sdf_model.is_fixed_base(),
         base_link_name=sdf_model.get_canonical_link(),
@@ -338,10 +360,14 @@ def build_model_description(
         model_description=model_description, model_name=None, is_urdf=is_urdf
     )
 
-    # Build the model description.
+    # Build the intermediate representation used for building a JaxSim model.
+    # This process, beyond other operations, removes the fixed joints.
     # Note: if the model is fixed-base, the fixed joint between world and the first
     #       link is removed and the pose of the first link is updated.
-    model = descriptions.ModelDescription.build_model_from(
+    #
+    # The whole process is:
+    # URDF/SDF ⟶ rod.Model ⟶ ModelDescription ⟶ JaxSimModel.
+    graph = descriptions.ModelDescription.build_model_from(
         name=sdf_data.model_name,
         links=sdf_data.link_descriptions,
         joints=sdf_data.joint_descriptions,
@@ -356,7 +382,47 @@ def build_model_description(
         ],
     )
 
+    # Depending on how the model is reduced due to the removal of fixed joints,
+    # there might be frames that are no longer attached to existing links.
+    # We need to change the link to which they are attached to, and update their pose.
+    frames_with_no_parent_link = (
+        f for f in sdf_data.frame_descriptions if f.parent.name not in graph
+    )
+
+    # Build the object to compute forward kinematics.
+    fk = kinematic_graph.KinematicGraphTransforms(graph=graph)
+
+    for frame in frames_with_no_parent_link:
+        # Get the original data of the frame.
+        original_pose = frame.pose
+        original_parent_link = frame.parent.name
+
+        # The parent link, that has been removed, became a frame.
+        assert original_parent_link in graph.frames_dict, (frame, original_parent_link)
+
+        # Get the new parent of the frame corresponding to the removed parent link.
+        new_parent_link = graph.frames_dict[original_parent_link].parent.name
+        logging.debug(f"Frame '{frame.name}' is now attached to '{new_parent_link}'")
+
+        # Get the transform from the new parent link to the original parent link.
+        # The original pose is expressed wrt the original parent link.
+        F_H_P = fk.relative_transform(
+            relative_to=new_parent_link, name=original_parent_link
+        )
+
+        # Update the frame with the updated data.
+        with frame.mutable_context(
+            mutability=jaxsim.utils.Mutability.MUTABLE_NO_VALIDATION
+        ):
+            frame.parent = graph.links_dict[new_parent_link]
+            frame.pose = np.array(F_H_P @ original_pose)
+
+    # Include the SDF frames originally stored in the SDF.
+    graph = dataclasses.replace(
+        graph, frames=sdf_data.frame_descriptions + graph.frames
+    )
+
     # Store the parsed SDF tree as extra info
-    model = dataclasses.replace(model, extra_info={"sdf_model": sdf_data.sdf_model})
+    graph = dataclasses.replace(graph, extra_info={"sdf_model": sdf_data.sdf_model})
 
-    return model
+    return graph

{jaxsim-0.2.1.dev47 → jaxsim-0.2.1.dev54}/src/jaxsim.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaxsim
-Version: 0.2.1.dev47
+Version: 0.2.1.dev54
 Home-page: https://github.com/ami-iit/jaxsim
 Author: Diego Ferigo
 Author-email: diego.ferigo@iit.it
@@ -37,7 +37,7 @@ Requires-Dist: jaxlib>=0.4.13
 Requires-Dist: jaxlie>=1.3.0
 Requires-Dist: jax_dataclasses>=1.4.0
 Requires-Dist: pptree
-Requires-Dist: rod>=0.2.0
+Requires-Dist: rod>=0.3.0
 Requires-Dist: typing_extensions; python_version < "3.12"
 Provides-Extra: style
 Requires-Dist: black[jupyter]~=24.0; extra == "style"

{jaxsim-0.2.1.dev47 → jaxsim-0.2.1.dev54}/src/jaxsim.egg-info/requires.txt

@@ -4,7 +4,7 @@ jaxlib>=0.4.13
 jaxlie>=1.3.0
 jax_dataclasses>=1.4.0
 pptree
-rod>=0.2.0
+rod>=0.3.0
 
 [:python_version < "3.12"]
 typing_extensions