nshtrainer 1.0.0b45__tar.gz → 1.0.0b46__tar.gz

{nshtrainer-1.0.0b45 → nshtrainer-1.0.0b46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nshtrainer
-Version: 1.0.0b45
+Version: 1.0.0b46
 Summary: 
 Author: Nima Shoghi
 Author-email: nimashoghi@gmail.com

{nshtrainer-1.0.0b45 → nshtrainer-1.0.0b46}/pyproject.toml

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

{nshtrainer-1.0.0b45 → nshtrainer-1.0.0b46}/src/nshtrainer/_checkpoint/metadata.py

@@ -139,15 +139,30 @@ def remove_checkpoint_metadata(checkpoint_path: Path):
         log.debug(f"Removed {path}")
 
 
+def remove_checkpoint_metadata_link(ckpt_link_path: Path):
+    path = _metadata_path(ckpt_link_path)
+    # If the metadata does not exist, we can safely ignore this
+    if not path.exists(follow_symlinks=False):
+        # This is EXTREMELY important here
+        # Otherwise, we've already deleted the file that the symlink
+        # used to point to, so this always returns False
+        log.debug(f"Metadata file does not exist: {path}")
+        return
+
+    # If the metadata exists, we can remove it
+    try:
+        path.unlink(missing_ok=True)
+    except Exception:
+        log.warning(f"Failed to remove {path}", exc_info=True)
+    else:
+        log.debug(f"Removed {path}")
+
+
 def link_checkpoint_metadata(checkpoint_path: Path, linked_checkpoint_path: Path):
     # First, remove any existing metadata files
-    remove_checkpoint_metadata(linked_checkpoint_path)
+    remove_checkpoint_metadata_link(linked_checkpoint_path)
 
     # Link the metadata files to the new checkpoint
     path = _metadata_path(checkpoint_path)
     linked_path = _metadata_path(linked_checkpoint_path)
-
-    if not path.exists():
-        raise FileNotFoundError(f"Checkpoint path does not exist: {checkpoint_path}")
-
     try_symlink_or_copy(path, linked_path)

{nshtrainer-1.0.0b45 → nshtrainer-1.0.0b46}/src/nshtrainer/_checkpoint/saver.py

@@ -8,7 +8,11 @@ from pathlib import Path
 from lightning.pytorch import Trainer
 
 from ..util.path import try_symlink_or_copy
-from .metadata import link_checkpoint_metadata, remove_checkpoint_metadata
+from .metadata import (
+    link_checkpoint_metadata,
+    remove_checkpoint_metadata,
+    remove_checkpoint_metadata_link,
+)
 
 log = logging.getLogger(__name__)
 
@@ -39,7 +43,7 @@ def link_checkpoint(
             log.debug(f"Removed {linkpath=}")
 
         if metadata:
-            remove_checkpoint_metadata(linkpath)
+            remove_checkpoint_metadata_link(linkpath)
 
     try_symlink_or_copy(filepath, linkpath)
     if metadata:

{nshtrainer-1.0.0b45 → nshtrainer-1.0.0b46}/src/nshtrainer/callbacks/checkpoint/_base.py

@@ -160,7 +160,7 @@ class CheckpointBase(Checkpoint, ABC, Generic[TConfig]):
         filepath = self.resolve_checkpoint_path(self.current_metrics(trainer))
         trainer.save_checkpoint(filepath, self.config.save_weights_only)
 
-        if trainer.is_global_zero:
+        if trainer.hparams.save_checkpoint_metadata and trainer.is_global_zero:
             # Remove old checkpoints
             self.remove_old_checkpoints(trainer)
 

{nshtrainer-1.0.0b45 → nshtrainer-1.0.0b46}/src/nshtrainer/util/path.py

@@ -120,7 +120,8 @@ def try_symlink_or_copy(
                 shutil.copy(file_path, link_path)
         else:
             link_path.symlink_to(
-                symlink_target, target_is_directory=target_is_directory
+                symlink_target,
+                target_is_directory=target_is_directory,
             )
     except Exception:
         log.warning(