[JAX] Replace jnp.clip(..., a_min=..., a_max=...) with jnp.clip(..., min=..., max=...).
a_min and a_max are deprecated parameter names to jax.numpy.clip. PiperOrigin-RevId: 891786675 Change-Id: Icc06efe0381c0db06f4aeb16f281a4d01ea37539
This commit is contained in:
committed by
Copybara-Service
parent
5107c31c06
commit
47264877a1
@@ -276,7 +276,7 @@ def _contact_groups(m: Model, d: Data) -> Dict[FunctionKey, Contact]:
|
||||
# pair contacts get their params from m.pair_* fields
|
||||
params.append((
|
||||
m.pair_margin[ip] - m.pair_gap[ip],
|
||||
jp.clip(m.pair_friction[ip], a_min=eps),
|
||||
jp.clip(m.pair_friction[ip], min=eps),
|
||||
m.pair_solref[ip],
|
||||
m.pair_solreffriction[ip],
|
||||
m.pair_solimp[ip],
|
||||
|
||||
@@ -301,7 +301,7 @@ def _next_activation(m: Model, d: Data, act_dot: jax.Array) -> jax.Array:
|
||||
|
||||
def fn(dyntype, dynprm, act, act_dot, actrange):
|
||||
if dyntype == DynType.FILTEREXACT:
|
||||
tau = jp.clip(dynprm[0], a_min=mujoco.mjMINVAL)
|
||||
tau = jp.clip(dynprm[0], min=mujoco.mjMINVAL)
|
||||
act = act + act_dot * tau * (1 - jp.exp(-m.opt.timestep / tau))
|
||||
else:
|
||||
act = act + act_dot * m.opt.timestep
|
||||
|
||||
@@ -174,7 +174,7 @@ def _inertia_box_fluid_model(
|
||||
|
||||
box = jp.repeat(inertia[None, :], 3, axis=0)
|
||||
box *= jp.ones((3, 3)) - 2 * jp.eye(3)
|
||||
box = 6.0 * jp.clip(jp.sum(box, axis=-1), a_min=1e-12)
|
||||
box = 6.0 * jp.clip(jp.sum(box, axis=-1), min=1e-12)
|
||||
box = jp.sqrt(box / jp.maximum(mass, 1e-12)) * (mass > 0.0)
|
||||
|
||||
# transform to local coordinate frame
|
||||
|
||||
Reference in New Issue
Block a user