nshtrainer 1.0.0b26__tar.gz → 1.0.0b27__tar.gz

{nshtrainer-1.0.0b26 → nshtrainer-1.0.0b27}/PKG-INFO

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

{nshtrainer-1.0.0b26 → nshtrainer-1.0.0b27}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nshtrainer"
-version = "1.0.0-beta26"
+version = "1.0.0-beta27"
 description = ""
 authors = ["Nima Shoghi <nimashoghi@gmail.com>"]
 readme = "README.md"

{nshtrainer-1.0.0b26 → nshtrainer-1.0.0b27}/src/nshtrainer/callbacks/actsave.py

@@ -4,12 +4,12 @@ import contextlib
 from pathlib import Path
 from typing import Literal
 
-from typing_extensions import TypeAlias, override
+from typing_extensions import TypeAliasType, override
 
 from .._callback import NTCallbackBase
 from .base import CallbackConfigBase
 
-Stage: TypeAlias = Literal["train", "validation", "test", "predict"]
+Stage = TypeAliasType("Stage", Literal["train", "validation", "test", "predict"])
 
 
 class ActSaveConfig(CallbackConfigBase):

{nshtrainer-1.0.0b26 → nshtrainer-1.0.0b27}/src/nshtrainer/callbacks/base.py

@@ -4,11 +4,11 @@ from abc import ABC, abstractmethod
 from collections import Counter
 from collections.abc import Iterable
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, ClassVar, TypeAlias
+from typing import TYPE_CHECKING, ClassVar
 
 import nshconfig as C
 from lightning.pytorch import Callback
-from typing_extensions import TypedDict, Unpack
+from typing_extensions import TypeAliasType, TypedDict, Unpack
 
 if TYPE_CHECKING:
     from ..trainer._config import TrainerConfig
@@ -30,7 +30,9 @@ class CallbackWithMetadata:
     metadata: CallbackMetadataConfig
 
 
-ConstructedCallback: TypeAlias = Callback | CallbackWithMetadata
+ConstructedCallback = TypeAliasType(
+    "ConstructedCallback", Callback | CallbackWithMetadata
+)
 
 
 class CallbackConfigBase(C.Config, ABC):

{nshtrainer-1.0.0b26 → nshtrainer-1.0.0b27}/src/nshtrainer/callbacks/shared_parameters.py

@@ -2,12 +2,12 @@ from __future__ import annotations
 
 import logging
 from collections.abc import Iterable
-from typing import Literal, Protocol, TypeAlias, runtime_checkable
+from typing import Literal, Protocol, runtime_checkable
 
 import torch.nn as nn
 from lightning.pytorch import LightningModule, Trainer
 from lightning.pytorch.callbacks import Callback
-from typing_extensions import override
+from typing_extensions import TypeAliasType, override
 
 from .base import CallbackConfigBase
 
@@ -34,7 +34,9 @@ class SharedParametersCallbackConfig(CallbackConfigBase):
         yield SharedParametersCallback(self)
 
 
-SharedParametersList: TypeAlias = list[tuple[nn.Parameter, int | float]]
+SharedParametersList = TypeAliasType(
+    "SharedParametersList", list[tuple[nn.Parameter, int | float]]
+)
 
 
 @runtime_checkable

{nshtrainer-1.0.0b26 → nshtrainer-1.0.0b27}/src/nshtrainer/configs/__init__.py

