nshtrainer 1.0.0b28__py3-none-any.whl → 1.0.0b29__py3-none-any.whl

nshtrainer/metrics/_config.py

@@ -1,12 +1,10 @@
 from __future__ import annotations
 
 import builtins
-from typing import Literal
+from typing import Any, Literal
 
 import nshconfig as C
 
-from ..util._useful_types import SupportsRichComparisonT
-
 
 class MetricConfig(C.Config):
     name: str
@@ -40,5 +38,5 @@ class MetricConfig(C.Config):
     def best(self):
         return builtins.min if self.mode == "min" else builtins.max
 
-    def is_better(self, a: SupportsRichComparisonT, b: SupportsRichComparisonT) -> bool:
+    def is_better(self, a: Any, b: Any):
         return self.best(a, b) == a

nshtrainer/trainer/_config.py

@@ -82,6 +82,13 @@ class PluginConfigBase(C.Config, ABC):
 
 
 plugin_registry = C.Registry(PluginConfigBase, discriminator="name")
+PluginConfig = TypeAliasType(
+    "PluginConfig", Annotated[PluginConfigBase, plugin_registry.DynamicResolution()]
+)
+
+AcceleratorLiteral = TypeAliasType(
+    "AcceleratorLiteral", Literal["cpu", "gpu", "tpu", "ipu", "hpu", "mps", "auto"]
+)
 
 
 class AcceleratorConfigBase(C.Config, ABC):
@@ -90,18 +97,9 @@ class AcceleratorConfigBase(C.Config, ABC):
 
 
 accelerator_registry = C.Registry(AcceleratorConfigBase, discriminator="name")
