nshtrainer 1.0.0b36__tar.gz → 1.0.0b37__tar.gz

{nshtrainer-1.0.0b36 → nshtrainer-1.0.0b37}/PKG-INFO

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

{nshtrainer-1.0.0b36 → nshtrainer-1.0.0b37}/pyproject.toml

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

{nshtrainer-1.0.0b36 → nshtrainer-1.0.0b37}/src/nshtrainer/_directory.py

@@ -81,7 +81,9 @@ class DirectoryConfig(C.Config):
 
         # Save to nshtrainer/{id}/log/{logger name}
         log_dir = self.resolve_subdirectory(run_id, "log")
-        log_dir = log_dir / logger.name
+        log_dir = log_dir / getattr(logger, "name")
+        # ^ NOTE: Logger must have a `name` attribute, as this is
+        # the discriminator for the logger registry
         log_dir.mkdir(exist_ok=True)
 
         return log_dir

{nshtrainer-1.0.0b36 → nshtrainer-1.0.0b37}/src/nshtrainer/configs/__init__.py

@@ -60,24 +60,26 @@ from nshtrainer.callbacks.checkpoint._base import (
     BaseCheckpointCallbackConfig as BaseCheckpointCallbackConfig,
 )
 from nshtrainer.loggers import ActSaveLoggerConfig as ActSaveLoggerConfig
-from nshtrainer.loggers import BaseLoggerConfig as BaseLoggerConfig
 from nshtrainer.loggers import CSVLoggerConfig as CSVLoggerConfig
 from nshtrainer.loggers import LoggerConfig as LoggerConfig
+from nshtrainer.loggers import LoggerConfigBase as LoggerConfigBase
 from nshtrainer.loggers import TensorboardLoggerConfig as TensorboardLoggerConfig
 from nshtrainer.loggers import WandbLoggerConfig as WandbLoggerConfig
+from nshtrainer.loggers import logger_registry as logger_registry
 from nshtrainer.lr_scheduler import (
     LinearWarmupCosineDecayLRSchedulerConfig as LinearWarmupCosineDecayLRSchedulerConfig,
 )
 from nshtrainer.lr_scheduler import LRSchedulerConfig as LRSchedulerConfig
 from nshtrainer.lr_scheduler import LRSchedulerConfigBase as LRSchedulerConfigBase
 from nshtrainer.lr_scheduler import ReduceLROnPlateauConfig as ReduceLROnPlateauConfig
-from nshtrainer.nn import BaseNonlinearityConfig as BaseNonlinearityConfig
+from nshtrainer.lr_scheduler.base import lr_scheduler_registry as lr_scheduler_registry
 from nshtrainer.nn import ELUNonlinearityConfig as ELUNonlinearityConfig
 from nshtrainer.nn import GELUNonlinearityConfig as GELUNonlinearityConfig
 from nshtrainer.nn import LeakyReLUNonlinearityConfig as LeakyReLUNonlinearityConfig
 from nshtrainer.nn import MishNonlinearityConfig as MishNonlinearityConfig
 from nshtrainer.nn import MLPConfig as MLPConfig
 from nshtrainer.nn import NonlinearityConfig as NonlinearityConfig
+from nshtrainer.nn import NonlinearityConfigBase as NonlinearityConfigBase
 from nshtrainer.nn import PReLUConfig as PReLUConfig
 from nshtrainer.nn import ReLUNonlinearityConfig as ReLUNonlinearityConfig
 from nshtrainer.nn import SigmoidNonlinearityConfig as SigmoidNonlinearityConfig
@@ -90,9 +92,11 @@ from nshtrainer.nn import TanhNonlinearityConfig as TanhNonlinearityConfig
 from nshtrainer.nn.nonlinearity import (
     SwiGLUNonlinearityConfig as SwiGLUNonlinearityConfig,
 )
