nshtrainer 1.0.0b51__tar.gz → 1.0.0b53__tar.gz

{nshtrainer-1.0.0b51 → nshtrainer-1.0.0b53}/PKG-INFO

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

{nshtrainer-1.0.0b51 → nshtrainer-1.0.0b53}/pyproject.toml

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

{nshtrainer-1.0.0b51 → nshtrainer-1.0.0b53}/src/nshtrainer/_checkpoint/metadata.py

@@ -11,7 +11,7 @@ import numpy as np
 import torch
 
 from ..util._environment_info import EnvironmentConfig
-from ..util.path import compute_file_checksum, try_symlink_or_copy
+from ..util.path import compute_file_checksum, path_exists, try_symlink_or_copy
 
 if TYPE_CHECKING:
     from ..trainer.trainer import Trainer
@@ -154,7 +154,7 @@ def remove_checkpoint_metadata(checkpoint_path: 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):
+    if not path_exists(path, 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

{nshtrainer-1.0.0b51 → nshtrainer-1.0.0b53}/src/nshtrainer/_checkpoint/saver.py

@@ -7,7 +7,7 @@ from pathlib import Path
 
 from lightning.pytorch import Trainer
 
-from ..util.path import try_symlink_or_copy
+from ..util.path import path_exists, try_symlink_or_copy
 from .metadata import (
     link_checkpoint_metadata,
     remove_checkpoint_metadata,
@@ -29,7 +29,7 @@ def link_checkpoint(
 
     if remove_existing:
         try:
-            if linkpath.exists(follow_symlinks=False):
+            if path_exists(linkpath, follow_symlinks=False):
                 # follow_symlinks=False is EXTREMELY important here
                 # Otherwise, we've already deleted the file that the symlink
                 # used to point to, so this always returns False

{nshtrainer-1.0.0b51 → nshtrainer-1.0.0b53}/src/nshtrainer/callbacks/metric_validation.py

@@ -77,6 +77,12 @@ class MetricValidationCallback(Callback):
                 case _:
                     assert_never(self.config.error_behavior)
 
+    @override
+    def on_sanity_check_end(self, trainer, pl_module):
+        super().on_sanity_check_end(trainer, pl_module)
+
+        self._check_metrics(trainer)
+
     @override
     def on_validation_end(self, trainer, pl_module):
         super().on_validation_end(trainer, pl_module)

{nshtrainer-1.0.0b51 → nshtrainer-1.0.0b53}/src/nshtrainer/trainer/_config.py

@@ -698,9 +698,7 @@ class TrainerConfig(C.Config):
     - The trainer is running in fast_dev_run mode.
     - The trainer is running a sanity check (which happens before starting the training routine).
     """
-    auto_validate_metrics: MetricValidationCallbackConfig | None = (
-        MetricValidationCallbackConfig()
-    )
+    auto_validate_metrics: MetricValidationCallbackConfig | None = None
     """If enabled, will automatically validate the metrics before starting the training routine."""
 
     lightning_kwargs: LightningTrainerKwargs = LightningTrainerKwargs()

{nshtrainer-1.0.0b51 → nshtrainer-1.0.0b53}/src/nshtrainer/util/path.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import errno
 import hashlib
 import logging
 import os
@@ -98,7 +99,7 @@ def try_symlink_or_copy(
     # If the link already exists, remove it
     if remove_existing:
         try:
-            if link_path.exists(follow_symlinks=False):
+            if path_exists(link_path, follow_symlinks=False):
                 # follow_symlinks=False is EXTREMELY important here
                 # Otherwise, we've already deleted the file that the symlink
                 # used to point to, so this always returns False
@@ -132,3 +133,43 @@ def try_symlink_or_copy(
     else:
         log.debug(f"Created symlink or copied {file_path} to {link_path}")
         return True
+
+
+_WINERROR_NOT_READY = 21  # drive exists but is not accessible
+_WINERROR_INVALID_NAME = 123  # fix for bpo-35306
+_WINERROR_CANT_RESOLVE_FILENAME = 1921  # broken symlink pointing to itself
+
+# EBADF - guard against macOS `stat` throwing EBADF
+_IGNORED_ERRNOS = (errno.ENOENT, errno.ENOTDIR, errno.EBADF, errno.ELOOP)
+
+_IGNORED_WINERRORS = (
+    _WINERROR_NOT_READY,
+    _WINERROR_INVALID_NAME,
+    _WINERROR_CANT_RESOLVE_FILENAME,
+)
+
+
+def _ignore_error(exception):
+    return (
+        getattr(exception, "errno", None) in _IGNORED_ERRNOS
+        or getattr(exception, "winerror", None) in _IGNORED_WINERRORS
+    )
+
+
+def path_exists(path: Path, follow_symlinks: bool = True):
+    """
+    Whether this path exists.
+
+    This method normally follows symlinks; to check whether a symlink exists,
+    add the argument follow_symlinks=False.
+    """
+    try:
+        path.stat(follow_symlinks=follow_symlinks)
+    except OSError as e:
+        if not _ignore_error(e):
+            raise
+        return False
+    except ValueError:
+        # Non-encodable path
+        return False
+    return True