-
-
-class StrategyConfigBase(C.Config, ABC):
-    @abstractmethod
-    def create_strategy(self) -> Strategy: ...
-
-
-strategy_registry = C.Registry(StrategyConfigBase, discriminator="name")
-
-
-AcceleratorLiteral = TypeAliasType(
-    "AcceleratorLiteral", Literal["cpu", "gpu", "tpu", "ipu", "hpu", "mps", "auto"]
+AcceleratorConfig = TypeAliasType(
+    "AcceleratorConfig",
+    Annotated[AcceleratorConfigBase, accelerator_registry.DynamicResolution()],
 )
 
 StrategyLiteral = TypeAliasType(
@@ -137,6 +135,17 @@ StrategyLiteral = TypeAliasType(
 )
 
 
+class StrategyConfigBase(C.Config, ABC):
+    @abstractmethod
+    def create_strategy(self) -> Strategy: ...
+
+
+strategy_registry = C.Registry(StrategyConfigBase, discriminator="name")
+StrategyConfig = TypeAliasType(
+    "StrategyConfig",
+    Annotated[StrategyConfigBase, strategy_registry.DynamicResolution()],
+)
+
 CheckpointCallbackConfig = TypeAliasType(
     "CheckpointCallbackConfig",
     Annotated[
@@ -578,9 +587,7 @@ class TrainerConfig(C.Config):
     Default: ``False``.
     """
 
-    plugins: (
-        list[Annotated[PluginConfigBase, plugin_registry.DynamicResolution()]] | None
-    ) = None
+    plugins: list[PluginConfig] | None = None
     """
     Plugins allow modification of core behavior like ddp and amp, and enable custom lightning plugins.
         Default: ``None``.
@@ -740,21 +747,13 @@ class TrainerConfig(C.Config):
     Default: ``True``.
     """
 
-    accelerator: (
-        Annotated[AcceleratorConfigBase, accelerator_registry.DynamicResolution()]
-        | AcceleratorLiteral
-        | None
-    ) = None
+    accelerator: AcceleratorConfig | AcceleratorLiteral | None = None
     """Supports passing different accelerator types ("cpu", "gpu", "tpu", "ipu", "hpu", "mps", "auto")
     as well as custom accelerator instances.
     Default: ``"auto"``.
     """
 
-    strategy: (
-        Annotated[StrategyConfigBase, strategy_registry.DynamicResolution()]
-        | StrategyLiteral
-        | None
-    ) = None
+    strategy: StrategyConfig | StrategyLiteral | None = None
     """Supports different training strategies with aliases as well custom strategies.
     Default: ``"auto"``.
     """

{nshtrainer-1.0.0b28.dist-info → nshtrainer-1.0.0b29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nshtrainer
-Version: 1.0.0b28
+Version: 1.0.0b29
 Summary: 
 Author: Nima Shoghi
 Author-email: nimashoghi@gmail.com

{nshtrainer-1.0.0b28.dist-info → nshtrainer-1.0.0b29.dist-info}/RECORD

@@ -104,7 +104,7 @@ nshtrainer/lr_scheduler/_base.py,sha256=EhA2f_WiZ79RcXL2nJbwCwNK620c8ugEVUmJ8CcV
 nshtrainer/lr_scheduler/linear_warmup_cosine.py,sha256=gvUuv031lvWdXboDeH7iAF3ZgNPQK40bQwfmqb11TNk,5492
 nshtrainer/lr_scheduler/reduce_lr_on_plateau.py,sha256=vXH5S26ESHO_LPPqW8aDC3S5NGoZYkXeFjAOgttaUX8,2870
 nshtrainer/metrics/__init__.py,sha256=Nqkn_jsDf3n5WtfMcnaaEftYjIIT2b-S7rmsB1MOMkU,86
-nshtrainer/metrics/_config.py,sha256=kR9OJLZXIaZpG8UpHG3EQwOL36HB8yPk6afYjoIM0XM,1324
+nshtrainer/metrics/_config.py,sha256=XIRokFM8PHrhBa3w2R6BM6a4es3ncsoBqE_LqXQFsFE,1223
 nshtrainer/model/__init__.py,sha256=3G-bwPPSRStWdsdwG9-rn0bXcRpEiP1BiQpF_qavtls,97
 nshtrainer/model/base.py,sha256=JL3AmH17GQjQIoMrZl3O0vUI7dj5ZsO5iEJgoLPyzHw,10356
 nshtrainer/model/mixins/callback.py,sha256=0LPgve4VszHbLipid4mpI1qnnmdGS2spivs0dXLvqHw,3154
@@ -122,12 +122,11 @@ nshtrainer/profiler/advanced.py,sha256=XrM3FX0ThCv5UwUrrH0l4Ow4LGAtpiBww2N8QAU5N
 nshtrainer/profiler/pytorch.py,sha256=8K37XvPnCApUpIK8tA2zNMFIaIiTLSoxKQoiyCPBm1Q,2757
 nshtrainer/profiler/simple.py,sha256=PimjqcU-JuS-8C0ZGHAdwCxgNLij4x0FH6WXsjBQzZs,1005
 nshtrainer/trainer/__init__.py,sha256=MmoydVS6aYeav7zgDAUHxAQrV_PMQsbnZTCuPnLH9Wk,128
-nshtrainer/trainer/_config.py,sha256=Mz9J2ZFqxTlttnRA1eScGRgSAuf3-o3i9-xjN7eTm-k,35256
+nshtrainer/trainer/_config.py,sha256=VD0DfdS-pyQ2nFG83c4u5AUkSAHODmXLX5s2qtvS_to,35400
 nshtrainer/trainer/_runtime_callback.py,sha256=6F2Gq27Q8OFfN3RtdNC6QRA8ac0LC1hh4DUE3V5WgbI,4217
 nshtrainer/trainer/signal_connector.py,sha256=GhfGcSzfaTNhnj2QFkBDq5aT7FqbLMA7eC8SYQs8_8w,10828
 nshtrainer/trainer/trainer.py,sha256=HHqT83zWtYY9g5yD6X9aWrVh5VSpILW8PhoE6fp4snE,20734
 nshtrainer/util/_environment_info.py,sha256=MT8mBe6ZolRfKiwU-les1P-lPNPqXpHQcfADrh_A3uY,24629
-nshtrainer/util/_useful_types.py,sha256=7yd1ajSmjwfmZdBPlHVrIG3iXl1-T3n83JI53N8C7as,8080
 nshtrainer/util/bf16.py,sha256=9QhHZCkYSfYpIcxwAMoXyuh2yTSHBzT-EdLQB297jEs,762
 nshtrainer/util/config/__init__.py,sha256=Z39JJufSb61Lhn2GfVcv3eFW_eorOrN9-9llDWlnZZM,272
 nshtrainer/util/config/dtype.py,sha256=Fn_MhhQoHPyFAnFPSwvcvLiGR3yWFIszMba02CJiC4g,2213
@@ -138,6 +137,6 @@ nshtrainer/util/seed.py,sha256=diMV8iwBKN7Xxt5pELmui-gyqyT80_CZzomrWhNss0k,316
 nshtrainer/util/slurm.py,sha256=HflkP5iI_r4UHMyPjw9R4dD5AHsJUpcfJw5PLvGYBRM,1603
 nshtrainer/util/typed.py,sha256=Xt5fUU6zwLKSTLUdenovnKK0N8qUq89Kddz2_XeykVQ,164
 nshtrainer/util/typing_utils.py,sha256=MjY-CUX9R5Tzat-BlFnQjwl1PQ_W2yZQoXhkYHlJ_VA,442
-nshtrainer-1.0.0b28.dist-info/METADATA,sha256=1MJi65pa7HEVmtDR64Y32SwDe_bv1AZHSgyo6gIBmzo,988
-nshtrainer-1.0.0b28.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-nshtrainer-1.0.0b28.dist-info/RECORD,,
+nshtrainer-1.0.0b29.dist-info/METADATA,sha256=YRehZvU9svmmfAmwFrdmu-Tzxgi_EHbFwrn-ewD8W9c,988
+nshtrainer-1.0.0b29.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+nshtrainer-1.0.0b29.dist-info/RECORD,,

nshtrainer/util/_useful_types.py

@@ -1,316 +0,0 @@
-"""Credit to useful-types from https://github.com/hauntsaninja/useful_types"""
-
-from __future__ import annotations
-
-from collections.abc import Awaitable, Iterable, Iterator, Sequence, Sized
-from collections.abc import Set as AbstractSet
-from os import PathLike
-from typing import Any, TypeVar, overload
-
-from typing_extensions import (
-    Buffer,
-    Literal,
-    Protocol,
-    SupportsIndex,
-    TypeAlias,
-    TypeAliasType,
-)
-
-_KT = TypeVar("_KT")
-_KT_co = TypeVar("_KT_co", covariant=True)
-_KT_contra = TypeVar("_KT_contra", contravariant=True)
-_VT = TypeVar("_VT")
-_VT_co = TypeVar("_VT_co", covariant=True)
-_T = TypeVar("_T")
-_T_co = TypeVar("_T_co", covariant=True)
-_T_contra = TypeVar("_T_contra", contravariant=True)
-
-# For partially known annotations. Usually, fields where type annotations
-# haven't been added are left unannotated, but in some situations this
-# isn't possible or a type is already partially known. In cases like these,
-# use Incomplete instead of Any as a marker. For example, use
-# "Incomplete | None" instead of "Any | None".
-Incomplete: TypeAlias = Any
-
-
-class IdentityFunction(Protocol):
-    def __call__(self, __x: _T) -> _T: ...
-
-
-# ====================
-# Comparison protocols
-# ====================
-
-
-class SupportsDunderLT(Protocol[_T_contra]):
-    def __lt__(self, __other: _T_contra) -> bool: ...
-
-
-class SupportsDunderGT(Protocol[_T_contra]):
-    def __gt__(self, __other: _T_contra) -> bool: ...
-
-
-class SupportsDunderLE(Protocol[_T_contra]):
-    def __le__(self, __other: _T_contra) -> bool: ...
-
-
-class SupportsDunderGE(Protocol[_T_contra]):
-    def __ge__(self, __other: _T_contra) -> bool: ...
-
-
-class SupportsAllComparisons(
-    SupportsDunderLT[Any],
-    SupportsDunderGT[Any],
-    SupportsDunderLE[Any],
-    SupportsDunderGE[Any],
-    Protocol,
-): ...
-
-
-SupportsRichComparison = TypeAliasType(
-    "SupportsRichComparison", SupportsDunderLT[Any] | SupportsDunderGT[Any]
-)
-SupportsRichComparisonT = TypeVar(
-    "SupportsRichComparisonT", bound=SupportsRichComparison
-)
-
-# ====================
-# Dunder protocols
-# ====================
-
-
-class SupportsNext(Protocol[_T_co]):
-    def __next__(self) -> _T_co: ...
-
-
-class SupportsAnext(Protocol[_T_co]):
-    def __anext__(self) -> Awaitable[_T_co]: ...
-
-
-class SupportsAdd(Protocol[_T_contra, _T_co]):
-    def __add__(self, __x: _T_contra) -> _T_co: ...
-
-
-class SupportsRAdd(Protocol[_T_contra, _T_co]):
-    def __radd__(self, __x: _T_contra) -> _T_co: ...
-
-
-class SupportsSub(Protocol[_T_contra, _T_co]):
-    def __sub__(self, __x: _T_contra) -> _T_co: ...
-
-
-class SupportsRSub(Protocol[_T_contra, _T_co]):
-    def __rsub__(self, __x: _T_contra) -> _T_co: ...
-
-
-class SupportsDivMod(Protocol[_T_contra, _T_co]):
-    def __divmod__(self, __other: _T_contra) -> _T_co: ...
-
-
-class SupportsRDivMod(Protocol[_T_contra, _T_co]):
-    def __rdivmod__(self, __other: _T_contra) -> _T_co: ...
-
-
-# This protocol is generic over the iterator type, while Iterable is
-# generic over the type that is iterated over.
-class SupportsIter(Protocol[_T_co]):
-    def __iter__(self) -> _T_co: ...
-
-
-# This protocol is generic over the iterator type, while AsyncIterable is
-# generic over the type that is iterated over.
-class SupportsAiter(Protocol[_T_co]):
-    def __aiter__(self) -> _T_co: ...
-
-
-class SupportsLenAndGetItem(Protocol[_T_co]):
-    def __len__(self) -> int: ...
-    def __getitem__(self, __k: int) -> _T_co: ...
-
-
-class SupportsTrunc(Protocol):
-    def __trunc__(self) -> int: ...
-
-
-# ====================
-# Mapping-like protocols
-# ====================
-
-
-class SupportsItems(Protocol[_KT_co, _VT_co]):
-    def items(self) -> AbstractSet[tuple[_KT_co, _VT_co]]: ...
-
-
-class SupportsKeysAndGetItem(Protocol[_KT, _VT_co]):
-    def keys(self) -> Iterable[_KT]: ...
-    def __getitem__(self, __key: _KT) -> _VT_co: ...
-
-
-class SupportsGetItem(Protocol[_KT_contra, _VT_co]):
-    def __contains__(self, __x: Any) -> bool: ...
-    def __getitem__(self, __key: _KT_contra) -> _VT_co: ...
-
-
-class SupportsItemAccess(SupportsGetItem[_KT_contra, _VT], Protocol[_KT_contra, _VT]):
-    def __setitem__(self, __key: _KT_contra, __value: _VT) -> None: ...
-    def __delitem__(self, __key: _KT_contra) -> None: ...
-
-
-# ====================
-# File handling
-# ====================
-
-StrPath: TypeAlias = str | PathLike[str]
-BytesPath: TypeAlias = bytes | PathLike[bytes]
-StrOrBytesPath: TypeAlias = str | bytes | PathLike[str] | PathLike[bytes]
-
-OpenTextModeUpdating: TypeAlias = Literal[
-    "r+",
-    "+r",
-    "rt+",
-    "r+t",
-    "+rt",
-    "tr+",
-    "t+r",
-    "+tr",
-    "w+",
-    "+w",
-    "wt+",
-    "w+t",
-    "+wt",
-    "tw+",
-    "t+w",
-    "+tw",
-    "a+",
-    "+a",
-    "at+",
-    "a+t",
-    "+at",
-    "ta+",
-    "t+a",
-    "+ta",
-    "x+",
-    "+x",
-    "xt+",
-    "x+t",
-    "+xt",
-    "tx+",
-    "t+x",
-    "+tx",
-]
-OpenTextModeWriting: TypeAlias = Literal[
-    "w", "wt", "tw", "a", "at", "ta", "x", "xt", "tx"
-]
-OpenTextModeReading: TypeAlias = Literal[
-    "r", "rt", "tr", "U", "rU", "Ur", "rtU", "rUt", "Urt", "trU", "tUr", "Utr"
-]
-OpenTextMode: TypeAlias = (
-    OpenTextModeUpdating | OpenTextModeWriting | OpenTextModeReading
-)
-OpenBinaryModeUpdating: TypeAlias = Literal[
-    "rb+",
-    "r+b",
-    "+rb",
-    "br+",
-    "b+r",
-    "+br",
-    "wb+",
-    "w+b",
-    "+wb",
-    "bw+",
-    "b+w",
-    "+bw",
-    "ab+",
-    "a+b",
-    "+ab",
-    "ba+",
-    "b+a",
-    "+ba",
-    "xb+",
-    "x+b",
-    "+xb",
-    "bx+",
-    "b+x",
-    "+bx",
-]
-OpenBinaryModeWriting: TypeAlias = Literal["wb", "bw", "ab", "ba", "xb", "bx"]
-OpenBinaryModeReading: TypeAlias = Literal[
-    "rb", "br", "rbU", "rUb", "Urb", "brU", "bUr", "Ubr"
-]
-OpenBinaryMode: TypeAlias = (
-    OpenBinaryModeUpdating | OpenBinaryModeReading | OpenBinaryModeWriting
-)
-
-
-class HasFileno(Protocol):
-    def fileno(self) -> int: ...
-
-
-FileDescriptor: TypeAlias = int
-FileDescriptorLike: TypeAlias = int | HasFileno
-FileDescriptorOrPath: TypeAlias = int | StrOrBytesPath
-
-
-class SupportsRead(Protocol[_T_co]):
-    def read(self, __length: int = ...) -> _T_co: ...
-
-
-class SupportsReadline(Protocol[_T_co]):
-    def readline(self, __length: int = ...) -> _T_co: ...
-
-
-class SupportsNoArgReadline(Protocol[_T_co]):
-    def readline(self) -> _T_co: ...
-
-
-class SupportsWrite(Protocol[_T_contra]):
-    def write(self, __s: _T_contra) -> object: ...
-
-
-# ====================
-# Buffer protocols
-# ====================
-
-# Unfortunately PEP 688 does not allow us to distinguish read-only
-# from writable buffers. We use these aliases for readability for now.
-# Perhaps a future extension of the buffer protocol will allow us to
-# distinguish these cases in the type system.
-ReadOnlyBuffer: TypeAlias = Buffer
-# Anything that implements the read-write buffer interface.
-WriteableBuffer: TypeAlias = Buffer
-# Same as WriteableBuffer, but also includes read-only buffer types (like bytes).
-ReadableBuffer: TypeAlias = Buffer
-
-
-class SliceableBuffer(Buffer, Protocol):
-    def __getitem__(self, __slice: slice) -> Sequence[int]: ...
-
-
-class IndexableBuffer(Buffer, Protocol):
-    def __getitem__(self, __i: int) -> int: ...
-
-
-class SupportsGetItemBuffer(SliceableBuffer, IndexableBuffer, Protocol):
-    def __contains__(self, __x: Any) -> bool: ...
-    @overload
-    def __getitem__(self, __slice: slice) -> Sequence[int]: ...
-    @overload
-    def __getitem__(self, __i: int) -> int: ...
-
-
-class SizedBuffer(Sized, Buffer, Protocol): ...
-
-
-# Source from https://github.com/python/typing/issues/256#issuecomment-1442633430
-# This works because str.__contains__ does not accept object (either in typeshed or at runtime)
-class SequenceNotStr(Protocol[_T_co]):
-    @overload
-    def __getitem__(self, index: SupportsIndex, /) -> _T_co: ...
-    @overload
-    def __getitem__(self, index: slice, /) -> Sequence[_T_co]: ...
-    def __contains__(self, value: object, /) -> bool: ...
-    def __len__(self) -> int: ...
-    def __iter__(self) -> Iterator[_T_co]: ...
-    def index(self, value: Any, start: int = 0, stop: int = ..., /) -> int: ...
-    def count(self, value: Any, /) -> int: ...
-    def __reversed__(self) -> Iterator[_T_co]: ...