imt-ring 1.3.11__tar.gz → 1.3.13__tar.gz

{imt_ring-1.3.11 → imt_ring-1.3.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imt-ring
-Version: 1.3.11
+Version: 1.3.13
 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.11 → imt_ring-1.3.13}/pyproject.toml

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

{imt_ring-1.3.11 → imt_ring-1.3.13}/src/imt_ring.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imt-ring
-Version: 1.3.11
+Version: 1.3.13
 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.11 → imt_ring-1.3.13}/src/ring/algorithms/generator/batch.py

@@ -98,7 +98,12 @@ def batch_generators_eager_to_list(
         jit = True if n_calls > 1 else False
         gen_jit = batch_generators_lazy(gen, size, jit=jit)
 
-        for _ in range(n_calls):
+        for _ in tqdm(
+            range(n_calls),
+            desc="number of calls for each generator",
+            total=n_calls,
+            leave=False,
+        ):
             key, consume = jax.random.split(key)
             sample = gen_jit(consume)
             # converts also to numpy; but with np.array.flags.writeable = False
@@ -149,25 +154,20 @@ def _data_fn_from_paths(
 
     # expanduser
     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, f"{extensions}"
+    h5 = extensions[0] == ".h5"
 
-    if extensions[0] == ".h5":
-        N = sum([utils.hdf5_load_length(p) for p in paths])
-
-    if extensions[0] == ".h5" and not load_all_into_memory:
+    if h5 and not load_all_into_memory:
 
         def data_fn(indices: list[int]):
             tree = utils.hdf5_load_from_multiple(paths, indices)
             return tree if tree_transform is None else tree_transform(tree)
 
+        N = sum([utils.hdf5_load_length(p) for p in paths])
     else:
 
-        if extensions[0] == ".h5":
-            load_from_path = utils.hdf5_load
-        else:
-            load_from_path = utils.pickle_load
+        load_from_path = utils.hdf5_load if h5 else utils.pickle_load
 
         def load_fn(path):
             tree = load_from_path(path)
@@ -185,8 +185,10 @@ def _data_fn_from_paths(
                 _list_of_data += load_fn(p)
 
         N = len(_list_of_data)
-
-        list_of_data = _replace_elements_w_nans(_list_of_data, include_samples)
+        list_of_data = _replace_elements_w_nans(
+            _list_of_data,
+            include_samples if include_samples is not None else list(range(N)),
+        )
 
         if include_samples is not None:
             list_of_data = [