nshtrainer 0.19.2__py3-none-any.whl → 0.20.0__py3-none-any.whl

nshtrainer/_checkpoint/loader.py

@@ -76,7 +76,11 @@ class CheckpointLoadingConfig(C.Config):
     """Whether to include checkpoints from HPC pre-emption."""
 
     @classmethod
-    def _auto_train(cls, ckpt: Literal["best", "last"] | str | Path | None):
+    def none(cls, include_hpc: bool = False):
+        return cls(strategies=[], include_hpc=include_hpc)
+
+    @classmethod
+    def _auto_train(cls, ckpt: Literal["best", "last", "none"] | str | Path | None):
         if ckpt is None:
             ckpt = "last"
         match ckpt:
@@ -90,6 +94,8 @@ class CheckpointLoadingConfig(C.Config):
                     strategies=[LastCheckpointStrategyConfig()],
                     include_hpc=True,
                 )
+            case "none":
+                return cls.none()
             case Path() | str():
                 ckpt = Path(ckpt)
                 return cls(
@@ -103,9 +109,10 @@ class CheckpointLoadingConfig(C.Config):
                 assert_never(ckpt)
 
     @classmethod
-    def _auto_eval(cls, ckpt: Literal["best", "last"] | str | Path | None):
+    def _auto_eval(cls, ckpt: Literal["best", "last", "none"] | str | Path | None):
         if ckpt is None:
-            raise ValueError("Checkpoint path must be provided for evaluation.")
+            log.warn("No checkpoint specified for evaluation. Defaulting to `last`.")
+            ckpt = "last"
 
         match ckpt:
             case "best":
@@ -118,6 +125,8 @@ class CheckpointLoadingConfig(C.Config):
                     strategies=[LastCheckpointStrategyConfig()],
                     include_hpc=False,
                 )