+from nshtrainer.nn.nonlinearity import nonlinearity_registry as nonlinearity_registry
 from nshtrainer.optimizer import AdamWConfig as AdamWConfig
 from nshtrainer.optimizer import OptimizerConfig as OptimizerConfig
 from nshtrainer.optimizer import OptimizerConfigBase as OptimizerConfigBase
+from nshtrainer.optimizer import optimizer_registry as optimizer_registry
 from nshtrainer.profiler import AdvancedProfilerConfig as AdvancedProfilerConfig
 from nshtrainer.profiler import BaseProfilerConfig as BaseProfilerConfig
 from nshtrainer.profiler import ProfilerConfig as ProfilerConfig
@@ -225,8 +229,6 @@ __all__ = [
     "AdvancedProfilerConfig",
     "AsyncCheckpointIOPlugin",
     "BaseCheckpointCallbackConfig",
-    "BaseLoggerConfig",
-    "BaseNonlinearityConfig",
     "BaseProfilerConfig",
     "BestCheckpointCallbackConfig",
     "BitsandbytesPluginConfig",
@@ -280,6 +282,7 @@ __all__ = [
     "LinearWarmupCosineDecayLRSchedulerConfig",
     "LogEpochCallbackConfig",
     "LoggerConfig",
+    "LoggerConfigBase",
     "MLPConfig",
     "MPIEnvironmentPlugin",
     "MPSAcceleratorConfig",
@@ -287,6 +290,7 @@ __all__ = [
     "MishNonlinearityConfig",
     "MixedPrecisionPluginConfig",
     "NonlinearityConfig",
+    "NonlinearityConfigBase",
     "NormLoggingCallbackConfig",
     "OnExceptionCheckpointCallbackConfig",
     "OptimizerConfig",
@@ -334,11 +338,15 @@ __all__ = [
     "accelerator_registry",
     "callback_registry",
     "callbacks",
+    "logger_registry",
     "loggers",
     "lr_scheduler",
+    "lr_scheduler_registry",
     "metrics",
     "nn",
+    "nonlinearity_registry",
     "optimizer",
+    "optimizer_registry",
     "plugin_registry",
     "profiler",
     "trainer",

{nshtrainer-1.0.0b36 → nshtrainer-1.0.0b37}/src/nshtrainer/configs/loggers/__init__.py

@@ -3,11 +3,12 @@ from __future__ import annotations
 __codegen__ = True
 
 from nshtrainer.loggers import ActSaveLoggerConfig as ActSaveLoggerConfig
-from nshtrainer.loggers import BaseLoggerConfig as BaseLoggerConfig
 from nshtrainer.loggers import CSVLoggerConfig as CSVLoggerConfig
 from nshtrainer.loggers import LoggerConfig as LoggerConfig
+from nshtrainer.loggers import LoggerConfigBase as LoggerConfigBase
 from nshtrainer.loggers import TensorboardLoggerConfig as TensorboardLoggerConfig
 from nshtrainer.loggers import WandbLoggerConfig as WandbLoggerConfig
+from nshtrainer.loggers import logger_registry as logger_registry
 from nshtrainer.loggers.wandb import CallbackConfigBase as CallbackConfigBase
 from nshtrainer.loggers.wandb import (
     WandbUploadCodeCallbackConfig as WandbUploadCodeCallbackConfig,
@@ -16,25 +17,26 @@ from nshtrainer.loggers.wandb import (
     WandbWatchCallbackConfig as WandbWatchCallbackConfig,
 )
 
-from . import _base as _base
 from . import actsave as actsave
+from . import base as base
 from . import csv as csv
 from . import tensorboard as tensorboard
 from . import wandb as wandb
 
 __all__ = [
     "ActSaveLoggerConfig",
-    "BaseLoggerConfig",
     "CSVLoggerConfig",
     "CallbackConfigBase",
     "LoggerConfig",
+    "LoggerConfigBase",
     "TensorboardLoggerConfig",
     "WandbLoggerConfig",
     "WandbUploadCodeCallbackConfig",
     "WandbWatchCallbackConfig",
-    "_base",
     "actsave",
+    "base",
     "csv",
+    "logger_registry",
     "tensorboard",
     "wandb",
 ]

nshtrainer-1.0.0b37/src/nshtrainer/configs/loggers/actsave/__init__.py

@@ -0,0 +1,13 @@
+from __future__ import annotations
+
+__codegen__ = True
+
+from nshtrainer.loggers.actsave import ActSaveLoggerConfig as ActSaveLoggerConfig
+from nshtrainer.loggers.actsave import LoggerConfigBase as LoggerConfigBase
+from nshtrainer.loggers.actsave import logger_registry as logger_registry
+
+__all__ = [
+    "ActSaveLoggerConfig",
+    "LoggerConfigBase",
+    "logger_registry",
+]

nshtrainer-1.0.0b37/src/nshtrainer/configs/loggers/base/__init__.py

@@ -0,0 +1,11 @@
+from __future__ import annotations
+
+__codegen__ = True
+
+from nshtrainer.loggers.base import LoggerConfigBase as LoggerConfigBase
+from nshtrainer.loggers.base import logger_registry as logger_registry
+
+__all__ = [
+    "LoggerConfigBase",
+    "logger_registry",
+]

nshtrainer-1.0.0b37/src/nshtrainer/configs/loggers/csv/__init__.py

@@ -0,0 +1,13 @@
+from __future__ import annotations
+
+__codegen__ = True
+
+from nshtrainer.loggers.csv import CSVLoggerConfig as CSVLoggerConfig
+from nshtrainer.loggers.csv import LoggerConfigBase as LoggerConfigBase
+from nshtrainer.loggers.csv import logger_registry as logger_registry
+
+__all__ = [
+    "CSVLoggerConfig",
+    "LoggerConfigBase",
+    "logger_registry",
+]

{nshtrainer-1.0.0b36 → nshtrainer-1.0.0b37}/src/nshtrainer/configs/loggers/tensorboard/__init__.py

@@ -2,12 +2,14 @@ from __future__ import annotations
 
 __codegen__ = True
 
-from nshtrainer.loggers.tensorboard import BaseLoggerConfig as BaseLoggerConfig
+from nshtrainer.loggers.tensorboard import LoggerConfigBase as LoggerConfigBase
 from nshtrainer.loggers.tensorboard import (
     TensorboardLoggerConfig as TensorboardLoggerConfig,
 )
+from nshtrainer.loggers.tensorboard import logger_registry as logger_registry
 
 __all__ = [
-    "BaseLoggerConfig",
+    "LoggerConfigBase",
     "TensorboardLoggerConfig",
+    "logger_registry",
 ]

{nshtrainer-1.0.0b36 → nshtrainer-1.0.0b37}/src/nshtrainer/configs/loggers/wandb/__init__.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 
 __codegen__ = True
 
-from nshtrainer.loggers.wandb import BaseLoggerConfig as BaseLoggerConfig
 from nshtrainer.loggers.wandb import CallbackConfigBase as CallbackConfigBase
+from nshtrainer.loggers.wandb import LoggerConfigBase as LoggerConfigBase
 from nshtrainer.loggers.wandb import WandbLoggerConfig as WandbLoggerConfig
 from nshtrainer.loggers.wandb import (
     WandbUploadCodeCallbackConfig as WandbUploadCodeCallbackConfig,
@@ -11,11 +11,13 @@ from nshtrainer.loggers.wandb import (
 from nshtrainer.loggers.wandb import (
     WandbWatchCallbackConfig as WandbWatchCallbackConfig,
 )
+from nshtrainer.loggers.wandb import logger_registry as logger_registry
 
 __all__ = [
-    "BaseLoggerConfig",
     "CallbackConfigBase",
+    "LoggerConfigBase",
     "WandbLoggerConfig",
     "WandbUploadCodeCallbackConfig",
     "WandbWatchCallbackConfig",
+    "logger_registry",
 ]

{nshtrainer-1.0.0b36 → nshtrainer-1.0.0b37}/src/nshtrainer/configs/lr_scheduler/__init__.py

@@ -8,12 +8,13 @@ from nshtrainer.lr_scheduler import (
 from nshtrainer.lr_scheduler import LRSchedulerConfig as LRSchedulerConfig
 from nshtrainer.lr_scheduler import LRSchedulerConfigBase as LRSchedulerConfigBase
 from nshtrainer.lr_scheduler import ReduceLROnPlateauConfig as ReduceLROnPlateauConfig
+from nshtrainer.lr_scheduler.base import lr_scheduler_registry as lr_scheduler_registry
 from nshtrainer.lr_scheduler.linear_warmup_cosine import (
     DurationConfig as DurationConfig,
 )
 from nshtrainer.lr_scheduler.reduce_lr_on_plateau import MetricConfig as MetricConfig
 
-from . import _base as _base
+from . import base as base
 from . import linear_warmup_cosine as linear_warmup_cosine
 from . import reduce_lr_on_plateau as reduce_lr_on_plateau
 
@@ -24,7 +25,8 @@ __all__ = [
     "LinearWarmupCosineDecayLRSchedulerConfig",
     "MetricConfig",
     "ReduceLROnPlateauConfig",
-    "_base",
+    "base",
     "linear_warmup_cosine",
+    "lr_scheduler_registry",
     "reduce_lr_on_plateau",
 ]

nshtrainer-1.0.0b37/src/nshtrainer/configs/lr_scheduler/base/__init__.py

@@ -0,0 +1,11 @@
+from __future__ import annotations
+
+__codegen__ = True
+
+from nshtrainer.lr_scheduler.base import LRSchedulerConfigBase as LRSchedulerConfigBase
+from nshtrainer.lr_scheduler.base import lr_scheduler_registry as lr_scheduler_registry
+
+__all__ = [
+    "LRSchedulerConfigBase",
+    "lr_scheduler_registry",
+]

{nshtrainer-1.0.0b36 → nshtrainer-1.0.0b37}/src/nshtrainer/configs/lr_scheduler/linear_warmup_cosine/__init__.py

@@ -11,9 +11,13 @@ from nshtrainer.lr_scheduler.linear_warmup_cosine import (
 from nshtrainer.lr_scheduler.linear_warmup_cosine import (
     LRSchedulerConfigBase as LRSchedulerConfigBase,
 )
+from nshtrainer.lr_scheduler.linear_warmup_cosine import (
+    lr_scheduler_registry as lr_scheduler_registry,
+)
 
 __all__ = [
     "DurationConfig",
     "LRSchedulerConfigBase",
     "LinearWarmupCosineDecayLRSchedulerConfig",
+    "lr_scheduler_registry",
 ]

{nshtrainer-1.0.0b36 → nshtrainer-1.0.0b37}/src/nshtrainer/configs/lr_scheduler/reduce_lr_on_plateau/__init__.py

@@ -9,9 +9,13 @@ from nshtrainer.lr_scheduler.reduce_lr_on_plateau import MetricConfig as MetricC
 from nshtrainer.lr_scheduler.reduce_lr_on_plateau import (
     ReduceLROnPlateauConfig as ReduceLROnPlateauConfig,
 )
+from nshtrainer.lr_scheduler.reduce_lr_on_plateau import (
+    lr_scheduler_registry as lr_scheduler_registry,
+)
 
 __all__ = [
     "LRSchedulerConfigBase",
     "MetricConfig",
     "ReduceLROnPlateauConfig",
+    "lr_scheduler_registry",
 ]

{nshtrainer-1.0.0b36 → nshtrainer-1.0.0b37}/src/nshtrainer/configs/nn/__init__.py

@@ -2,13 +2,13 @@ from __future__ import annotations
 
 __codegen__ = True
 
-from nshtrainer.nn import BaseNonlinearityConfig as BaseNonlinearityConfig
 from nshtrainer.nn import ELUNonlinearityConfig as ELUNonlinearityConfig
 from nshtrainer.nn import GELUNonlinearityConfig as GELUNonlinearityConfig
 from nshtrainer.nn import LeakyReLUNonlinearityConfig as LeakyReLUNonlinearityConfig
 from nshtrainer.nn import MishNonlinearityConfig as MishNonlinearityConfig
 from nshtrainer.nn import MLPConfig as MLPConfig
 from nshtrainer.nn import NonlinearityConfig as NonlinearityConfig
+from nshtrainer.nn import NonlinearityConfigBase as NonlinearityConfigBase
 from nshtrainer.nn import PReLUConfig as PReLUConfig
 from nshtrainer.nn import ReLUNonlinearityConfig as ReLUNonlinearityConfig
 from nshtrainer.nn import SigmoidNonlinearityConfig as SigmoidNonlinearityConfig
@@ -21,18 +21,19 @@ from nshtrainer.nn import TanhNonlinearityConfig as TanhNonlinearityConfig
 from nshtrainer.nn.nonlinearity import (
     SwiGLUNonlinearityConfig as SwiGLUNonlinearityConfig,
 )
+from nshtrainer.nn.nonlinearity import nonlinearity_registry as nonlinearity_registry
 
 from . import mlp as mlp
 from . import nonlinearity as nonlinearity
 
 __all__ = [
-    "BaseNonlinearityConfig",
     "ELUNonlinearityConfig",
     "GELUNonlinearityConfig",
     "LeakyReLUNonlinearityConfig",
     "MLPConfig",
     "MishNonlinearityConfig",
     "NonlinearityConfig",
+    "NonlinearityConfigBase",
     "PReLUConfig",
     "ReLUNonlinearityConfig",
     "SiLUNonlinearityConfig",
@@ -45,4 +46,5 @@ __all__ = [
     "TanhNonlinearityConfig",
     "mlp",
     "nonlinearity",
+    "nonlinearity_registry",
 ]

{nshtrainer-1.0.0b36 → nshtrainer-1.0.0b37}/src/nshtrainer/configs/nn/mlp/__init__.py

@@ -2,12 +2,12 @@ from __future__ import annotations
 
 __codegen__ = True
 
-from nshtrainer.nn.mlp import BaseNonlinearityConfig as BaseNonlinearityConfig
 from nshtrainer.nn.mlp import MLPConfig as MLPConfig
 from nshtrainer.nn.mlp import NonlinearityConfig as NonlinearityConfig
+from nshtrainer.nn.mlp import NonlinearityConfigBase as NonlinearityConfigBase
 
 __all__ = [
-    "BaseNonlinearityConfig",
     "MLPConfig",
     "NonlinearityConfig",
+    "NonlinearityConfigBase",
 ]

{nshtrainer-1.0.0b36 → nshtrainer-1.0.0b37}/src/nshtrainer/configs/nn/nonlinearity/__init__.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 __codegen__ = True
 
-from nshtrainer.nn.nonlinearity import BaseNonlinearityConfig as BaseNonlinearityConfig
 from nshtrainer.nn.nonlinearity import ELUNonlinearityConfig as ELUNonlinearityConfig
 from nshtrainer.nn.nonlinearity import GELUNonlinearityConfig as GELUNonlinearityConfig
 from nshtrainer.nn.nonlinearity import (
@@ -10,6 +9,7 @@ from nshtrainer.nn.nonlinearity import (
 )
 from nshtrainer.nn.nonlinearity import MishNonlinearityConfig as MishNonlinearityConfig
 from nshtrainer.nn.nonlinearity import NonlinearityConfig as NonlinearityConfig
+from nshtrainer.nn.nonlinearity import NonlinearityConfigBase as NonlinearityConfigBase
 from nshtrainer.nn.nonlinearity import PReLUConfig as PReLUConfig
 from nshtrainer.nn.nonlinearity import ReLUNonlinearityConfig as ReLUNonlinearityConfig
 from nshtrainer.nn.nonlinearity import (
@@ -32,14 +32,15 @@ from nshtrainer.nn.nonlinearity import (
     SwishNonlinearityConfig as SwishNonlinearityConfig,
 )
 from nshtrainer.nn.nonlinearity import TanhNonlinearityConfig as TanhNonlinearityConfig
+from nshtrainer.nn.nonlinearity import nonlinearity_registry as nonlinearity_registry
 
 __all__ = [
-    "BaseNonlinearityConfig",
     "ELUNonlinearityConfig",
     "GELUNonlinearityConfig",
     "LeakyReLUNonlinearityConfig",
     "MishNonlinearityConfig",
     "NonlinearityConfig",
+    "NonlinearityConfigBase",
     "PReLUConfig",
     "ReLUNonlinearityConfig",
     "SiLUNonlinearityConfig",
@@ -50,4 +51,5 @@ __all__ = [
     "SwiGLUNonlinearityConfig",
     "SwishNonlinearityConfig",
     "TanhNonlinearityConfig",
+    "nonlinearity_registry",
 ]

{nshtrainer-1.0.0b36 → nshtrainer-1.0.0b37}/src/nshtrainer/configs/optimizer/__init__.py

@@ -5,9 +5,11 @@ __codegen__ = True
 from nshtrainer.optimizer import AdamWConfig as AdamWConfig
 from nshtrainer.optimizer import OptimizerConfig as OptimizerConfig
 from nshtrainer.optimizer import OptimizerConfigBase as OptimizerConfigBase
+from nshtrainer.optimizer import optimizer_registry as optimizer_registry
 
 __all__ = [
     "AdamWConfig",
     "OptimizerConfig",
     "OptimizerConfigBase",
+    "optimizer_registry",
 ]

{nshtrainer-1.0.0b36 → nshtrainer-1.0.0b37}/src/nshtrainer/configs/trainer/__init__.py

@@ -8,7 +8,6 @@ from nshtrainer.trainer import callback_registry as callback_registry
 from nshtrainer.trainer import plugin_registry as plugin_registry
 from nshtrainer.trainer._config import AcceleratorConfig as AcceleratorConfig
 from nshtrainer.trainer._config import ActSaveLoggerConfig as ActSaveLoggerConfig
-from nshtrainer.trainer._config import BaseLoggerConfig as BaseLoggerConfig
 from nshtrainer.trainer._config import (
     BestCheckpointCallbackConfig as BestCheckpointCallbackConfig,
 )
@@ -37,6 +36,7 @@ from nshtrainer.trainer._config import (
 )
 from nshtrainer.trainer._config import LogEpochCallbackConfig as LogEpochCallbackConfig
 from nshtrainer.trainer._config import LoggerConfig as LoggerConfig
+from nshtrainer.trainer._config import LoggerConfigBase as LoggerConfigBase
 from nshtrainer.trainer._config import MetricConfig as MetricConfig
 from nshtrainer.trainer._config import (
     NormLoggingCallbackConfig as NormLoggingCallbackConfig,
@@ -133,7 +133,6 @@ __all__ = [
     "AcceleratorConfigBase",
     "ActSaveLoggerConfig",
     "AsyncCheckpointIOPlugin",
-    "BaseLoggerConfig",
     "BestCheckpointCallbackConfig",
     "BitsandbytesPluginConfig",
     "CPUAcceleratorConfig",
@@ -161,6 +160,7 @@ __all__ = [
     "LightningEnvironmentPlugin",
     "LogEpochCallbackConfig",
     "LoggerConfig",
+    "LoggerConfigBase",
     "MPIEnvironmentPlugin",
     "MPSAcceleratorConfig",
     "MetricConfig",

{nshtrainer-1.0.0b36 → nshtrainer-1.0.0b37}/src/nshtrainer/configs/trainer/_config/__init__.py

@@ -4,7 +4,6 @@ __codegen__ = True
 
 from nshtrainer.trainer._config import AcceleratorConfig as AcceleratorConfig
 from nshtrainer.trainer._config import ActSaveLoggerConfig as ActSaveLoggerConfig
-from nshtrainer.trainer._config import BaseLoggerConfig as BaseLoggerConfig
 from nshtrainer.trainer._config import (
     BestCheckpointCallbackConfig as BestCheckpointCallbackConfig,
 )
@@ -33,6 +32,7 @@ from nshtrainer.trainer._config import (
 )
 from nshtrainer.trainer._config import LogEpochCallbackConfig as LogEpochCallbackConfig
 from nshtrainer.trainer._config import LoggerConfig as LoggerConfig
+from nshtrainer.trainer._config import LoggerConfigBase as LoggerConfigBase
 from nshtrainer.trainer._config import MetricConfig as MetricConfig
 from nshtrainer.trainer._config import (
     NormLoggingCallbackConfig as NormLoggingCallbackConfig,
@@ -59,7 +59,6 @@ from nshtrainer.trainer._config import WandbLoggerConfig as WandbLoggerConfig
 __all__ = [
     "AcceleratorConfig",
     "ActSaveLoggerConfig",
-    "BaseLoggerConfig",
     "BestCheckpointCallbackConfig",
     "CSVLoggerConfig",
     "CallbackConfig",
@@ -76,6 +75,7 @@ __all__ = [
     "LearningRateMonitorConfig",
     "LogEpochCallbackConfig",
     "LoggerConfig",
+    "LoggerConfigBase",
     "MetricConfig",
     "NormLoggingCallbackConfig",
     "OnExceptionCheckpointCallbackConfig",

{nshtrainer-1.0.0b36 → nshtrainer-1.0.0b37}/src/nshtrainer/loggers/__init__.py

@@ -5,19 +5,14 @@ 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
+from .base import LoggerConfigBase as LoggerConfigBase
+from .base import logger_registry as logger_registry
 from .csv import CSVLoggerConfig as CSVLoggerConfig
 from .tensorboard import TensorboardLoggerConfig as TensorboardLoggerConfig
 from .wandb import WandbLoggerConfig as WandbLoggerConfig
 
 LoggerConfig = TypeAliasType(
     "LoggerConfig",
-    Annotated[
-        CSVLoggerConfig
-        | TensorboardLoggerConfig
-        | WandbLoggerConfig
-        | ActSaveLoggerConfig,
-        C.Field(discriminator="name"),
-    ],
+    Annotated[LoggerConfigBase, logger_registry.DynamicResolution()],
 )

{nshtrainer-1.0.0b36 → nshtrainer-1.0.0b37}/src/nshtrainer/loggers/actsave.py

@@ -5,11 +5,14 @@ from typing import Any, Literal
 
 import numpy as np
 from lightning.pytorch.loggers import Logger
+from typing_extensions import final
 
-from ._base import BaseLoggerConfig
+from .base import LoggerConfigBase, logger_registry
 
 
-class ActSaveLoggerConfig(BaseLoggerConfig):
+@final
+@logger_registry.register
+class ActSaveLoggerConfig(LoggerConfigBase):
     name: Literal["actsave"] = "actsave"
 
     def create_logger(self, trainer_config):

nshtrainer-1.0.0b36/src/nshtrainer/loggers/_base.py → nshtrainer-1.0.0b37/src/nshtrainer/loggers/base.py

@@ -10,7 +10,7 @@ if TYPE_CHECKING:
     from ..trainer._config import TrainerConfig
 
 
-class BaseLoggerConfig(C.Config, ABC):
+class LoggerConfigBase(C.Config, ABC):
     enabled: bool = True
     """Enable this logger."""
 
@@ -29,3 +29,6 @@ class BaseLoggerConfig(C.Config, ABC):
 
     def __bool__(self):
         return self.enabled
+
+
+logger_registry = C.Registry(LoggerConfigBase, discriminator="name")

{nshtrainer-1.0.0b36 → nshtrainer-1.0.0b37}/src/nshtrainer/loggers/csv.py

@@ -2,12 +2,14 @@ from __future__ import annotations
 
 from typing import Literal
 
-from typing_extensions import override
+from typing_extensions import final, override
 
-from ._base import BaseLoggerConfig
+from .base import LoggerConfigBase, logger_registry
 
 
-class CSVLoggerConfig(BaseLoggerConfig):
+@final
+@logger_registry.register
+class CSVLoggerConfig(LoggerConfigBase):
     name: Literal["csv"] = "csv"
 
     enabled: bool = True

{nshtrainer-1.0.0b36 → nshtrainer-1.0.0b37}/src/nshtrainer/loggers/tensorboard.py

@@ -4,9 +4,9 @@ import logging
 from typing import Literal
 
 import nshconfig as C
-from typing_extensions import override
+from typing_extensions import final, override
 
-from ._base import BaseLoggerConfig
+from .base import LoggerConfigBase, logger_registry
 
 log = logging.getLogger(__name__)
 
@@ -30,7 +30,9 @@ def _tensorboard_available():
         return False
 
 
-class TensorboardLoggerConfig(BaseLoggerConfig):
+@final
+@logger_registry.register
+class TensorboardLoggerConfig(LoggerConfigBase):
     name: Literal["tensorboard"] = "tensorboard"
 
     enabled: bool = C.Field(default_factory=lambda: _tensorboard_available())

{nshtrainer-1.0.0b36 → nshtrainer-1.0.0b37}/src/nshtrainer/loggers/wandb.py

@@ -7,12 +7,12 @@ from typing import TYPE_CHECKING, Literal
 import nshconfig as C
 from lightning.pytorch import Callback, LightningModule, Trainer
 from packaging import version
-from typing_extensions import assert_never, override
+from typing_extensions import assert_never, final, override
 
 from ..callbacks.base import CallbackConfigBase
 from ..callbacks.wandb_upload_code import WandbUploadCodeCallbackConfig
 from ..callbacks.wandb_watch import WandbWatchCallbackConfig
-from ._base import BaseLoggerConfig
+from .base import LoggerConfigBase, logger_registry
 
 if TYPE_CHECKING:
     from ..trainer._config import TrainerConfig
@@ -73,7 +73,9 @@ class FinishWandbOnTeardownCallback(Callback):
         wandb.finish()
 
 
-class WandbLoggerConfig(CallbackConfigBase, BaseLoggerConfig):
+@final
+@logger_registry.register
+class WandbLoggerConfig(CallbackConfigBase, LoggerConfigBase):
     name: Literal["wandb"] = "wandb"
 
     enabled: bool = C.Field(default_factory=lambda: _wandb_available())

{nshtrainer-1.0.0b36 → nshtrainer-1.0.0b37}/src/nshtrainer/lr_scheduler/__init__.py

@@ -5,8 +5,8 @@ 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
+from .base import LRSchedulerConfigBase as LRSchedulerConfigBase
+from .base import LRSchedulerMetadata as LRSchedulerMetadata
 from .linear_warmup_cosine import (
     LinearWarmupCosineAnnealingLR as LinearWarmupCosineAnnealingLR,
 )

nshtrainer-1.0.0b36/src/nshtrainer/lr_scheduler/_base.py → nshtrainer-1.0.0b37/src/nshtrainer/lr_scheduler/base.py

@@ -94,3 +94,6 @@ class LRSchedulerConfigBase(C.Config, ABC):
         # ^ This is a hack to trigger the computation of the estimated stepping batches
         #   and make sure that the `trainer.num_training_batches` attribute is set.
         return math.ceil(trainer.num_training_batches / trainer.accumulate_grad_batches)
+
+
+lr_scheduler_registry = C.Registry(LRSchedulerConfigBase, discriminator="name")