jaxsim 0.5.1.dev91__tar.gz → 0.5.1.dev95__tar.gz

{jaxsim-0.5.1.dev91 → jaxsim-0.5.1.dev95}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaxsim
-Version: 0.5.1.dev91
+Version: 0.5.1.dev95
 Summary: A differentiable physics engine and multibody dynamics library for control and robot learning.
 Author-email: Diego Ferigo <dgferigo@gmail.com>, Filippo Luca Ferretti <filippoluca.ferretti@outlook.com>
 Maintainer-email: Filippo Luca Ferretti <filippo.ferretti@iit.it>, Alessandro Croci <alessandro.croci@iit.it>

{jaxsim-0.5.1.dev91 → jaxsim-0.5.1.dev95}/src/jaxsim/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.5.1.dev91'
-__version_tuple__ = version_tuple = (0, 5, 1, 'dev91')
+__version__ = version = '0.5.1.dev95'
+__version_tuple__ = version_tuple = (0, 5, 1, 'dev95')

{jaxsim-0.5.1.dev91 → jaxsim-0.5.1.dev95}/src/jaxsim/api/data.py

@@ -382,9 +382,8 @@ class JaxSimModelData(common.ModelDataWithVelocityRepresentation):
         # we introduce a Baumgarte stabilization to let the quaternion converge to
         # a unit quaternion. In this case, it is not guaranteed that the quaternion
         # stored in the state is a unit quaternion.