+            case "none":
+                return cls.none(include_hpc=False)
             case Path() | str():
                 ckpt = Path(ckpt)
                 return cls(
@@ -130,7 +139,7 @@ class CheckpointLoadingConfig(C.Config):
     @classmethod
     def auto(
         cls,
-        ckpt: Literal["best", "last"] | str | Path | None,
+        ckpt: Literal["best", "last", "none"] | str | Path | None,
         trainer_mode: TrainerFn,
     ):
         """
@@ -141,7 +150,7 @@ class CheckpointLoadingConfig(C.Config):
 
         Parameters:
         -----------
-        ckpt : Literal["best", "last"] | str | Path | None
+        ckpt : Literal["best", "last", "none"] | str | Path | None
             Specifies the checkpoint loading preference:
             - "best": Use the best checkpoint based on the primary metric.
             - "last": Use the most recent checkpoint.

nshtrainer/model/config.py

@@ -811,11 +811,14 @@ class SanityCheckingConfig(C.Config):
 
 
 class TrainerConfig(C.Config):
-    ckpt_path: str | Path | None = None
-    """Path to a checkpoint to load and resume training from."""
+    ckpt_path: Literal["none"] | str | Path | None = None
+    """Path to a checkpoint to load and resume training from. If ``"none"``, will not load a checkpoint."""
 
-    checkpoint_loading: CheckpointLoadingConfig | Literal["auto"] = "auto"
-    """Checkpoint loading configuration options."""
+    checkpoint_loading: CheckpointLoadingConfig | Literal["auto", "none"] = "auto"
+    """Checkpoint loading configuration options.
+    `"auto"` will automatically determine the best checkpoint loading strategy based on the provided.
+    `"none"` will disable checkpoint loading.
+    """
 
     checkpoint_saving: CheckpointSavingConfig = CheckpointSavingConfig()
     """Checkpoint saving configuration options."""

nshtrainer/trainer/checkpoint_connector.py

@@ -31,8 +31,14 @@ class _CheckpointConnector(_LightningCheckpointConnector):
 
         # Now, resolve the checkpoint loader config.
         root_config = cast("BaseConfig", trainer._base_module.config)
-        if (ckpt_loader_config := root_config.trainer.checkpoint_loading) == "auto":
-            ckpt_loader_config = CheckpointLoadingConfig.auto(ckpt_path, state_fn)
+        ckpt_loader_config = root_config.trainer.checkpoint_loading
+        match ckpt_loader_config:
+            case "auto":
+                ckpt_loader_config = CheckpointLoadingConfig.auto(ckpt_path, state_fn)
+            case "none":
+                ckpt_loader_config = CheckpointLoadingConfig.none()
+            case _:
+                pass
         log.debug(f"Checkpoint loader config: {ckpt_loader_config}")
 
         # Use the config to resolve the checkpoint.

{nshtrainer-0.19.2.dist-info → nshtrainer-0.20.0.dist-info}/METADATA

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

{nshtrainer-0.19.2.dist-info → nshtrainer-0.20.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 nshtrainer/__init__.py,sha256=39loiLLXbaGiozEsAn8mPHopxaPsek8JsgR9DD2gxtY,583
-nshtrainer/_checkpoint/loader.py,sha256=myFObRsPdb8jBncMK73vjr5FDJIfKhF86Ec_kSjXtwg,13837
+nshtrainer/_checkpoint/loader.py,sha256=5vjg-OFChXJjgiOVv8vnV8nwTscfdDtEdxQRz6uPfDE,14158
 nshtrainer/_checkpoint/metadata.py,sha256=p5e7dhVPpOGrXeuesq_7Y_RHi5lguzDAR_UXtMJXzWU,5175
 nshtrainer/_checkpoint/saver.py,sha256=DkbCH0YeOJ71m32vAARiQdGBf0hvwwdoAV8LOFGy-0Y,1428
 nshtrainer/_experimental/__init__.py,sha256=pEXPyI184UuDHvfh4p9Kg9nQZQZI41e4_HvNd4BK-yg,81
@@ -57,7 +57,7 @@ nshtrainer/metrics/__init__.py,sha256=ObLIELGguIEcUpRsUkqh1ltrvZii6vglTpJGrPvoy0
 nshtrainer/metrics/_config.py,sha256=jgRBfDAQLFTW7AiUY7CRtdfts6CR6keeuqm0FFMWCzQ,1288
 nshtrainer/model/__init__.py,sha256=VyRziPT3YilP6xjLi_StsSqtlvn7N4LOMzgukRsOnF8,1380
 nshtrainer/model/base.py,sha256=oQVolDk81acy4OlckwQEBHuX2gCaVSYiIA0JaDIfhQ4,17517
-nshtrainer/model/config.py,sha256=147uV7IukvuYE4G_ZuQNxVjnlog1BdCrAVbcj_sx9Vs,43104
+nshtrainer/model/config.py,sha256=zcCLcqvg4u7Zg6SLtCnqdIfiW8I0eART47lf1LCYl-A,43326
 nshtrainer/model/modules/callback.py,sha256=1z6gUDBd35KG3phGzRekgZM6SIk-wj5Uo6APN4YhRR0,8549
 nshtrainer/model/modules/debug.py,sha256=Yy7XEdPou9BkCsD5hJchwJGmCVGrfUru5g9VjPM4uAw,1120
 nshtrainer/model/modules/distributed.py,sha256=ABpR9d-3uBS_fivfy_WYW-dExW6vp5BPaoPQnOudHng,1725
@@ -75,7 +75,7 @@ nshtrainer/runner.py,sha256=USAjrExHkN5oVNVunsoPnLxfQrEHSaa54S3RipOe544,3605
 nshtrainer/scripts/find_packages.py,sha256=ixYivZobumyyGsf2B9oYMLyLTRcBzY_vUv-u3bNW-hs,1424
 nshtrainer/trainer/__init__.py,sha256=P2rmr8oBVTHk-HJHYPcUwWqDEArMbPR4_rPpATbWK3E,40
 nshtrainer/trainer/_runtime_callback.py,sha256=sd2cUdRJG-UCdQr9ruZvEYpNGNF1t2W2fuxwwVlQD9E,4164
-nshtrainer/trainer/checkpoint_connector.py,sha256=F2tkHogbMAa5U7335sm77sZBkjEDa5v46XbJCH9Mg6c,2167
+nshtrainer/trainer/checkpoint_connector.py,sha256=r0ir4xYSdf_jebM0x09qaO6nJsvsiRQDyM0fs80ppOQ,2347
 nshtrainer/trainer/signal_connector.py,sha256=2EzkVktlasl8PgWAKNLDZRUMY__gRlDy1HdinAU-tfU,10740
 nshtrainer/trainer/trainer.py,sha256=TTtVkgSB_ekgDlHg24d58Vzddtkpp6ZHOTVprXdXMH0,17503
 nshtrainer/util/_environment_info.py,sha256=gIdq9TJgzGCdcVzZxjHcwYasJ_HmEGVHbvE-KJVVtWs,24187
@@ -85,6 +85,6 @@ nshtrainer/util/seed.py,sha256=Or2wMPsnQxfnZ2xfBiyMcHFIUt3tGTNeMMyOEanCkqs,280
 nshtrainer/util/slurm.py,sha256=rofIU26z3SdL79SF45tNez6juou1cyDLz07oXEZb9Hg,1566
 nshtrainer/util/typed.py,sha256=NGuDkDzFlc1fAoaXjOFZVbmj0mRFjsQi1E_hPa7Bn5U,128
 nshtrainer/util/typing_utils.py,sha256=8ptjSSLZxlmy4FY6lzzkoGoF5fGNClo8-B_c0XHQaNU,385
-nshtrainer-0.19.2.dist-info/METADATA,sha256=InNVoRQEPpPRCFbBje-ekgQzFFycxC9VzQsmEqUJK1c,935
-nshtrainer-0.19.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-nshtrainer-0.19.2.dist-info/RECORD,,
+nshtrainer-0.20.0.dist-info/METADATA,sha256=BCzgQYVMH8_7VHpAcAEuJqlQ0oJOERSbBop4bOebYZ4,935
+nshtrainer-0.20.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+nshtrainer-0.20.0.dist-info/RECORD,,