imt-ring 1.3.11__py3-none-any.whl → 1.3.13__py3-none-any.whl

{imt_ring-1.3.11.dist-info → imt_ring-1.3.13.dist-info}/METADATA

@@ -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.dist-info → imt_ring-1.3.13.dist-info}/RECORD

@@ -15,7 +15,7 @@ ring/algorithms/custom_joints/rr_joint.py,sha256=jnRtjtOCALMaq2_0bcu2d7qgfQ6etXp
 ring/algorithms/custom_joints/suntay.py,sha256=7-kym1kMDwqYD_2um1roGcBeB8BlTCPe1wljuNGNARA,16676
 ring/algorithms/generator/__init__.py,sha256=p4ucl0zQtp5NwNoXIRjmTzGGRu2WOAWFfNmYRPwQles,912
 ring/algorithms/generator/base.py,sha256=sr-YZkjd8pZJAI5vFG_IqOO4AEeiEYtXr8uUsPMS6Q4,14779
-ring/algorithms/generator/batch.py,sha256=bslFSN2Gs_aX9cNwFooExhKUwevc70q3bspEMTwygm4,9256
+ring/algorithms/generator/batch.py,sha256=MmnvAeMaHowGZjla7djQeER6YwXvFesLdP__FMosUqo,9385
 ring/algorithms/generator/motion_artifacts.py,sha256=_kiAl1VHoX1fW5AUlXOtPBWyHIIFof_M78AP-m9f1ME,8790
 ring/algorithms/generator/pd_control.py,sha256=XJ_Gd5AkIRh-jBrMfQyMXjVwhx2gCNHznjzFbmAwhZs,5767
 ring/algorithms/generator/randomize.py,sha256=G_vBIo0OwQkXL2u0djwbaoaeb02C4LQCTNNloOYIU2M,3699
@@ -79,7 +79,7 @@ ring/utils/hdf5.py,sha256=BzXwVypZmEZeHVgeGZ78YYdi10NEQtnPhdrb8dQAXo0,5856
 ring/utils/normalizer.py,sha256=67L2BU1MRsMT4pD41ta3JJMppLN0ozFmnwrmXDtnqrQ,1698
 ring/utils/path.py,sha256=hAfSlqRi-ew536RnjDDM7IKapdMJc-EvhrR0Y-BCFWc,1265
 ring/utils/utils.py,sha256=mIcKNv5v2de8HrG7bAhl2bNfmwkMZyIIwFkJq2XWMOI,5357
-imt_ring-1.3.11.dist-info/METADATA,sha256=5-bAEaCMi5JiwNMOEshFJlV1ISU3840hImimdj7l2CU,3105
-imt_ring-1.3.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-imt_ring-1.3.11.dist-info/top_level.txt,sha256=EiT790-lAyi8iwTzJArH3f2k77rwhDn00q-4PlmvDQo,5
-imt_ring-1.3.11.dist-info/RECORD,,
+imt_ring-1.3.13.dist-info/METADATA,sha256=29lL2WaS8JaByX0qyjVm-OMC916Xs8U1A7pRyybHSrA,3105
+imt_ring-1.3.13.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+imt_ring-1.3.13.dist-info/top_level.txt,sha256=EiT790-lAyi8iwTzJArH3f2k77rwhDn00q-4PlmvDQo,5
+imt_ring-1.3.13.dist-info/RECORD,,

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 = [