imt-ring 1.6.9__tar.gz → 1.6.11__tar.gz

{imt_ring-1.6.9 → imt_ring-1.6.11}/PKG-INFO

@@ -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 → imt_ring-1.6.11}/pyproject.toml

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

{imt_ring-1.6.9 → imt_ring-1.6.11}/src/imt_ring.egg-info/PKG-INFO

@@ -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 → imt_ring-1.6.11}/src/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,

{imt_ring-1.6.9 → imt_ring-1.6.11}/src/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)])

{imt_ring-1.6.9 → imt_ring-1.6.11}/src/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: