nshtrainer 0.4.2__tar.gz → 0.5.1__tar.gz

{nshtrainer-0.4.2 → nshtrainer-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nshtrainer
-Version: 0.4.2
+Version: 0.5.1
 Summary: 
 Author: Nima Shoghi
 Author-email: nimashoghi@gmail.com
@@ -13,7 +13,7 @@ Requires-Dist: lightning
 Requires-Dist: lovely-numpy (>=0.2.13,<0.3.0)
 Requires-Dist: lovely-tensors (>=0.1.16,<0.2.0)
 Requires-Dist: nshconfig (>=0.2.0,<0.3.0)
-Requires-Dist: nshrunner (>=0.5.5,<0.6.0)
+Requires-Dist: nshrunner (>=0.6.1,<0.7.0)
 Requires-Dist: nshutils (>=0.3.0,<0.4.0)
 Requires-Dist: numpy
 Requires-Dist: pytorch-lightning

{nshtrainer-0.4.2 → nshtrainer-0.5.1}/pyproject.toml

@@ -1,13 +1,13 @@
 [tool.poetry]
 name = "nshtrainer"
-version = "0.4.2"
+version = "0.5.1"
 description = ""
 authors = ["Nima Shoghi <nimashoghi@gmail.com>"]
 readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.10"
-nshrunner = "^0.5.5"
+nshrunner = "^0.6.1"
 nshconfig = "^0.2.0"
 torch = "*"
 typing-extensions = "*"

{nshtrainer-0.4.2 → nshtrainer-0.5.1}/src/nshtrainer/runner.py

@@ -1,11 +1,11 @@
 import copy
 import functools
-from collections.abc import Callable, Mapping, Sequence
+from collections.abc import Mapping, Sequence
 from typing import Generic
 
-from nshrunner import RunInfo
+from nshrunner import RunInfo, RunList, TransformFn
 from nshrunner import Runner as _Runner
-from nshrunner._runner import SnapshotArgType
+from nshrunner.snapshot import SnapshotArgType
 from typing_extensions import TypeVar, TypeVarTuple, Unpack, override
 
 from .model.config import BaseConfig
@@ -46,33 +46,49 @@ class Runner(
 
     def fast_dev_run(
         self,
-        runs: Sequence[tuple[TConfig, Unpack[TArguments]]],
+        runs: RunList[TConfig, Unpack[TArguments]],
         n_batches: int = 1,
         *,
         env: Mapping[str, str] | None = None,
-        transforms: list[
-            Callable[[TConfig, Unpack[TArguments]], tuple[TConfig, Unpack[TArguments]]]
-        ]
-        | None = None,
+        transforms: list[TransformFn[TConfig, Unpack[TArguments]]] | None = None,
     ):
         transforms = transforms or []
         transforms.append(
             functools.partial(self._fast_dev_run_transform, n_batches=n_batches)
         )
-        return self.local(runs, env=env, transforms=transforms)
+        return self.local(
+            runs,
+            env=env,
+            transforms=transforms,
+        )
+
+    def fast_dev_run_generator(
+        self,
+        runs: RunList[TConfig, Unpack[TArguments]],
+        n_batches: int = 1,
+        *,
+        env: Mapping[str, str] | None = None,
+        transforms: list[TransformFn[TConfig, Unpack[TArguments]]] | None = None,
+    ):
+        transforms = transforms or []
+        transforms.append(
+            functools.partial(self._fast_dev_run_transform, n_batches=n_batches)
+        )
+        return self.local_generator(
+            runs,
+            env=env,
+            transforms=transforms,
+        )
 
     def fast_dev_run_session(
         self,
-        runs: Sequence[tuple[TConfig, Unpack[TArguments]]],
+        runs: RunList[TConfig, Unpack[TArguments]],
         n_batches: int = 1,
         *,
         snapshot: SnapshotArgType,
         setup_commands: Sequence[str] | None = None,
         env: Mapping[str, str] | None = None,
-        transforms: list[
-            Callable[[TConfig, Unpack[TArguments]], tuple[TConfig, Unpack[TArguments]]]
-        ]
-        | None = None,
+        transforms: list[TransformFn[TConfig, Unpack[TArguments]]] | None = None,
         activate_venv: bool = True,
         session_name: str = "nshrunner",
         attach: bool = True,