Resolve deprecation warnings in playground.

PiperOrigin-RevId: 771184565
Change-Id: Ic2056ad82a6a0c20897a02ea39c37b3f44a80513
This commit is contained in:
Baruch Tabanpour
2025-06-13 12:27:10 -07:00
committed by Copybara-Service
parent a4ab35c194
commit 41eb966c9b
+11 -8
View File
@@ -477,7 +477,7 @@ def _make_data_contact_jax(
def _make_data_jax( def _make_data_jax(
m: types.Model, m: Union[types.Model, mujoco.MjModel],
device: Optional[jax.Device] = None, device: Optional[jax.Device] = None,
) -> types.Data: ) -> types.Data:
"""Allocate and initialize Data for the JAX implementation.""" """Allocate and initialize Data for the JAX implementation."""
@@ -565,7 +565,7 @@ def _make_data_jax(
def _make_data_c( def _make_data_c(
m: types.Model, m: Union[types.Model, mujoco.MjModel],
device: Optional[jax.Device] = None, device: Optional[jax.Device] = None,
) -> types.Data: ) -> types.Data:
"""Allocate and initialize Data for the C implementation.""" """Allocate and initialize Data for the C implementation."""
@@ -583,11 +583,14 @@ def _make_data_c(
# TODO(stunya): remove the JAX contact from C data. # TODO(stunya): remove the JAX contact from C data.
contact = _make_data_contact_jax(dim, efc_address) contact = _make_data_contact_jax(dim, efc_address)
nflexvert = m.nflexvert def get(m, name: str):
nflexedge = m.nflexedge return getattr(m._impl, name) if hasattr(m, '_impl') else getattr(m, name) # pylint: disable=protected-access
nflexelem = m.nflexelem
nbvh = m.nbvh nflexvert = get(m, 'nflexvert')
nbvhdynamic = m.nbvhdynamic nflexedge = get(m, 'nflexedge')
nflexelem = get(m, 'nflexelem')
nbvh = get(m, 'nbvh')
nbvhdynamic = get(m, 'nbvhdynamic')
zero_impl_fields = { zero_impl_fields = {
'solver_niter': (int_,), 'solver_niter': (int_,),
'cdof': (m.nv, 6, float_), 'cdof': (m.nv, 6, float_),
@@ -627,7 +630,7 @@ def _make_data_c(
'qLDiagInv': (m.nv, float_), 'qLDiagInv': (m.nv, float_),
'ten_velocity': (m.ntendon, float_), 'ten_velocity': (m.ntendon, float_),
'actuator_velocity': (m.nu, float_), 'actuator_velocity': (m.nu, float_),
'plugin_data': (m.nplugin, np.uint64), 'plugin_data': (get(m, 'nplugin'), np.uint64),
'B_rownnz': (m.nbody, np.int32), 'B_rownnz': (m.nbody, np.int32),
'B_rowadr': (m.nbody, np.int32), 'B_rowadr': (m.nbody, np.int32),
'B_colind': (m.nB, np.int32), 'B_colind': (m.nB, np.int32),