-        W_Q_B = jnp.where(
-            jnp.allclose(W_Q_B.dot(W_Q_B), 1.0), W_Q_B, W_Q_B / jnp.linalg.norm(W_Q_B)
-        )
+        norm = jaxsim.math.safe_norm(W_Q_B)
+        W_Q_B = W_Q_B / (norm + jnp.finfo(float).eps * (norm == 0))
 
         return (W_Q_B if not dcm else jaxsim.math.Quaternion.to_dcm(W_Q_B)).astype(
             float
@@ -611,11 +610,8 @@ class JaxSimModelData(common.ModelDataWithVelocityRepresentation):
 
         W_Q_B = jnp.array(base_quaternion, dtype=float)
 
-        W_Q_B = jax.lax.select(
-            pred=jnp.allclose(jnp.linalg.norm(W_Q_B), 1.0, atol=1e-6, rtol=0.0),
-            on_true=W_Q_B,
-            on_false=W_Q_B / jnp.linalg.norm(W_Q_B),
-        )
+        norm = jaxsim.math.safe_norm(W_Q_B)
+        W_Q_B = W_Q_B / (norm + jnp.finfo(float).eps * (norm == 0))
 
         return self.replace(
             validate=True,

{jaxsim-0.5.1.dev91 → jaxsim-0.5.1.dev95}/src/jaxsim/math/__init__.py

@@ -8,5 +8,6 @@ from .quaternion import Quaternion
 from .rotation import Rotation
 from .skew import Skew
 from .transform import Transform
+from .utils import safe_norm
 
 from .joint_model import JointModel, supported_joint_motion  # isort:skip

{jaxsim-0.5.1.dev91 → jaxsim-0.5.1.dev95}/src/jaxsim/math/quaternion.py

@@ -4,6 +4,8 @@ import jaxlie
 
 import jaxsim.typing as jtp
 
+from .utils import safe_norm
+
 
 class Quaternion:
     @staticmethod
@@ -111,18 +113,13 @@ class Quaternion:
             operand=quaternion,
         )
 
-        norm_ω = jax.lax.cond(
-            pred=ω.dot(ω) < (1e-6) ** 2,
-            true_fun=lambda _: 1e-6,
-            false_fun=lambda _: jnp.linalg.norm(ω),
-            operand=None,
-        )
+        norm_ω = safe_norm(ω)
 
         qd = 0.5 * (
             Q
             @ jnp.hstack(
                 [
-                    K * norm_ω * (1 - jnp.linalg.norm(quaternion)),
+                    K * norm_ω * (1 - safe_norm(quaternion)),
                     ω,
                 ]
             )

{jaxsim-0.5.1.dev91 → jaxsim-0.5.1.dev95}/src/jaxsim/math/rotation.py

@@ -4,6 +4,7 @@ import jaxlie
 import jaxsim.typing as jtp
 
 from .skew import Skew
+from .utils import safe_norm
 
 
 class Rotation:
@@ -67,7 +68,7 @@ class Rotation:
         def theta_is_not_zero(axis: jtp.Vector) -> jtp.Matrix:
 
             v = axis
-            theta = jnp.linalg.norm(v)
+            theta = safe_norm(v)
 
             s = jnp.sin(theta)
             c = jnp.cos(theta)
@@ -81,19 +82,9 @@ class Rotation:
 
             return R.transpose()
 
-        # Use the double-where trick to prevent JAX problems when the
-        # jax.jit and jax.grad transforms are applied.
         return jnp.where(
-            jnp.linalg.norm(vector) > 0,
-            theta_is_not_zero(
-                axis=jnp.where(
-                    jnp.linalg.norm(vector) > 0,
-                    vector,
-                    # The following line is a workaround to prevent division by 0.
-                    # Considering the outer where, this branch is never executed.
-                    jnp.ones(3),
-                )
-            ),
+            jnp.allclose(vector, 0.0),
             # Return an identity rotation matrix when the input vector is zero.
             jnp.eye(3),
+            theta_is_not_zero(axis=vector),
         )

jaxsim-0.5.1.dev95/src/jaxsim/math/utils.py

@@ -0,0 +1,31 @@
+import jax.numpy as jnp
+
+import jaxsim.typing as jtp
+
+
+def safe_norm(array: jtp.ArrayLike, axis=None) -> jtp.Array:
+    """
+    Provides a calculation for an array norm so that it is safe
+    to compute the gradient and handle NaNs.
+
+    Args:
+        array: The array for which to compute the norm.
+        axis: The axis for which to compute the norm.
+
+    Returns:
+        The norm of the array with handling for zero arrays to avoid NaNs.
+    """
+
+    # Check if the entire array is composed of zeros.
+    is_zero = jnp.allclose(array, 0.0)
+
+    # Replace zeros with an array of ones temporarily to avoid division by zero.
+    # This ensures the computation of norm does not produce NaNs or Infs.
+    array = jnp.where(is_zero, jnp.ones_like(array), array)
+
+    # Compute the norm of the array along the specified axis.
+    norm = jnp.linalg.norm(array, axis=axis)
+
+    # Use `jnp.where` to set the norm to 0.0 where the input array was all zeros.
+    # This usage supports potential batch processing for future scalability.
+    return jnp.where(is_zero, 0.0, norm)

{jaxsim-0.5.1.dev91 → jaxsim-0.5.1.dev95}/src/jaxsim/rbda/contacts/soft.py

@@ -309,19 +309,16 @@ class SoftContacts(common.ContactModel):
 
         # Compute the direction of the tangential force.
         # To prevent dividing by zero, we use a switch statement.
-        # The ε, instead, is needed to make AD happy.
-        f_tangential_direction = jnp.where(
-            f_tangential.dot(f_tangential) != 0,
-            f_tangential / jnp.linalg.norm(f_tangential + ε),
-            jnp.zeros(3),
+        norm = jaxsim.math.safe_norm(f_tangential)
+        f_tangential_direction = f_tangential / (
+            norm + jnp.finfo(float).eps * (norm == 0)
         )
 
         # Project the tangential force to the friction cone if slipping.
         f_tangential = jnp.where(
             sticking,
             f_tangential,
-            jnp.minimum(μ * force_normal_mag, jnp.linalg.norm(f_tangential + ε))
-            * f_tangential_direction,
+            jnp.minimum(μ * force_normal_mag, norm) * f_tangential_direction,
         )
 
         # Set the tangential force to zero if there is no contact.

{jaxsim-0.5.1.dev91 → jaxsim-0.5.1.dev95}/src/jaxsim/terrain/terrain.py

@@ -7,6 +7,7 @@ import jax.numpy as jnp
 import jax_dataclasses
 import numpy as np
 
+import jaxsim.math
 import jaxsim.typing as jtp
 from jaxsim import exceptions
 
@@ -41,7 +42,7 @@ class Terrain(abc.ABC):
             [(h_xm - h_xp) / (2 * self.delta), (h_ym - h_yp) / (2 * self.delta), 1.0]
         )
 
-        return n / jnp.linalg.norm(n)
+        return n / jaxsim.math.safe_norm(n)
 
 
 @jax_dataclasses.pytree_dataclass

{jaxsim-0.5.1.dev91 → jaxsim-0.5.1.dev95}/src/jaxsim.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaxsim
-Version: 0.5.1.dev91
+Version: 0.5.1.dev95
 Summary: A differentiable physics engine and multibody dynamics library for control and robot learning.
 Author-email: Diego Ferigo <dgferigo@gmail.com>, Filippo Luca Ferretti <filippoluca.ferretti@outlook.com>
 Maintainer-email: Filippo Luca Ferretti <filippo.ferretti@iit.it>, Alessandro Croci <alessandro.croci@iit.it>

{jaxsim-0.5.1.dev91 → jaxsim-0.5.1.dev95}/src/jaxsim.egg-info/SOURCES.txt

@@ -75,6 +75,7 @@ src/jaxsim/math/quaternion.py
 src/jaxsim/math/rotation.py
 src/jaxsim/math/skew.py
 src/jaxsim/math/transform.py
+src/jaxsim/math/utils.py
 src/jaxsim/mujoco/__init__.py
 src/jaxsim/mujoco/__main__.py
 src/jaxsim/mujoco/loaders.py

{jaxsim-0.5.1.dev91 → jaxsim-0.5.1.dev95}/tests/test_automatic_differentiation.py

@@ -2,6 +2,7 @@ import os
 
 import jax
 import jax.numpy as jnp
+import numpy as np
 from jax.test_util import check_grads
 
 import jaxsim.api as js
@@ -413,3 +414,45 @@ def test_ad_integration(
         modes=["rev", "fwd"],
         eps=ε,
     )
+
+
+def test_ad_safe_norm(
+    prng_key: jax.Array,
+):
+
+    _, subkey = jax.random.split(prng_key, num=2)
+    array = jax.random.uniform(subkey, shape=(4,), minval=-5, maxval=5)
+
+    # ====
+    # Test
+    # ====
+
+    # Test that the safe_norm function is compatible with batching.
+    array = jnp.stack([array, array])
+    assert jaxsim.math.safe_norm(array, axis=1).shape == (2,)
+
+    # Test that the safe_norm function is correctly computing the norm.
+    assert np.allclose(jaxsim.math.safe_norm(array), np.linalg.norm(array))
+
+    # Function exposing only the parameters to be differentiated.
+    def safe_norm(array: jtp.Array) -> jtp.Array:
+
+        return jaxsim.math.safe_norm(array)
+
+    # Check derivatives against finite differences.
+    check_grads(
+        f=safe_norm,
+        args=(array,),
+        order=AD_ORDER,
+        modes=["rev", "fwd"],
+        eps=ε,
+    )
+
+    # Check derivatives against finite differences when the array is zero.
+    check_grads(
+        f=safe_norm,
+        args=(jnp.zeros_like(array),),
+        order=AD_ORDER,
+        modes=["rev", "fwd"],
+        eps=ε,
+    )