imt-ring 1.3.7__tar.gz → 1.3.9__tar.gz

{imt_ring-1.3.7 → imt_ring-1.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imt-ring
-Version: 1.3.7
+Version: 1.3.9
 Summary: RING: Recurrent Inertial Graph-based Estimator
 Author-email: Simon Bachhuber <simon.bachhuber@fau.de>
 Project-URL: Homepage, https://github.com/SimiPixel/ring

{imt_ring-1.3.7 → imt_ring-1.3.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "imt-ring"
-version = "1.3.7"
+version = "1.3.9"
 authors = [
   { name="Simon Bachhuber", email="simon.bachhuber@fau.de" },
 ]

{imt_ring-1.3.7 → imt_ring-1.3.9}/src/imt_ring.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imt-ring
-Version: 1.3.7
+Version: 1.3.9
 Summary: RING: Recurrent Inertial Graph-based Estimator
 Author-email: Simon Bachhuber <simon.bachhuber@fau.de>
 Project-URL: Homepage, https://github.com/SimiPixel/ring

{imt_ring-1.3.7 → imt_ring-1.3.9}/src/imt_ring.egg-info/SOURCES.txt

@@ -64,6 +64,7 @@ src/ring/ml/callbacks.py
 src/ring/ml/ml_utils.py
 src/ring/ml/optimizer.py
 src/ring/ml/ringnet.py
+src/ring/ml/rnno_v1.py
 src/ring/ml/train.py
 src/ring/ml/training_loop.py
 src/ring/ml/params/0x13e3518065c21cd8.pickle

{imt_ring-1.3.7 → imt_ring-1.3.9}/src/ring/algorithms/dynamics.py

@@ -1,7 +1,9 @@
 from typing import Optional, Tuple
+import warnings
 
 import jax
 import jax.numpy as jnp
+
 from ring import algebra
 from ring import base
 from ring import maths
@@ -213,7 +215,7 @@ def forward_dynamics(
     q: jax.Array,
     qd: jax.Array,
     tau: jax.Array,
-    mass_mat_inv: jax.Array,
+    # mass_mat_inv: jax.Array,
 ) -> Tuple[jax.Array, jax.Array]:
     C = inverse_dynamics(sys, qd, jnp.zeros_like(qd))
     mass_matrix = compute_mass_matrix(sys)
@@ -235,6 +237,11 @@ def forward_dynamics(
 
         mass_mat_inv = jax.scipy.linalg.solve(mass_matrix, eye, assume_a="pos")
     else:
+        warnings.warn(
+            f"You are using `sys.mass_mat_iters`={sys.mass_mat_iters} which is >0. "
+            "This feature is currently not fully supported. See the local TODO."
+        )
+        mass_mat_inv = jnp.diag(jnp.ones((sys.qd_size(),)))
         mass_mat_inv = _inv_approximate(mass_matrix, mass_mat_inv, sys.mass_mat_iters)
 
     return mass_mat_inv @ qf_smooth, mass_mat_inv
@@ -254,9 +261,8 @@ def _strapdown_integration(
 def _semi_implicit_euler_integration(
     sys: base.System, state: base.State, taus: jax.Array
 ) -> base.State:
-    qdd, mass_mat_inv = forward_dynamics(
-        sys, state.q, state.qd, taus, state.mass_mat_inv
-    )
+    qdd, mass_mat_inv = forward_dynamics(sys, state.q, state.qd, taus)
+    del mass_mat_inv
     qd_next = state.qd + sys.dt * qdd
 
     q_next = []
@@ -277,7 +283,7 @@ def _semi_implicit_euler_integration(
     sys.scan(q_integrate, "qdl", state.q, qd_next, sys.link_types)
     q_next = jnp.concatenate(q_next)
 
-    state = state.replace(q=q_next, qd=qd_next, mass_mat_inv=mass_mat_inv)
+    state = state.replace(q=q_next, qd=qd_next)
     return state
 
 

{imt_ring-1.3.7 → imt_ring-1.3.9}/src/ring/algorithms/generator/base.py

@@ -4,6 +4,7 @@ import warnings
 
 import jax
 import jax.numpy as jnp
+import tqdm
 import tree_utils
 
 from ring import base
@@ -83,10 +84,14 @@ class RCMG:
             ), "If `randomize_anchors`, then only one system is expected"
             sys = randomize.randomize_anchors(sys[0], **randomize_anchors_kwargs)
 
-        zip_sys_config = False
         if randomize_hz:
-            zip_sys_config = True
             sys, config = randomize.randomize_hz(sys, config, **randomize_hz_kwargs)
+        else:
+            # create zip
+            N_sys = len(sys)
+            sys = sum([len(config) * [s] for s in sys], start=[])
+            config = N_sys * config
+            assert len(sys) == len(config)
 
         if sys_ml is None:
             # TODO
@@ -97,17 +102,10 @@ class RCMG:
             sys_ml = sys[0]
 
         self.gens = []
-        if zip_sys_config:
-            for _sys, _config in zip(sys, config):
-                self.gens.append(
-                    partial_build_gen(sys=_sys, config=_config, sys_ml=sys_ml)
-                )
-        else:
-            for _sys in sys:
-                for _config in config:
-                    self.gens.append(
-                        partial_build_gen(sys=_sys, config=_config, sys_ml=sys_ml)
-                    )
+        for _sys, _config in tqdm.tqdm(
+            zip(sys, config), desc="building generators", total=len(sys)
+        ):
+            self.gens.append(partial_build_gen(sys=_sys, config=_config, sys_ml=sys_ml))
 
     def _to_data(self, sizes, seed):
         return batch.batch_generators_eager_to_list(self.gens, sizes, seed=seed)

{imt_ring-1.3.7 → imt_ring-1.3.9}/src/ring/algorithms/generator/batch.py

@@ -86,7 +86,11 @@ def batch_generators_eager_to_list(
 
     key = jax.random.PRNGKey(seed)
     data = []
-    for gen, size in tqdm(zip(generators, sizes), desc="eager data generation"):
+    for gen, size in tqdm(
+        zip(generators, sizes),
+        desc="executing generators",
+        total=len(sizes),
+    ):
 
         n_calls = _number_of_executions_required(size)
         # decrease size by n_calls times
@@ -147,7 +151,7 @@ def _data_fn_from_paths(
     paths = [utils.parse_path(p, mkdir=False) for p in paths]
 
     extensions = list(set([Path(p).suffix for p in paths]))
-    assert len(extensions) == 1
+    assert len(extensions) == 1, f"{extensions}"
 
     if extensions[0] == ".h5":
         N = sum([utils.hdf5_load_length(p) for p in paths])

{imt_ring-1.3.7 → imt_ring-1.3.9}/src/ring/algorithms/generator/motion_artifacts.py

@@ -49,6 +49,7 @@ def inject_subsystems(
     rotational_damp: float = 0.1,
     translational_stif: float = 50.0,
     translational_damp: float = 0.1,
+    disable_warning: bool = False,
     **kwargs,
 ) -> base.System:
     imu_idx_to_name_map = {sys.name_to_idx(imu): imu for imu in sys.findall_imus()}
@@ -92,10 +93,11 @@ def inject_subsystems(
     # TODO set all joint_params to zeros; they can not be preserved anyways and
     # otherwise many warnings will be rose
     # instead warn explicitly once now and move on
-    warnings.warn(
-        "`sys.links.joint_params` has been set to zero, this might lead to "
-        "unexpected behaviour unless you use `randomize_joint_params`"
-    )
+    if not disable_warning:
+        warnings.warn(
+            "`sys.links.joint_params` has been set to zero, this might lead to "
+            "unexpected behaviour unless you use `randomize_joint_params`"
+        )
     joint_params_zeros = tree_utils.tree_zeros_like(sys.links.joint_params)
     sys = sys.replace(links=sys.links.replace(joint_params=joint_params_zeros))
 
@@ -180,9 +182,13 @@ def setup_fn_randomize_damping_stiffness_factory(
             link_spring_stiffness = link_spring_stiffness.at[slice].set(stif)
             link_damping = link_damping.at[slice].set(damp)
 
-        assert len(imus_surely_rigid) == len(triggered_surely_rigid)
+        assert len(imus_surely_rigid) == len(
+            triggered_surely_rigid
+        ), f"{imus_surely_rigid}, {triggered_surely_rigid}"
         for imu_surely_rigid in imus_surely_rigid:
-            assert imu_surely_rigid in triggered_surely_rigid
+            assert (
+                imu_surely_rigid in triggered_surely_rigid
+            ), f"{imus_surely_rigid} not in {triggered_surely_rigid}"
 
         return sys.replace(
             link_damping=link_damping, link_spring_stiffness=link_spring_stiffness

{imt_ring-1.3.7 → imt_ring-1.3.9}/src/ring/algorithms/generator/pd_control.py

@@ -4,6 +4,7 @@ from typing import Optional
 from flax import struct
 import jax
 import jax.numpy as jnp
+
 from ring import base
 from ring.algorithms import dynamics
 from ring.algorithms import jcalc
@@ -49,7 +50,7 @@ def _pd_control(P: jax.Array, D: Optional[jax.Array] = None):
         assert sys.q_size() == q_ref.shape[1], f"q_ref.shape = {q_ref.shape}"
         assert sys.qd_size() == P.size
         if D is not None:
-            sys.qd_size() == D.size
+            assert sys.qd_size() == D.size
 
         q_ref_as_dict = {}
         qd_ref_as_dict = {}

{imt_ring-1.3.7 → imt_ring-1.3.9}/src/ring/base.py

@@ -997,13 +997,11 @@ class State(_Base):
         q (jax.Array): System state in minimal coordinates (equals `sys.q_size()`)
         qd (jax.Array): System velocity in minimal coordinates (equals `sys.qd_size()`)
         x: (Transform): Maximal coordinates of all links. From epsilon-to-link.
-        mass_mat_inv (jax.Array): Inverse of the mass matrix. Internal usage.
     """
 
     q: jax.Array
     qd: jax.Array
     x: Transform
-    mass_mat_inv: jax.Array
 
     @classmethod
     def create(
@@ -1057,4 +1055,4 @@ class State(_Base):
         if x is None:
             x = Transform.zero((sys.num_links(),))
 
-        return cls(q, qd, x, jnp.diag(jnp.ones((sys.qd_size(),))))
+        return cls(q, qd, x)

{imt_ring-1.3.7 → imt_ring-1.3.9}/src/ring/ml/__init__.py

@@ -3,6 +3,7 @@ from . import callbacks
 from . import ml_utils
 from . import optimizer
 from . import ringnet
+from . import rnno_v1
 from . import train
 from . import training_loop
 from .base import AbstractFilter
@@ -42,17 +43,28 @@ def RNNO(
     params=None,
     eval: bool = True,
     samp_freq: float | None = None,
+    v1: bool = False,
     **kwargs,
 ):
     assert "message_dim" not in kwargs
     assert "link_output_normalize" not in kwargs
     assert "link_output_dim" not in kwargs
 
+    if v1:
+        kwargs.update(
+            dict(forward_factory=rnno_v1.rnno_v1_forward_factory, output_dim=output_dim)
+        )
+    else:
+        kwargs.update(
+            dict(
+                message_dim=0,
+                link_output_normalize=False,
+                link_output_dim=output_dim,
+            )
+        )
+
     ringnet = RING(  # noqa: F811
         params=params,
-        message_dim=0,
-        link_output_normalize=False,
-        link_output_dim=output_dim,
         **kwargs,
     )
     ringnet = base.NoGraph_FilterWrapper(ringnet, quat_normalize=return_quats)

{imt_ring-1.3.7 → imt_ring-1.3.9}/src/ring/ml/callbacks.py

@@ -245,7 +245,8 @@ class SaveParamsTrainingLoopCallback(training_loop.TrainingLoopCallback):
             else:
                 value = "{:.2f}".format(ele.value).replace(".", ",")
                 filename = parse_path(
-                    self.path_to_file + f"_episode={ele.episode}_value={value}",
+                    str(Path(self.path_to_file).with_suffix(""))
+                    + f"_episode={ele.episode}_value={value}",
                     extension="pickle",
                 )
 
@@ -404,7 +405,7 @@ class CheckpointCallback(training_loop.TrainingLoopCallback):
         # only checkpoint if run has been killed
         if training_loop.recv_kill_run_signal():
             path = parse_path(
-                "~/.xxy_checkpoints", ml_utils.unique_id(), extension="pickle"
+                "~/.ring_checkpoints", ml_utils.unique_id(), extension="pickle"
             )
             data = {"params": self.params, "opt_state": self.opt_state}
             pickle_save(

{imt_ring-1.3.7 → imt_ring-1.3.9}/src/ring/ml/ringnet.py

@@ -191,8 +191,16 @@ class LSTM(hk.RNNCore):
 
 
 class RING(ml_base.AbstractFilter):
-    def __init__(self, params=None, lam=None, jit: bool = True, name=None, **kwargs):
-        self.forward_lam_factory = partial(make_ring, **kwargs)
+    def __init__(
+        self,
+        params=None,
+        lam=None,
+        jit: bool = True,
+        name=None,
+        forward_factory=make_ring,
+        **kwargs,
+    ):
+        self.forward_lam_factory = partial(forward_factory, **kwargs)
         self.params = self._load_params(params)
         self.lam = lam
         self._name = name

imt_ring-1.3.9/src/ring/ml/rnno_v1.py

@@ -0,0 +1,41 @@
+from typing import Optional, Sequence
+
+import haiku as hk
+import jax
+import jax.numpy as jnp
+
+
+def rnno_v1_forward_factory(
+    output_dim: int,
+    rnn_layers: Sequence[int] = (400, 300),
+    linear_layers: Sequence[int] = (200, 100, 50, 50, 25, 25),
+    layernorm: bool = True,
+    act_fn_linear=jax.nn.relu,
+    act_fn_rnn=jax.nn.elu,
+    lam: Optional[tuple[int]] = None,
+):
+    # unused
+    del lam
+
+    @hk.without_apply_rng
+    @hk.transform_with_state
+    def forward_fn(X):
+        assert X.shape[-2] == 1
+
+        for i, n_units in enumerate(rnn_layers):
+            state = hk.get_state(f"rnn_{i}", shape=[1, n_units], init=jnp.zeros)
+            X, state = hk.dynamic_unroll(hk.GRU(n_units), X, state)
+            hk.set_state(f"rnn_{i}", state)
+
+            if layernorm:
+                X = hk.LayerNorm(axis=-1, create_scale=False, create_offset=False)(X)
+            X = act_fn_rnn(X)
+
+        for n_units in linear_layers:
+            X = hk.Linear(n_units)(X)
+            X = act_fn_linear(X)
+
+        y = hk.Linear(output_dim)(X)
+        return y[..., None, :]
+
+    return forward_fn

{imt_ring-1.3.7 → imt_ring-1.3.9}/src/ring/ml/train.py

@@ -15,7 +15,6 @@ from ring.ml import ml_utils
 from ring.ml import training_loop
 from ring.utils import distribute_batchsize
 from ring.utils import expand_batchsize
-from ring.utils import parse_path
 from ring.utils import pickle_load
 import wandb
 
@@ -217,7 +216,7 @@ def train_fn(
 
         callbacks_all.append(
             ml_callbacks.SaveParamsTrainingLoopCallback(
-                path_to_file=parse_path(callback_save_params, extension=""),
+                path_to_file=callback_save_params,
                 last_n_params=3,
                 track_metrices=callback_save_params_track_metrices,
                 cleanup=False,