nshtrainer 1.0.0b27__tar.gz → 1.0.0b29__tar.gz

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

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

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

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

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

@@ -14,6 +14,7 @@ from nshtrainer._hf_hub import HuggingFaceHubConfig as HuggingFaceHubConfig
 from nshtrainer.callbacks import (
     BestCheckpointCallbackConfig as BestCheckpointCallbackConfig,
 )
+from nshtrainer.callbacks import CallbackConfig as CallbackConfig
 from nshtrainer.callbacks import DebugFlagCallbackConfig as DebugFlagCallbackConfig
 from nshtrainer.callbacks import (
     DirectorySetupCallbackConfig as DirectorySetupCallbackConfig,
@@ -60,11 +61,13 @@ from nshtrainer.callbacks.checkpoint._base import (
 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 TensorboardLoggerConfig as TensorboardLoggerConfig
 from nshtrainer.loggers import WandbLoggerConfig as WandbLoggerConfig
 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
@@ -73,6 +76,7 @@ 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 PReLUConfig as PReLUConfig
 from nshtrainer.nn import ReLUNonlinearityConfig as ReLUNonlinearityConfig
 from nshtrainer.nn import SigmoidNonlinearityConfig as SigmoidNonlinearityConfig
@@ -86,12 +90,17 @@ from nshtrainer.nn.nonlinearity import (
     SwiGLUNonlinearityConfig as SwiGLUNonlinearityConfig,
 )
 from nshtrainer.optimizer import AdamWConfig as AdamWConfig
+from nshtrainer.optimizer import OptimizerConfig as OptimizerConfig
 from nshtrainer.optimizer import OptimizerConfigBase as OptimizerConfigBase
 from nshtrainer.profiler import AdvancedProfilerConfig as AdvancedProfilerConfig
 from nshtrainer.profiler import BaseProfilerConfig as BaseProfilerConfig
+from nshtrainer.profiler import ProfilerConfig as ProfilerConfig
 from nshtrainer.profiler import PyTorchProfilerConfig as PyTorchProfilerConfig
 from nshtrainer.profiler import SimpleProfilerConfig as SimpleProfilerConfig
 from nshtrainer.trainer._config import AcceleratorConfigBase as AcceleratorConfigBase
+from nshtrainer.trainer._config import (
+    CheckpointCallbackConfig as CheckpointCallbackConfig,
+)
 from nshtrainer.trainer._config import CheckpointSavingConfig as CheckpointSavingConfig
 from nshtrainer.trainer._config import EnvironmentConfig as EnvironmentConfig
 from nshtrainer.trainer._config import GradientClippingConfig as GradientClippingConfig
@@ -130,6 +139,7 @@ from nshtrainer.util._environment_info import (
 )
 from nshtrainer.util._environment_info import GitRepositoryConfig as GitRepositoryConfig
 from nshtrainer.util.config import DTypeConfig as DTypeConfig
+from nshtrainer.util.config import DurationConfig as DurationConfig
 from nshtrainer.util.config import EpochsConfig as EpochsConfig
 from nshtrainer.util.config import StepsConfig as StepsConfig
 
@@ -158,13 +168,16 @@ __all__ = [
     "BaseProfilerConfig",
     "BestCheckpointCallbackConfig",
     "CSVLoggerConfig",
+    "CallbackConfig",
     "CallbackConfigBase",
+    "CheckpointCallbackConfig",
     "CheckpointMetadata",
     "CheckpointSavingConfig",
     "DTypeConfig",
     "DebugFlagCallbackConfig",
     "DirectoryConfig",
     "DirectorySetupCallbackConfig",
+    "DurationConfig",
     "ELUNonlinearityConfig",
     "EMACallbackConfig",
     "EarlyStoppingCallbackConfig",
@@ -187,21 +200,26 @@ __all__ = [
     "GradientSkippingCallbackConfig",
     "HuggingFaceHubAutoCreateConfig",
     "HuggingFaceHubConfig",
+    "LRSchedulerConfig",
     "LRSchedulerConfigBase",
     "LastCheckpointCallbackConfig",
     "LeakyReLUNonlinearityConfig",
     "LearningRateMonitorConfig",
     "LinearWarmupCosineDecayLRSchedulerConfig",
     "LogEpochCallbackConfig",
+    "LoggerConfig",
     "MLPConfig",
     "MetricConfig",
     "MishNonlinearityConfig",
+    "NonlinearityConfig",
     "NormLoggingCallbackConfig",
     "OnExceptionCheckpointCallbackConfig",
+    "OptimizerConfig",
     "OptimizerConfigBase",
     "PReLUConfig",
     "PluginConfigBase",
     "PrintTableMetricsCallbackConfig",
+    "ProfilerConfig",
     "PyTorchProfilerConfig",
     "RLPSanityChecksCallbackConfig",
     "ReLUNonlinearityConfig",

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

@@ -6,8 +6,10 @@ from nshtrainer._directory import DirectoryConfig as DirectoryConfig
 from nshtrainer._directory import (
     DirectorySetupCallbackConfig as DirectorySetupCallbackConfig,
 )
+from nshtrainer._directory import LoggerConfig as LoggerConfig
 
 __all__ = [
     "DirectoryConfig",
     "DirectorySetupCallbackConfig",
+    "LoggerConfig",
 ]

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

@@ -5,6 +5,7 @@ __codegen__ = True
 from nshtrainer.callbacks import (
     BestCheckpointCallbackConfig as BestCheckpointCallbackConfig,
 )
+from nshtrainer.callbacks import CallbackConfig as CallbackConfig
 from nshtrainer.callbacks import CallbackConfigBase as CallbackConfigBase
 from nshtrainer.callbacks import DebugFlagCallbackConfig as DebugFlagCallbackConfig
 from nshtrainer.callbacks import (
@@ -80,6 +81,7 @@ __all__ = [
     "ActSaveConfig",
     "BaseCheckpointCallbackConfig",
     "BestCheckpointCallbackConfig",
+    "CallbackConfig",
     "CallbackConfigBase",
     "CheckpointMetadata",
     "DebugFlagCallbackConfig",

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

@@ -5,6 +5,7 @@ __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 TensorboardLoggerConfig as TensorboardLoggerConfig
 from nshtrainer.loggers import WandbLoggerConfig as WandbLoggerConfig
 from nshtrainer.loggers.wandb import CallbackConfigBase as CallbackConfigBase
@@ -26,6 +27,7 @@ __all__ = [
     "BaseLoggerConfig",
     "CSVLoggerConfig",
     "CallbackConfigBase",
+    "LoggerConfig",
     "TensorboardLoggerConfig",
     "WandbLoggerConfig",
     "WandbUploadCodeCallbackConfig",

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

@@ -5,8 +5,12 @@ __codegen__ = True
 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.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
@@ -14,6 +18,8 @@ from . import linear_warmup_cosine as linear_warmup_cosine
 from . import reduce_lr_on_plateau as reduce_lr_on_plateau
 
 __all__ = [
+    "DurationConfig",
+    "LRSchedulerConfig",
     "LRSchedulerConfigBase",
     "LinearWarmupCosineDecayLRSchedulerConfig",
     "MetricConfig",

{nshtrainer-1.0.0b27 → nshtrainer-1.0.0b29}/src/nshtrainer/configs/lr_scheduler/linear_warmup_cosine/__init__.py

@@ -2,6 +2,9 @@ from __future__ import annotations
 
 __codegen__ = True
 
+from nshtrainer.lr_scheduler.linear_warmup_cosine import (
+    DurationConfig as DurationConfig,
+)
 from nshtrainer.lr_scheduler.linear_warmup_cosine import (
     LinearWarmupCosineDecayLRSchedulerConfig as LinearWarmupCosineDecayLRSchedulerConfig,
 )
@@ -10,6 +13,7 @@ from nshtrainer.lr_scheduler.linear_warmup_cosine import (
 )
 
 __all__ = [
+    "DurationConfig",
     "LRSchedulerConfigBase",
     "LinearWarmupCosineDecayLRSchedulerConfig",
 ]

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

@@ -8,6 +8,7 @@ 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 PReLUConfig as PReLUConfig
 from nshtrainer.nn import ReLUNonlinearityConfig as ReLUNonlinearityConfig
 from nshtrainer.nn import SigmoidNonlinearityConfig as SigmoidNonlinearityConfig
@@ -31,6 +32,7 @@ __all__ = [
     "LeakyReLUNonlinearityConfig",
     "MLPConfig",
     "MishNonlinearityConfig",
+    "NonlinearityConfig",
     "PReLUConfig",
     "ReLUNonlinearityConfig",
     "SiLUNonlinearityConfig",

{nshtrainer-1.0.0b27 → nshtrainer-1.0.0b29}/src/nshtrainer/configs/nn/mlp/__init__.py

@@ -4,8 +4,10 @@ __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
 
 __all__ = [
     "BaseNonlinearityConfig",
     "MLPConfig",
+    "NonlinearityConfig",
 ]

{nshtrainer-1.0.0b27 → nshtrainer-1.0.0b29}/src/nshtrainer/configs/nn/nonlinearity/__init__.py

@@ -9,6 +9,7 @@ from nshtrainer.nn.nonlinearity import (
     LeakyReLUNonlinearityConfig as LeakyReLUNonlinearityConfig,
 )
 from nshtrainer.nn.nonlinearity import MishNonlinearityConfig as MishNonlinearityConfig
+from nshtrainer.nn.nonlinearity import NonlinearityConfig as NonlinearityConfig
 from nshtrainer.nn.nonlinearity import PReLUConfig as PReLUConfig
 from nshtrainer.nn.nonlinearity import ReLUNonlinearityConfig as ReLUNonlinearityConfig
 from nshtrainer.nn.nonlinearity import (
@@ -38,6 +39,7 @@ __all__ = [
     "GELUNonlinearityConfig",
     "LeakyReLUNonlinearityConfig",
     "MishNonlinearityConfig",
+    "NonlinearityConfig",
     "PReLUConfig",
     "ReLUNonlinearityConfig",
     "SiLUNonlinearityConfig",

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

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

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

@@ -4,6 +4,7 @@ __codegen__ = True
 
 from nshtrainer.profiler import AdvancedProfilerConfig as AdvancedProfilerConfig
 from nshtrainer.profiler import BaseProfilerConfig as BaseProfilerConfig
+from nshtrainer.profiler import ProfilerConfig as ProfilerConfig
 from nshtrainer.profiler import PyTorchProfilerConfig as PyTorchProfilerConfig
 from nshtrainer.profiler import SimpleProfilerConfig as SimpleProfilerConfig
 
@@ -15,6 +16,7 @@ from . import simple as simple
 __all__ = [
     "AdvancedProfilerConfig",
     "BaseProfilerConfig",
+    "ProfilerConfig",
     "PyTorchProfilerConfig",
     "SimpleProfilerConfig",
     "_base",

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

@@ -9,7 +9,11 @@ from nshtrainer.trainer._config import BaseLoggerConfig as BaseLoggerConfig
 from nshtrainer.trainer._config import (
     BestCheckpointCallbackConfig as BestCheckpointCallbackConfig,
 )
+from nshtrainer.trainer._config import CallbackConfig as CallbackConfig
 from nshtrainer.trainer._config import CallbackConfigBase as CallbackConfigBase
+from nshtrainer.trainer._config import (
+    CheckpointCallbackConfig as CheckpointCallbackConfig,
+)
 from nshtrainer.trainer._config import CheckpointSavingConfig as CheckpointSavingConfig
 from nshtrainer.trainer._config import CSVLoggerConfig as CSVLoggerConfig
 from nshtrainer.trainer._config import (
@@ -29,6 +33,7 @@ from nshtrainer.trainer._config import (
     LearningRateMonitorConfig as LearningRateMonitorConfig,
 )
 from nshtrainer.trainer._config import LogEpochCallbackConfig as LogEpochCallbackConfig
+from nshtrainer.trainer._config import LoggerConfig as LoggerConfig
 from nshtrainer.trainer._config import MetricConfig as MetricConfig
 from nshtrainer.trainer._config import (
     NormLoggingCallbackConfig as NormLoggingCallbackConfig,
@@ -37,6 +42,7 @@ from nshtrainer.trainer._config import (
     OnExceptionCheckpointCallbackConfig as OnExceptionCheckpointCallbackConfig,
 )
 from nshtrainer.trainer._config import PluginConfigBase as PluginConfigBase
+from nshtrainer.trainer._config import ProfilerConfig as ProfilerConfig
 from nshtrainer.trainer._config import (
     RLPSanityChecksCallbackConfig as RLPSanityChecksCallbackConfig,
 )
@@ -62,7 +68,9 @@ __all__ = [
     "BaseLoggerConfig",
     "BestCheckpointCallbackConfig",
     "CSVLoggerConfig",
+    "CallbackConfig",
     "CallbackConfigBase",
+    "CheckpointCallbackConfig",
     "CheckpointSavingConfig",
     "DebugFlagCallbackConfig",
     "DirectoryConfig",
@@ -73,10 +81,12 @@ __all__ = [
     "LastCheckpointCallbackConfig",
     "LearningRateMonitorConfig",
     "LogEpochCallbackConfig",
+    "LoggerConfig",
     "MetricConfig",
     "NormLoggingCallbackConfig",
     "OnExceptionCheckpointCallbackConfig",
     "PluginConfigBase",
+    "ProfilerConfig",
     "RLPSanityChecksCallbackConfig",
     "SanityCheckingConfig",
     "SharedParametersCallbackConfig",

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

@@ -8,7 +8,11 @@ from nshtrainer.trainer._config import BaseLoggerConfig as BaseLoggerConfig
 from nshtrainer.trainer._config import (
     BestCheckpointCallbackConfig as BestCheckpointCallbackConfig,
 )
+from nshtrainer.trainer._config import CallbackConfig as CallbackConfig
 from nshtrainer.trainer._config import CallbackConfigBase as CallbackConfigBase
+from nshtrainer.trainer._config import (
+    CheckpointCallbackConfig as CheckpointCallbackConfig,
+)
 from nshtrainer.trainer._config import CheckpointSavingConfig as CheckpointSavingConfig
 from nshtrainer.trainer._config import CSVLoggerConfig as CSVLoggerConfig
 from nshtrainer.trainer._config import (
@@ -28,6 +32,7 @@ from nshtrainer.trainer._config import (
     LearningRateMonitorConfig as LearningRateMonitorConfig,
 )
 from nshtrainer.trainer._config import LogEpochCallbackConfig as LogEpochCallbackConfig
+from nshtrainer.trainer._config import LoggerConfig as LoggerConfig
 from nshtrainer.trainer._config import MetricConfig as MetricConfig
 from nshtrainer.trainer._config import (
     NormLoggingCallbackConfig as NormLoggingCallbackConfig,
@@ -36,6 +41,7 @@ from nshtrainer.trainer._config import (
     OnExceptionCheckpointCallbackConfig as OnExceptionCheckpointCallbackConfig,
 )
 from nshtrainer.trainer._config import PluginConfigBase as PluginConfigBase
+from nshtrainer.trainer._config import ProfilerConfig as ProfilerConfig
 from nshtrainer.trainer._config import (
     RLPSanityChecksCallbackConfig as RLPSanityChecksCallbackConfig,
 )
@@ -59,7 +65,9 @@ __all__ = [
     "BaseLoggerConfig",
     "BestCheckpointCallbackConfig",
     "CSVLoggerConfig",
+    "CallbackConfig",
     "CallbackConfigBase",
+    "CheckpointCallbackConfig",
     "CheckpointSavingConfig",
     "DebugFlagCallbackConfig",
     "DirectoryConfig",
@@ -70,10 +78,12 @@ __all__ = [
     "LastCheckpointCallbackConfig",
     "LearningRateMonitorConfig",
     "LogEpochCallbackConfig",
+    "LoggerConfig",
     "MetricConfig",
     "NormLoggingCallbackConfig",
     "OnExceptionCheckpointCallbackConfig",
     "PluginConfigBase",
+    "ProfilerConfig",
     "RLPSanityChecksCallbackConfig",
     "SanityCheckingConfig",
     "SharedParametersCallbackConfig",

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

@@ -32,6 +32,7 @@ from nshtrainer.util._environment_info import (
 )
 from nshtrainer.util._environment_info import GitRepositoryConfig as GitRepositoryConfig
 from nshtrainer.util.config import DTypeConfig as DTypeConfig
+from nshtrainer.util.config import DurationConfig as DurationConfig
 from nshtrainer.util.config import EpochsConfig as EpochsConfig
 from nshtrainer.util.config import StepsConfig as StepsConfig
 
@@ -40,6 +41,7 @@ from . import config as config
 
 __all__ = [
     "DTypeConfig",
+    "DurationConfig",
     "EnvironmentCUDAConfig",
     "EnvironmentClassInformationConfig",
     "EnvironmentConfig",

{nshtrainer-1.0.0b27 → nshtrainer-1.0.0b29}/src/nshtrainer/configs/util/config/__init__.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 __codegen__ = True
 
 from nshtrainer.util.config import DTypeConfig as DTypeConfig
+from nshtrainer.util.config import DurationConfig as DurationConfig
 from nshtrainer.util.config import EpochsConfig as EpochsConfig
 from nshtrainer.util.config import StepsConfig as StepsConfig
 
@@ -11,6 +12,7 @@ from . import duration as duration
 
 __all__ = [
     "DTypeConfig",
+    "DurationConfig",
     "EpochsConfig",
     "StepsConfig",
     "dtype",

{nshtrainer-1.0.0b27 → nshtrainer-1.0.0b29}/src/nshtrainer/configs/util/config/duration/__init__.py

@@ -2,10 +2,12 @@ from __future__ import annotations
 
 __codegen__ = True
 
+from nshtrainer.util.config.duration import DurationConfig as DurationConfig
 from nshtrainer.util.config.duration import EpochsConfig as EpochsConfig
 from nshtrainer.util.config.duration import StepsConfig as StepsConfig
 
 __all__ = [
+    "DurationConfig",
     "EpochsConfig",
     "StepsConfig",
 ]

{nshtrainer-1.0.0b27 → nshtrainer-1.0.0b29}/src/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-1.0.0b27 → nshtrainer-1.0.0b29}/src/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"``.
     """