@@ -46,6 +46,9 @@ from nshtrainer.callbacks import (
 from nshtrainer.callbacks import (
     SharedParametersCallbackConfig as SharedParametersCallbackConfig,
 )
+from nshtrainer.callbacks import (
+    TimeCheckpointCallbackConfig as TimeCheckpointCallbackConfig,
+)
 from nshtrainer.callbacks import (
     WandbUploadCodeCallbackConfig as WandbUploadCodeCallbackConfig,
 )
@@ -217,6 +220,7 @@ __all__ = [
     "SwishNonlinearityConfig",
     "TanhNonlinearityConfig",
     "TensorboardLoggerConfig",
+    "TimeCheckpointCallbackConfig",
     "TrainerConfig",
     "WandbLoggerConfig",
     "WandbUploadCodeCallbackConfig",

{nshtrainer-1.0.0b26 → nshtrainer-1.0.0b27}/src/nshtrainer/configs/callbacks/__init__.py

@@ -38,6 +38,9 @@ from nshtrainer.callbacks import (
 from nshtrainer.callbacks import (
     SharedParametersCallbackConfig as SharedParametersCallbackConfig,
 )
+from nshtrainer.callbacks import (
+    TimeCheckpointCallbackConfig as TimeCheckpointCallbackConfig,
+)
 from nshtrainer.callbacks import (
     WandbUploadCodeCallbackConfig as WandbUploadCodeCallbackConfig,
 )
@@ -95,6 +98,7 @@ __all__ = [
     "PrintTableMetricsCallbackConfig",
     "RLPSanityChecksCallbackConfig",
     "SharedParametersCallbackConfig",
+    "TimeCheckpointCallbackConfig",
     "WandbUploadCodeCallbackConfig",
     "WandbWatchCallbackConfig",
     "actsave",

{nshtrainer-1.0.0b26 → nshtrainer-1.0.0b27}/src/nshtrainer/configs/callbacks/checkpoint/__init__.py

@@ -11,6 +11,9 @@ from nshtrainer.callbacks.checkpoint import (
 from nshtrainer.callbacks.checkpoint import (
     OnExceptionCheckpointCallbackConfig as OnExceptionCheckpointCallbackConfig,
 )
+from nshtrainer.callbacks.checkpoint import (
+    TimeCheckpointCallbackConfig as TimeCheckpointCallbackConfig,
+)
 from nshtrainer.callbacks.checkpoint._base import (
     BaseCheckpointCallbackConfig as BaseCheckpointCallbackConfig,
 )
@@ -26,6 +29,7 @@ from . import _base as _base
 from . import best_checkpoint as best_checkpoint
 from . import last_checkpoint as last_checkpoint
 from . import on_exception_checkpoint as on_exception_checkpoint
+from . import time_checkpoint as time_checkpoint
 
 __all__ = [
     "BaseCheckpointCallbackConfig",
@@ -35,8 +39,10 @@ __all__ = [
     "LastCheckpointCallbackConfig",
     "MetricConfig",
     "OnExceptionCheckpointCallbackConfig",
+    "TimeCheckpointCallbackConfig",
     "_base",
     "best_checkpoint",
     "last_checkpoint",
     "on_exception_checkpoint",
+    "time_checkpoint",
 ]

nshtrainer-1.0.0b27/src/nshtrainer/configs/callbacks/checkpoint/time_checkpoint/__init__.py

@@ -0,0 +1,19 @@
+from __future__ import annotations
+
+__codegen__ = True
+
+from nshtrainer.callbacks.checkpoint.time_checkpoint import (
+    BaseCheckpointCallbackConfig as BaseCheckpointCallbackConfig,
+)
+from nshtrainer.callbacks.checkpoint.time_checkpoint import (
+    CheckpointMetadata as CheckpointMetadata,
+)
+from nshtrainer.callbacks.checkpoint.time_checkpoint import (
+    TimeCheckpointCallbackConfig as TimeCheckpointCallbackConfig,
+)
+
+__all__ = [
+    "BaseCheckpointCallbackConfig",
+    "CheckpointMetadata",
+    "TimeCheckpointCallbackConfig",
+]

{nshtrainer-1.0.0b26 → nshtrainer-1.0.0b27}/src/nshtrainer/configs/trainer/__init__.py

@@ -48,6 +48,9 @@ from nshtrainer.trainer._config import StrategyConfigBase as StrategyConfigBase
 from nshtrainer.trainer._config import (
     TensorboardLoggerConfig as TensorboardLoggerConfig,
 )
+from nshtrainer.trainer._config import (
+    TimeCheckpointCallbackConfig as TimeCheckpointCallbackConfig,
+)
 from nshtrainer.trainer._config import WandbLoggerConfig as WandbLoggerConfig
 
 from . import _config as _config
@@ -79,6 +82,7 @@ __all__ = [
     "SharedParametersCallbackConfig",
     "StrategyConfigBase",
     "TensorboardLoggerConfig",
+    "TimeCheckpointCallbackConfig",
     "TrainerConfig",
     "WandbLoggerConfig",
     "_config",

{nshtrainer-1.0.0b26 → nshtrainer-1.0.0b27}/src/nshtrainer/configs/trainer/_config/__init__.py

@@ -47,6 +47,9 @@ from nshtrainer.trainer._config import StrategyConfigBase as StrategyConfigBase
 from nshtrainer.trainer._config import (
     TensorboardLoggerConfig as TensorboardLoggerConfig,
 )
+from nshtrainer.trainer._config import (
+    TimeCheckpointCallbackConfig as TimeCheckpointCallbackConfig,
+)
 from nshtrainer.trainer._config import TrainerConfig as TrainerConfig
 from nshtrainer.trainer._config import WandbLoggerConfig as WandbLoggerConfig
 
@@ -76,6 +79,7 @@ __all__ = [
     "SharedParametersCallbackConfig",
     "StrategyConfigBase",
     "TensorboardLoggerConfig",
+    "TimeCheckpointCallbackConfig",
     "TrainerConfig",
     "WandbLoggerConfig",
 ]

{nshtrainer-1.0.0b26 → nshtrainer-1.0.0b27}/src/nshtrainer/loggers/__init__.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
-from typing import Annotated, TypeAlias
+from typing import Annotated
 
 import nshconfig as C
+from typing_extensions import TypeAliasType
 
 from ._base import BaseLoggerConfig as BaseLoggerConfig
 from .actsave import ActSaveLoggerConfig as ActSaveLoggerConfig
@@ -10,7 +11,13 @@ from .csv import CSVLoggerConfig as CSVLoggerConfig
 from .tensorboard import TensorboardLoggerConfig as TensorboardLoggerConfig
 from .wandb import WandbLoggerConfig as WandbLoggerConfig
 
-LoggerConfig: TypeAlias = Annotated[
-    CSVLoggerConfig | TensorboardLoggerConfig | WandbLoggerConfig | ActSaveLoggerConfig,
-    C.Field(discriminator="name"),
-]
+LoggerConfig = TypeAliasType(
+    "LoggerConfig",
+    Annotated[
+        CSVLoggerConfig
+        | TensorboardLoggerConfig
+        | WandbLoggerConfig
+        | ActSaveLoggerConfig,
+        C.Field(discriminator="name"),
+    ],
+)

{nshtrainer-1.0.0b26 → nshtrainer-1.0.0b27}/src/nshtrainer/lr_scheduler/__init__.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
-from typing import Annotated, TypeAlias
+from typing import Annotated
 
 import nshconfig as C
+from typing_extensions import TypeAliasType
 
 from ._base import LRSchedulerConfigBase as LRSchedulerConfigBase
 from ._base import LRSchedulerMetadata as LRSchedulerMetadata
@@ -15,7 +16,10 @@ from .linear_warmup_cosine import (
 from .reduce_lr_on_plateau import ReduceLROnPlateau as ReduceLROnPlateau
 from .reduce_lr_on_plateau import ReduceLROnPlateauConfig as ReduceLROnPlateauConfig
 
-LRSchedulerConfig: TypeAlias = Annotated[
-    LinearWarmupCosineDecayLRSchedulerConfig | ReduceLROnPlateauConfig,
-    C.Field(discriminator="name"),
-]
+LRSchedulerConfig = TypeAliasType(
+    "LRSchedulerConfig",
+    Annotated[
+        LinearWarmupCosineDecayLRSchedulerConfig | ReduceLROnPlateauConfig,
+        C.Field(discriminator="name"),
+    ],
+)

{nshtrainer-1.0.0b26 → nshtrainer-1.0.0b27}/src/nshtrainer/model/mixins/callback.py

@@ -2,18 +2,20 @@ from __future__ import annotations
 
 import logging
 from collections.abc import Callable, Iterable, Sequence
-from typing import Any, TypeAlias, cast
+from typing import Any, cast
 
 from lightning.pytorch import Callback, LightningModule
-from typing_extensions import override
+from typing_extensions import TypeAliasType, override
 
 from ..._callback import NTCallbackBase
 from ...util.typing_utils import mixin_base_type
 
 log = logging.getLogger(__name__)
 
-_Callback = Callback | NTCallbackBase
-CallbackFn: TypeAlias = Callable[[], _Callback | Iterable[_Callback] | None]
+_Callback = TypeAliasType("_Callback", Callback | NTCallbackBase)
+CallbackFn = TypeAliasType(
+    "CallbackFn", Callable[[], _Callback | Iterable[_Callback] | None]
+)
 
 
 class CallbackRegistrarModuleMixin:

{nshtrainer-1.0.0b26 → nshtrainer-1.0.0b27}/src/nshtrainer/optimizer.py

@@ -2,12 +2,12 @@ from __future__ import annotations
 
 from abc import ABC, abstractmethod
 from collections.abc import Iterable
-from typing import Annotated, Any, Literal, TypeAlias
+from typing import Annotated, Any, Literal
 
 import nshconfig as C
 import torch.nn as nn
 from torch.optim import Optimizer
-from typing_extensions import override
+from typing_extensions import TypeAliasType, override
 
 
 class OptimizerConfigBase(C.Config, ABC):
@@ -57,4 +57,6 @@ class AdamWConfig(OptimizerConfigBase):
         )
 
 
-OptimizerConfig: TypeAlias = Annotated[AdamWConfig, C.Field(discriminator="name")]
+OptimizerConfig = TypeAliasType(
+    "OptimizerConfig", Annotated[AdamWConfig, C.Field(discriminator="name")]
+)

{nshtrainer-1.0.0b26 → nshtrainer-1.0.0b27}/src/nshtrainer/profiler/__init__.py

@@ -1,15 +1,19 @@
 from __future__ import annotations
 
-from typing import Annotated, TypeAlias
+from typing import Annotated
 
 import nshconfig as C
+from typing_extensions import TypeAliasType
 
 from ._base import BaseProfilerConfig as BaseProfilerConfig
 from .advanced import AdvancedProfilerConfig as AdvancedProfilerConfig
 from .pytorch import PyTorchProfilerConfig as PyTorchProfilerConfig
 from .simple import SimpleProfilerConfig as SimpleProfilerConfig
 
-ProfilerConfig: TypeAlias = Annotated[
-    SimpleProfilerConfig | AdvancedProfilerConfig | PyTorchProfilerConfig,
-    C.Field(discriminator="name"),
-]
+ProfilerConfig = TypeAliasType(
+    "ProfilerConfig",
+    Annotated[
+        SimpleProfilerConfig | AdvancedProfilerConfig | PyTorchProfilerConfig,
+        C.Field(discriminator="name"),
+    ],
+)

{nshtrainer-1.0.0b26 → nshtrainer-1.0.0b27}/src/nshtrainer/trainer/_config.py

@@ -14,7 +14,6 @@ from typing import (
     Any,
     ClassVar,
     Literal,
-    TypeAlias,
 )
 
 import nshconfig as C
@@ -101,47 +100,53 @@ class StrategyConfigBase(C.Config, ABC):
 strategy_registry = C.Registry(StrategyConfigBase, discriminator="name")
 
 
-AcceleratorLiteral: TypeAlias = Literal[
-    "cpu", "gpu", "tpu", "ipu", "hpu", "mps", "auto"
-]
-
-StrategyLiteral: TypeAlias = Literal[
-    "auto",
-    "ddp",
-    "ddp_find_unused_parameters_false",
-    "ddp_find_unused_parameters_true",
-    "ddp_spawn",
-    "ddp_spawn_find_unused_parameters_false",
-    "ddp_spawn_find_unused_parameters_true",
-    "ddp_fork",
-    "ddp_fork_find_unused_parameters_false",
-    "ddp_fork_find_unused_parameters_true",
-    "ddp_notebook",
-    "dp",
-    "deepspeed",
-    "deepspeed_stage_1",
-    "deepspeed_stage_1_offload",
-    "deepspeed_stage_2",
-    "deepspeed_stage_2_offload",
-    "deepspeed_stage_3",
-    "deepspeed_stage_3_offload",
-    "deepspeed_stage_3_offload_nvme",
-    "fsdp",
-    "fsdp_cpu_offload",
-    "single_xla",
-    "xla_fsdp",
-    "xla",
-    "single_tpu",
-]
-
-
-CheckpointCallbackConfig: TypeAlias = Annotated[
-    BestCheckpointCallbackConfig
-    | LastCheckpointCallbackConfig
-    | OnExceptionCheckpointCallbackConfig
-    | TimeCheckpointCallbackConfig,
-    C.Field(discriminator="name"),
-]
+AcceleratorLiteral = TypeAliasType(
+    "AcceleratorLiteral", Literal["cpu", "gpu", "tpu", "ipu", "hpu", "mps", "auto"]
+)
+
+StrategyLiteral = TypeAliasType(
+    "StrategyLiteral",
+    Literal[
+        "auto",
+        "ddp",
+        "ddp_find_unused_parameters_false",
+        "ddp_find_unused_parameters_true",
+        "ddp_spawn",
+        "ddp_spawn_find_unused_parameters_false",
+        "ddp_spawn_find_unused_parameters_true",
+        "ddp_fork",
+        "ddp_fork_find_unused_parameters_false",
+        "ddp_fork_find_unused_parameters_true",
+        "ddp_notebook",
+        "dp",
+        "deepspeed",
+        "deepspeed_stage_1",
+        "deepspeed_stage_1_offload",
+        "deepspeed_stage_2",
+        "deepspeed_stage_2_offload",
+        "deepspeed_stage_3",
+        "deepspeed_stage_3_offload",
+        "deepspeed_stage_3_offload_nvme",
+        "fsdp",
+        "fsdp_cpu_offload",
+        "single_xla",
+        "xla_fsdp",
+        "xla",
+        "single_tpu",
+    ],
+)
+
+
+CheckpointCallbackConfig = TypeAliasType(
+    "CheckpointCallbackConfig",
+    Annotated[
+        BestCheckpointCallbackConfig
+        | LastCheckpointCallbackConfig
+        | OnExceptionCheckpointCallbackConfig
+        | TimeCheckpointCallbackConfig,
+        C.Field(discriminator="name"),
+    ],
+)
 
 
 class CheckpointSavingConfig(CallbackConfigBase):

{nshtrainer-1.0.0b26 → nshtrainer-1.0.0b27}/src/nshtrainer/trainer/_runtime_callback.py

@@ -4,14 +4,14 @@ import datetime
 import logging
 import time
 from dataclasses import dataclass
-from typing import Any, Literal, TypeAlias
+from typing import Any, Literal
 
 from lightning.pytorch.callbacks.callback import Callback
-from typing_extensions import override
+from typing_extensions import TypeAliasType, override
 
 log = logging.getLogger(__name__)
 
-Stage: TypeAlias = Literal["train", "validate", "test", "predict"]
+Stage = TypeAliasType("Stage", Literal["train", "validate", "test", "predict"])
 ALL_STAGES = ("train", "validate", "test", "predict")
 
 

{nshtrainer-1.0.0b26 → nshtrainer-1.0.0b27}/src/nshtrainer/trainer/signal_connector.py

@@ -12,7 +12,7 @@ from collections import defaultdict
 from collections.abc import Callable
 from pathlib import Path
 from types import FrameType
-from typing import Any, TypeAlias
+from typing import Any
 
 import nshrunner as nr
 import torch.utils.data
@@ -22,12 +22,14 @@ from lightning.pytorch.trainer.connectors.signal_connector import _HandlersCompo
 from lightning.pytorch.trainer.connectors.signal_connector import (
     _SignalConnector as _LightningSignalConnector,
 )
-from typing_extensions import override
+from typing_extensions import TypeAliasType, override
 
 log = logging.getLogger(__name__)
 
-_SIGNUM = int | signal.Signals
-_HANDLER: TypeAlias = Callable[[_SIGNUM, FrameType], Any] | int | signal.Handlers | None
+_SIGNUM = TypeAliasType("_SIGNUM", int | signal.Signals)
+_HANDLER = TypeAliasType(
+    "_HANDLER", Callable[[_SIGNUM, FrameType], Any] | int | signal.Handlers | None
+)
 _IS_WINDOWS = platform.system() == "Windows"
 
 

{nshtrainer-1.0.0b26 → nshtrainer-1.0.0b27}/src/nshtrainer/util/_useful_types.py

@@ -7,7 +7,14 @@ 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
+from typing_extensions import (
+    Buffer,
+    Literal,
+    Protocol,
+    SupportsIndex,
+    TypeAlias,
+    TypeAliasType,
+)
 
 _KT = TypeVar("_KT")
 _KT_co = TypeVar("_KT_co", covariant=True)
@@ -60,7 +67,9 @@ class SupportsAllComparisons(
 ): ...
 
 
-SupportsRichComparison: TypeAlias = SupportsDunderLT[Any] | SupportsDunderGT[Any]
+SupportsRichComparison = TypeAliasType(
+    "SupportsRichComparison", SupportsDunderLT[Any] | SupportsDunderGT[Any]
+)
 SupportsRichComparisonT = TypeVar(
     "SupportsRichComparisonT", bound=SupportsRichComparison
 )

{nshtrainer-1.0.0b26 → nshtrainer-1.0.0b27}/src/nshtrainer/util/config/dtype.py

@@ -1,57 +1,60 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Literal, TypeAlias
+from typing import TYPE_CHECKING, Literal
 
 import nshconfig as C
 import torch
-from typing_extensions import assert_never
+from typing_extensions import TypeAliasType, assert_never
 
 from ..bf16 import is_bf16_supported_no_emulation
 
 if TYPE_CHECKING:
     from ...trainer._config import TrainerConfig
 
-DTypeName: TypeAlias = Literal[
-    "float32",
-    "float",
-    "float64",
-    "double",
-    "float16",
-    "bfloat16",
-    "float8_e4m3fn",
-    "float8_e4m3fnuz",
-    "float8_e5m2",
-    "float8_e5m2fnuz",
-    "half",
-    "uint8",
-    "uint16",
-    "uint32",
-    "uint64",
-    "int8",
-    "int16",
-    "short",
-    "int32",
-    "int",
-    "int64",
-    "long",
-    "complex32",
-    "complex64",
-    "chalf",
-    "cfloat",
-    "complex128",
-    "cdouble",
-    "quint8",
-    "qint8",
-    "qint32",
-    "bool",
-    "quint4x2",
-    "quint2x4",
-    "bits1x8",
-    "bits2x4",
-    "bits4x2",
-    "bits8",
-    "bits16",
-]
+DTypeName = TypeAliasType(
+    "DTypeName",
+    Literal[
+        "float32",
+        "float",
+        "float64",
+        "double",
+        "float16",
+        "bfloat16",
+        "float8_e4m3fn",
+        "float8_e4m3fnuz",
+        "float8_e5m2",
+        "float8_e5m2fnuz",
+        "half",
+        "uint8",
+        "uint16",
+        "uint32",
+        "uint64",
+        "int8",
+        "int16",
+        "short",
+        "int32",
+        "int",
+        "int64",
+        "long",
+        "complex32",
+        "complex64",
+        "chalf",
+        "cfloat",
+        "complex128",
+        "cdouble",
+        "quint8",
+        "qint8",
+        "qint32",
+        "bool",
+        "quint4x2",
+        "quint2x4",
+        "bits1x8",
+        "bits2x4",
+        "bits4x2",
+        "bits8",
+        "bits16",
+    ],
+)
 
 
 class DTypeConfig(C.Config):

{nshtrainer-1.0.0b26 → nshtrainer-1.0.0b27}/src/nshtrainer/util/path.py

@@ -6,11 +6,12 @@ import os
 import platform
 import shutil
 from pathlib import Path
-from typing import TypeAlias
+
+from typing_extensions import TypeAliasType
 
 log = logging.getLogger(__name__)
 
-_Path: TypeAlias = str | Path | os.PathLike
+_Path = TypeAliasType("_Path", str | Path)
 
 
 def get_relative_path(source: _Path, destination: _Path):