imt-ring 1.6.9__py3-none-any.whl → 1.6.11__py3-none-any.whl

{imt_ring-1.6.9.dist-info → imt_ring-1.6.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imt-ring
-Version: 1.6.9
+Version: 1.6.11
 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.6.9.dist-info → imt_ring-1.6.11.dist-info}/RECORD

@@ -14,8 +14,8 @@ ring/algorithms/custom_joints/rr_imp_joint.py,sha256=_YJK0p8_0MHFtr1NuGnNZoxTbwa
 ring/algorithms/custom_joints/rr_joint.py,sha256=jnRtjtOCALMaq2_0bcu2d7qgfQ6etXpoh43MioRaDmY,1000
 ring/algorithms/custom_joints/suntay.py,sha256=tOEGM304XciHO4pmvxr4faA4xXVO4N2HlPdFmXKbcrw,16726
 ring/algorithms/generator/__init__.py,sha256=bF-CW3x2x-o6KWESKy-DuxzZPh3UNSjJb_MaAcSHGsQ,277
-ring/algorithms/generator/base.py,sha256=YKUr9UnjFbWAYjP8V1j0FaKGVpK92W6E1iuoet7qBNg,14522
-ring/algorithms/generator/batch.py,sha256=ylootnXmj-JyuB_f5OCknHst9wFKO3gkjQbMrFNXY2g,2513
+ring/algorithms/generator/base.py,sha256=LRAKxzrwq6fp4lgVw6IUg4i7isx3iqJLHvpFK1aTRcg,15732
+ring/algorithms/generator/batch.py,sha256=9yFxVv11hij-fJXGPxA3zEh1bE2_jrZk0R7kyGaiM5c,2551
 ring/algorithms/generator/finalize_fns.py,sha256=LUw1Wc2YrmMRRh4RF704ob3bZOXktAZAbbLoBm_p1yw,9131
 ring/algorithms/generator/motion_artifacts.py,sha256=2VJbldVDbI3PSyboshIbtYvSAKzBBwGV7cQfYjqvluM,9167
 ring/algorithms/generator/pd_control.py,sha256=XJ_Gd5AkIRh-jBrMfQyMXjVwhx2gCNHznjzFbmAwhZs,5767
@@ -50,7 +50,7 @@ ring/io/xml/from_xml.py,sha256=8b44sPVWgoY8JGJZLpJ8M_eLfcfu3IsMtBzSytPTPmw,9234
 ring/io/xml/test_from_xml.py,sha256=bckVrVVmEhCwujd_OF9FGYnX3zU3BgztpqGxxmd0htM,1562
 ring/io/xml/test_to_xml.py,sha256=NGn4VSiFdwhYN5YTBduWMiY9B5dwtxZhCQAR_PXeqKU,946
 ring/io/xml/to_xml.py,sha256=fohb-jWMf2cxVdT5dmknsGyrNMseICSbKEz_urbaWbQ,3407
-ring/ml/__init__.py,sha256=8SZTCs9rJ1kzR0Psh7lUzFhIMhKRPIK41mVfxJAGyMo,1471
+ring/ml/__init__.py,sha256=nbh48gaswWeY4S4vT1sply_3ROj2DQ7agjoLR4Ho3T8,1517
 ring/ml/base.py,sha256=lfwEZLBDglOSRWChUHoH1kezefhttPV9TMEpNIqsMNw,9972
 ring/ml/callbacks.py,sha256=W19QF6_uvaNCjs8ObsjNXD7mv9gFgJBixdRSbB_BynE,13301
 ring/ml/ml_utils.py,sha256=GooyH5uxA6cJM7ZcWDUfSkSKq6dg7kCIbhkbjJs_rLw,6674
@@ -83,7 +83,7 @@ ring/utils/randomize_sys.py,sha256=G_vBIo0OwQkXL2u0djwbaoaeb02C4LQCTNNloOYIU2M,3
 ring/utils/utils.py,sha256=oGC7kh19s5zvmnUvWy8B3fBl9loVU58ppz91osk2m3w,6550
 ring/utils/register_gym_envs/__init__.py,sha256=PtPIRBQJ16339xZ9G9VpvqrvcGbQ_Pk_SUz4tQPa9nQ,94
 ring/utils/register_gym_envs/saddle.py,sha256=tA5CyW_akSXyDm0xJ83CtOrUMVElH0f9vZtEDDJQalI,4422
-imt_ring-1.6.9.dist-info/METADATA,sha256=kFg-Ht8PsdnYA5lvEQ-KgMxlQSqiX_PtP8M8Q0vjVag,3820
-imt_ring-1.6.9.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-imt_ring-1.6.9.dist-info/top_level.txt,sha256=EiT790-lAyi8iwTzJArH3f2k77rwhDn00q-4PlmvDQo,5
-imt_ring-1.6.9.dist-info/RECORD,,
+imt_ring-1.6.11.dist-info/METADATA,sha256=kkQfOD5LOSzB4lR7LvkHeck6fB_KPNrSKIsvPizJAKI,3821
+imt_ring-1.6.11.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+imt_ring-1.6.11.dist-info/top_level.txt,sha256=EiT790-lAyi8iwTzJArH3f2k77rwhDn00q-4PlmvDQo,5
+imt_ring-1.6.11.dist-info/RECORD,,

