imt-ring 1.6.29__py3-none-any.whl → 1.6.31__py3-none-any.whl

{imt_ring-1.6.29.dist-info → imt_ring-1.6.31.dist-info}/METADATA

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

@@ -54,7 +54,7 @@ ring/io/xml/to_xml.py,sha256=Wo4iySLw9nM-iVW42AGvMRqjtU2qRc2FD_Zlc7w1IrE,3438
 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=Zm4spN0Xn-2avYu9xt3NikCLVjYM1Gh59a6XU9jGxoU,10792
+ring/ml/ml_utils.py,sha256=M--qkXRnhU7tHvgfTHfT9gyY0nhj3zMGEaK0X0drFLs,10915
 ring/ml/optimizer.py,sha256=TZF0_LmnewzmGVso-zIQJtpWguUW0fW3HeRpIdG_qoI,4763
 ring/ml/ringnet.py,sha256=mef7jyN2QcApJmQGH3HYZyTV-00q8YpsYOKhW0-ku1k,8973
 ring/ml/rnno_v1.py,sha256=2qE08OIvTJ5PvSxKpYGzGSrvEImWrdAT_qslZ7jP5tA,1372
@@ -78,7 +78,7 @@ ring/utils/backend.py,sha256=cKSi9sB59texqKzNVASTDczGKLCBL8VVDiP7TNdj41k,1294
 ring/utils/batchsize.py,sha256=FbOii7MDP4oPZd9GJOKehFatfnb6WZ0b9z349iZYs1A,1786
 ring/utils/colab.py,sha256=ZLHwP0jNQUsmZJU4l68a5djULPi6T-jYNNHevjIoMn8,1631
 ring/utils/dataloader.py,sha256=2CcsbUY2AZs8LraS5HTJXlEseuF-1gKmfyBkSsib-tE,3748
-ring/utils/dataloader_torch.py,sha256=DR2uUiA9x49_6EBjnbVLfWu7GBX7wtKjgHSIlF80HO0,1502
+ring/utils/dataloader_torch.py,sha256=wMKJ-eCJ4cHjisGODOZgDVG2r-XQjSANBQFfC05wpzo,2092
 ring/utils/hdf5.py,sha256=BzXwVypZmEZeHVgeGZ78YYdi10NEQtnPhdrb8dQAXo0,5856
 ring/utils/normalizer.py,sha256=67L2BU1MRsMT4pD41ta3JJMppLN0ozFmnwrmXDtnqrQ,1698
 ring/utils/path.py,sha256=zRPfxYNesvgefkddd26oar6f9433LkMGkhp9dF3rPUs,1926
@@ -86,7 +86,7 @@ ring/utils/randomize_sys.py,sha256=G_vBIo0OwQkXL2u0djwbaoaeb02C4LQCTNNloOYIU2M,3
 ring/utils/utils.py,sha256=tJaWXLGOTwkxJQj2l23dX97wO3aZYhM2qd7eNuMRs84,6907
 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.29.dist-info/METADATA,sha256=2LQEbqA9aoAoMTJbVgd7MAWtdnHYWYv43M1-BhdW84o,4251
-imt_ring-1.6.29.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-imt_ring-1.6.29.dist-info/top_level.txt,sha256=EiT790-lAyi8iwTzJArH3f2k77rwhDn00q-4PlmvDQo,5
-imt_ring-1.6.29.dist-info/RECORD,,
+imt_ring-1.6.31.dist-info/METADATA,sha256=ISL0fShgxIGskumWa3mtqCBcOvOfEtJc4XE8Rt-EJCA,4251
+imt_ring-1.6.31.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+imt_ring-1.6.31.dist-info/top_level.txt,sha256=EiT790-lAyi8iwTzJArH3f2k77rwhDn00q-4PlmvDQo,5
+imt_ring-1.6.31.dist-info/RECORD,,

ring/ml/ml_utils.py

@@ -201,9 +201,14 @@ def on_cluster() -> bool:
     return False if env_var is None else True
 
 
+_unique_id_is_logged = False
+
+
 def unique_id() -> str:
-    if wandb.run is not None:
-        wandb.config.setdefault("unique_id", ring._UNIQUE_ID)
+    global _unique_id_is_logged
+    if wandb.run is not None and _unique_id_is_logged is False:
+        wandb.config["unique_id"] = ring._UNIQUE_ID
+        _unique_id_is_logged = True
     return ring._UNIQUE_ID
 
 

ring/utils/dataloader_torch.py

@@ -1,4 +1,6 @@
 import os
+from typing import Optional
+import warnings
 
 import jax
 import torch
@@ -35,15 +37,20 @@ def dataset_to_generator(
     batch_size: int,
     shuffle=True,
     seed: int = 1,
+    num_workers: Optional[int] = None,
     **kwargs,
 ):
     torch.manual_seed(seed)
 
+    if num_workers is None:
+        num_workers = _get_number_of_logical_cores()
+
     dl = DataLoader(
         dataset,
         batch_size=batch_size,
         shuffle=shuffle,
-        multiprocessing_context="spawn" if kwargs.get("num_workers", 0) > 0 else None,
+        multiprocessing_context="spawn" if num_workers > 0 else None,
+        num_workers=num_workers,
         **kwargs,
     )
     dl_iter = iter(dl)
@@ -60,3 +67,20 @@ def dataset_to_generator(
             return to_numpy(next(dl_iter))
 
     return generator
+
+
+def _get_number_of_logical_cores() -> int:
+    N = None
+    if hasattr(os, "sched_getaffinity"):
+        try:
+            N = len(os.sched_getaffinity(0))
+        except Exception:
+            pass
+    if N is None:
+        N = os.cpu_count()
+    if N is None:
+        warnings.warn(
+            "Could not automatically set the `num_workers` variable, defaults to `0`"
+        )
+        N = 0
+    return N