nshtrainer 0.10.1__tar.gz → 0.10.3__tar.gz

{nshtrainer-0.10.1 → nshtrainer-0.10.3}/PKG-INFO

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

{nshtrainer-0.10.1 → nshtrainer-0.10.3}/pyproject.toml

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

{nshtrainer-0.10.1 → nshtrainer-0.10.3}/src/nshtrainer/callbacks/latest_epoch_checkpoint.py

@@ -12,7 +12,7 @@ log = logging.getLogger(__name__)
 
 
 class LatestEpochCheckpointCallbackConfig(CallbackConfigBase):
-    kind: Literal["latest_epoch_checkpoint"] = "latest_epoch_checkpoint"
+    name: Literal["latest_epoch_checkpoint"] = "latest_epoch_checkpoint"
 
     dirpath: str | Path | None = None
     """Directory path to save the checkpoint file."""

{nshtrainer-0.10.1 → nshtrainer-0.10.3}/src/nshtrainer/callbacks/model_checkpoint.py

@@ -43,7 +43,7 @@ def _convert_string(input_string: str):
 class ModelCheckpointCallbackConfig(CallbackConfigBase):
     """Arguments for the ModelCheckpoint callback."""
 
-    kind: Literal["model_checkpoint"] = "model_checkpoint"
+    name: Literal["model_checkpoint"] = "model_checkpoint"
 
     dirpath: str | Path | None = None
     """

{nshtrainer-0.10.1 → nshtrainer-0.10.3}/src/nshtrainer/callbacks/on_exception_checkpoint.py

@@ -43,7 +43,7 @@ def _monkey_patch_disable_barrier(trainer: LightningTrainer):
 
 
 class OnExceptionCheckpointCallbackConfig(CallbackConfigBase):
-    kind: Literal["on_exception_checkpoint"] = "on_exception_checkpoint"
+    name: Literal["on_exception_checkpoint"] = "on_exception_checkpoint"
 
     dirpath: str | Path | None = None
     """Directory path to save the checkpoint file."""

{nshtrainer-0.10.1 → nshtrainer-0.10.3}/src/nshtrainer/callbacks/wandb_watch.py

@@ -81,7 +81,7 @@ class WandbWatchCallback(Callback):
 
 
 class WandbWatchConfig(CallbackConfigBase):
-    name: Literal["finite_checks"] = "finite_checks"
+    name: Literal["wandb_watch"] = "wandb_watch"
 
     enabled: bool = True
     """Enable watching the model for wandb."""

{nshtrainer-0.10.1 → nshtrainer-0.10.3}/src/nshtrainer/model/config.py

@@ -71,7 +71,7 @@ class BaseProfilerConfig(C.Config, ABC):
 
 
 class SimpleProfilerConfig(BaseProfilerConfig):
-    kind: Literal["simple"] = "simple"
+    name: Literal["simple"] = "simple"
 
     extended: bool = True
     """
@@ -99,7 +99,7 @@ class SimpleProfilerConfig(BaseProfilerConfig):
 
 
 class AdvancedProfilerConfig(BaseProfilerConfig):
-    kind: Literal["advanced"] = "advanced"
+    name: Literal["advanced"] = "advanced"
 
     line_count_restriction: float = 1.0
     """
@@ -128,7 +128,7 @@ class AdvancedProfilerConfig(BaseProfilerConfig):
 
 
 class PyTorchProfilerConfig(BaseProfilerConfig):
-    kind: Literal["pytorch"] = "pytorch"
+    name: Literal["pytorch"] = "pytorch"
 
     group_by_input_shapes: bool = False
     """Include operator input shapes and group calls by shape."""
@@ -204,7 +204,7 @@ class PyTorchProfilerConfig(BaseProfilerConfig):
 
 ProfilerConfig: TypeAlias = Annotated[
     SimpleProfilerConfig | AdvancedProfilerConfig | PyTorchProfilerConfig,
-    C.Field(discriminator="kind"),
+    C.Field(discriminator="name"),
 ]
 
 
@@ -260,7 +260,7 @@ def _wandb_available():
 
 
 class WandbLoggerConfig(CallbackConfigBase, BaseLoggerConfig):
-    kind: Literal["wandb"] = "wandb"
+    name: Literal["wandb"] = "wandb"
 
     enabled: bool = C.Field(default_factory=lambda: _wandb_available())
     """Enable WandB logging."""
@@ -319,7 +319,7 @@ class WandbLoggerConfig(CallbackConfigBase, BaseLoggerConfig):
 
 
 class CSVLoggerConfig(BaseLoggerConfig):
-    kind: Literal["csv"] = "csv"
+    name: Literal["csv"] = "csv"
 
     enabled: bool = True
     """Enable CSV logging."""
@@ -373,7 +373,7 @@ def _tensorboard_available():
 
 
 class TensorboardLoggerConfig(BaseLoggerConfig):
-    kind: Literal["tensorboard"] = "tensorboard"
+    name: Literal["tensorboard"] = "tensorboard"
 
     enabled: bool = C.Field(default_factory=lambda: _tensorboard_available())
     """Enable TensorBoard logging."""
@@ -419,7 +419,7 @@ class TensorboardLoggerConfig(BaseLoggerConfig):
 
 LoggerConfig: TypeAlias = Annotated[
     WandbLoggerConfig | CSVLoggerConfig | TensorboardLoggerConfig,
-    C.Field(discriminator="kind"),
+    C.Field(discriminator="name"),
 ]
 
 
@@ -717,9 +717,9 @@ class DirectoryConfig(C.Config):
         if (log_dir := logger.log_dir) is not None:
             return log_dir
 
-        # Save to nshtrainer/{id}/log/{logger kind}
+        # Save to nshtrainer/{id}/log/{logger name}
         log_dir = self.resolve_subdirectory(run_id, "log")
-        log_dir = log_dir / logger.kind
+        log_dir = log_dir / logger.name
         log_dir.mkdir(exist_ok=True)
 
         return log_dir
@@ -738,7 +738,7 @@ CheckpointCallbackConfig: TypeAlias = Annotated[
     ModelCheckpointCallbackConfig
     | LatestEpochCheckpointCallbackConfig
     | OnExceptionCheckpointCallbackConfig,
-    C.Field(discriminator="kind"),
+    C.Field(discriminator="name"),
 ]