nshtrainer 1.3.0__tar.gz → 1.3.2__tar.gz

{nshtrainer-1.3.0 → nshtrainer-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nshtrainer
-Version: 1.3.0
+Version: 1.3.2
 Summary: 
 Author: Nima Shoghi
 Author-email: nimashoghi@gmail.com

{nshtrainer-1.3.0 → nshtrainer-1.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nshtrainer"
-version = "1.3.0"
+version = "1.3.2"
 description = ""
 authors = [{ name = "Nima Shoghi", email = "nimashoghi@gmail.com" }]
 requires-python = ">=3.10,<4.0"

{nshtrainer-1.3.0 → nshtrainer-1.3.2}/src/nshtrainer/model/base.py

@@ -85,12 +85,25 @@ def default_split_batched_predictions(
     """
     import torch.utils._pytree as tree
 
-    for sample_idx, batch_idx in enumerate(batch_indices):
+    for i, global_idx in enumerate(batch_indices):
+
+        def _verify_and_index(x: torch.Tensor):
+            # Make sure dim 0 length is equal to the batch size,
+            # otherwise we can't index it and should prompt
+            # the user to implement a splitter
+            if x.shape[0] != len(batch_indices):
+                raise ValueError(
+                    f"Batch size {x.shape[0]} does not match the number of batch indices {len(batch_indices)}. "
+                    "Please implement a custom `split_batched_predictions` method in your LightningModuleBase class."
+                )
+
+            return x[i]
+
         # Create a dictionary for each sample
         yield IndividualSample(
-            index=batch_idx,
-            batch=tree.tree_map(lambda x: x[sample_idx], batch),
-            prediction=tree.tree_map(lambda x: x[sample_idx], prediction),
+            index=global_idx,
+            batch=tree.tree_map(_verify_and_index, batch),
+            prediction=tree.tree_map(_verify_and_index, prediction),
         )
 
 

{nshtrainer-1.3.0 → nshtrainer-1.3.2}/src/nshtrainer/trainer/__init__.py

@@ -1,7 +1,13 @@
 from __future__ import annotations
 
 from ..callbacks import callback_registry as callback_registry
+from ..callbacks.distributed_prediction_writer import (
+    DistributedPredictionReader as DistributedPredictionReader,
+)
 from ._config import TrainerConfig as TrainerConfig
+from ._distributed_prediction_result import (
+    DistributedPredictionResult as DistributedPredictionResult,
+)
 from .accelerator import accelerator_registry as accelerator_registry
 from .plugin import plugin_registry as plugin_registry
 from .trainer import Trainer as Trainer