{imt_ring-1.6.9.dist-info → imt_ring-1.6.11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (73.0.1)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

ring/algorithms/generator/base.py

@@ -1,3 +1,4 @@
+from functools import partial
 import random
 from typing import Callable, Optional
 import warnings
@@ -6,6 +7,7 @@ import jax
 import jax.numpy as jnp
 import numpy as np
 import tree_utils
+from tree_utils import PyTree
 
 from ring import base
 from ring import utils
@@ -143,9 +145,7 @@ class RCMG:
 
         return n_calls
 
-    def to_list(
-        self, sizes: int | list[int] = 1, seed: int = 1
-    ) -> list[tree_utils.PyTree[np.ndarray]]:
+    def _generators_ncalls(self, sizes: int | list[int] = 1):
         "Returns list of unbatched sequences as numpy arrays."
         repeats = self._compute_repeats(sizes)
         sizes = list(jnp.array(repeats) * jnp.array(self._size_of_generators))
@@ -165,7 +165,47 @@ class RCMG:
                 batch.generators_lazy([self.gens[i]], [reduced_repeats[i]], jits[i])
             )
 
-        return batch.generators_eager_to_list(gens, n_calls, seed, self._disable_tqdm)
+        return gens, n_calls
+
+    def to_list(
+        self, sizes: int | list[int] = 1, seed: int = 1
+    ) -> list[tree_utils.PyTree[np.ndarray]]:
+        "Returns list of unbatched sequences as numpy arrays."
+        gens, n_calls = self._generators_ncalls(sizes)
+
+        data = []
+        batch.generators_eager(
+            gens, n_calls, lambda d: data.extend(d), seed, self._disable_tqdm
+        )
+        return data
+
+    def to_folder(
+        self,
+        path: str,
+        sizes: int | list[int] = 1,
+        seed: int = 1,
+        overwrite: bool = True,
+        file_prefix: str = "seq",
+        save_fn: Callable[[PyTree[np.ndarray], str], None] = partial(
+            utils.pickle_save, overwrite=True
+        ),
+        verbose: bool = True,
+    ):
+
+        i = 0
+
+        def callback(data: list[PyTree[np.ndarray]]) -> None:
+            nonlocal i
+            data = utils.replace_elements_w_nans(data, verbose=verbose)
+            for d in data:
+                file = utils.parse_path(
+                    path, file_prefix + str(i), file_exists_ok=overwrite
+                )
+                save_fn(d, file)
+                i += 1
+
+        gens, n_calls = self._generators_ncalls(sizes)
+        batch.generators_eager(gens, n_calls, callback, seed, self._disable_tqdm)
 
     def to_pickle(
         self,

ring/algorithms/generator/batch.py

@@ -1,8 +1,10 @@
+from typing import Callable
+
 import jax
 import jax.numpy as jnp
 import numpy as np
 from tqdm import tqdm
-import tree_utils
+from tree_utils import PyTree
 
 from ring import utils
 from ring.algorithms.generator import types
@@ -50,15 +52,15 @@ def generators_lazy(
     return generator
 
 
-def generators_eager_to_list(
+def generators_eager(
     generators: list[types.BatchedGenerator],
     n_calls: list[int],
+    callback: Callable[[list[PyTree[np.ndarray]]], None],
     seed: int = 1,
     disable_tqdm: bool = False,
-) -> list[tree_utils.PyTree]:
+) -> None:
 
     key = jax.random.PRNGKey(seed)
-    data = []
     for gen, n_call in tqdm(
         zip(generators, n_calls),
         desc="executing generators",
@@ -81,6 +83,4 @@ def generators_eager_to_list(
 
             sample_flat, _ = jax.tree_util.tree_flatten(sample)
             size = 1 if len(sample_flat) == 0 else sample_flat[0].shape[0]
-            data.extend([jax.tree_map(lambda a: a[i], sample) for i in range(size)])
-
-    return data
+            callback([jax.tree_map(lambda a: a[i], sample) for i in range(size)])

ring/ml/__init__.py

@@ -23,6 +23,7 @@ def RNNO(
     eval: bool = True,
     samp_freq: float | None = None,
     v1: bool = False,
+    scale_X: bool = True,
     **kwargs,
 ):
     assert "message_dim" not in kwargs
@@ -47,7 +48,8 @@ def RNNO(
         **kwargs,
     )
     ringnet = base.NoGraph_FilterWrapper(ringnet, quat_normalize=return_quats)
-    ringnet = base.ScaleX_FilterWrapper(ringnet)
+    if scale_X:
+        ringnet = base.ScaleX_FilterWrapper(ringnet)
     if eval and return_quats:
         ringnet = base.LPF_FilterWrapper(ringnet, _LPF_CUTOFF_FREQ, samp_freq=samp_freq)
     if return_quats: