nshtrainer 0.6.2__tar.gz → 0.8.0__tar.gz

{nshtrainer-0.6.2 → nshtrainer-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nshtrainer
-Version: 0.6.2
+Version: 0.8.0
 Summary: 
 Author: Nima Shoghi
 Author-email: nimashoghi@gmail.com
@@ -10,14 +10,11 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: lightning
-Requires-Dist: lovely-numpy (>=0.2.13,<0.3.0)
-Requires-Dist: lovely-tensors (>=0.1.16,<0.2.0)
-Requires-Dist: nshconfig (>=0,<1)
-Requires-Dist: nshrunner (>=0,<1)
-Requires-Dist: nshutils (>=0,<1)
+Requires-Dist: nshconfig
+Requires-Dist: nshrunner
+Requires-Dist: nshutils
 Requires-Dist: numpy
 Requires-Dist: pytorch-lightning
-Requires-Dist: rich
 Requires-Dist: torch
 Requires-Dist: torchmetrics
 Requires-Dist: typing-extensions

{nshtrainer-0.6.2 → nshtrainer-0.8.0}/pyproject.toml

@@ -1,25 +1,22 @@
 [tool.poetry]
 name = "nshtrainer"
-version = "0.6.2"
+version = "0.8.0"
 description = ""
 authors = ["Nima Shoghi <nimashoghi@gmail.com>"]
 readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.10"
-nshrunner = "^0"
-nshconfig = "^0"
-nshutils = "^0"
+nshrunner = "*"
+nshconfig = "*"
+nshutils = "*"
 torch = "*"
 typing-extensions = "*"
 lightning = "*"
 pytorch-lightning = "*"
 torchmetrics = "*"
 numpy = "*"
-lovely-numpy = "^0.2.13"
-lovely-tensors = "^0.1.16"
 wrapt = "*"
-rich = "*"
 
 
 [tool.poetry.group.dev.dependencies]

nshtrainer-0.8.0/src/nshtrainer/ll/__init__.py

@@ -0,0 +1,58 @@
+from . import _experimental as _experimental
+from . import actsave as actsave
+from . import callbacks as callbacks
+from . import lr_scheduler as lr_scheduler
+from . import model as model
+from . import nn as nn
+from . import optimizer as optimizer
+from . import snapshot as snapshot
+from . import typecheck as typecheck
+from .actsave import ActLoad as ActLoad
+from .actsave import ActSave as ActSave
+from .config import MISSING as MISSING
+from .config import AllowMissing as AllowMissing
+from .config import Field as Field
+from .config import MissingField as MissingField
+from .config import PrivateAttr as PrivateAttr
+from .config import TypedConfig as TypedConfig
+from .data import dataset_transform as dataset_transform
+from .log import init_python_logging as init_python_logging
+from .log import lovely as lovely
+from .log import pretty as pretty
+from .lr_scheduler import LRSchedulerConfig as LRSchedulerConfig
+from .model import ActSaveConfig as ActSaveConfig
+from .model import Base as Base
+from .model import BaseConfig as BaseConfig
+from .model import BaseLoggerConfig as BaseLoggerConfig
+from .model import BaseProfilerConfig as BaseProfilerConfig
+from .model import CheckpointLoadingConfig as CheckpointLoadingConfig
+from .model import CheckpointSavingConfig as CheckpointSavingConfig
+from .model import ConfigList as ConfigList
+from .model import DirectoryConfig as DirectoryConfig
+from .model import (
+    EnvironmentClassInformationConfig as EnvironmentClassInformationConfig,
+)
+from .model import EnvironmentConfig as EnvironmentConfig
+from .model import (
+    EnvironmentLinuxEnvironmentConfig as EnvironmentLinuxEnvironmentConfig,
+)
+from .model import (
+    EnvironmentSLURMInformationConfig as EnvironmentSLURMInformationConfig,
+)
+from .model import GradientClippingConfig as GradientClippingConfig
+from .model import LightningModuleBase as LightningModuleBase
+from .model import LoggingConfig as LoggingConfig
+from .model import MetricConfig as MetricConfig
+from .model import OptimizationConfig as OptimizationConfig
+from .model import PrimaryMetricConfig as PrimaryMetricConfig
+from .model import ReproducibilityConfig as ReproducibilityConfig
+from .model import SanityCheckingConfig as SanityCheckingConfig
+from .model import TrainerConfig as TrainerConfig
+from .model import WandbWatchConfig as WandbWatchConfig
+from .nn import TypedModuleDict as TypedModuleDict
+from .nn import TypedModuleList as TypedModuleList
+from .optimizer import OptimizerConfig as OptimizerConfig
+from .runner import Runner as Runner
+from .runner import SnapshotConfig as SnapshotConfig
+from .snoop import snoop as snoop
+from .trainer import Trainer as Trainer

nshtrainer-0.8.0/src/nshtrainer/ll/actsave.py

@@ -0,0 +1,3 @@
+from nshutils.actsave import *  # type: ignore # noqa: F403
+
+from nshtrainer.actsave import *  # type: ignore # noqa: F403

nshtrainer-0.8.0/src/nshtrainer/ll/callbacks.py

@@ -0,0 +1 @@
+from nshtrainer.callbacks import *  # noqa: F403

nshtrainer-0.8.0/src/nshtrainer/ll/config.py

@@ -0,0 +1,4 @@
+from nshconfig import *  # type: ignore  # noqa: F403
+from nshconfig import Config as TypedConfig  # type: ignore  # noqa: F401
+
+_ = TypedConfig

nshtrainer-0.8.0/src/nshtrainer/ll/data.py

@@ -0,0 +1 @@
+from nshtrainer.data import *  # noqa: F403

nshtrainer-0.8.0/src/nshtrainer/ll/log.py

@@ -0,0 +1,3 @@
+from nshutils import init_python_logging as init_python_logging
+from nshutils import lovely as lovely
+from nshutils import pretty as pretty

nshtrainer-0.8.0/src/nshtrainer/ll/lr_scheduler.py

@@ -0,0 +1 @@
+from nshtrainer.lr_scheduler import *  # noqa: F403

nshtrainer-0.8.0/src/nshtrainer/ll/model.py

@@ -0,0 +1 @@
+from nshtrainer.model import *  # noqa: F403

nshtrainer-0.8.0/src/nshtrainer/ll/nn.py

@@ -0,0 +1 @@
+from nshtrainer.nn import *  # noqa: F403

nshtrainer-0.8.0/src/nshtrainer/ll/optimizer.py

@@ -0,0 +1 @@
+from nshtrainer.optimizer import *  # noqa: F403

nshtrainer-0.8.0/src/nshtrainer/ll/runner.py

@@ -0,0 +1,3 @@
+from nshrunner import SnapshotConfig as SnapshotConfig
+
+from nshtrainer.runner import *  # type: ignore # noqa: F403

nshtrainer-0.8.0/src/nshtrainer/ll/snoop.py

@@ -0,0 +1 @@
+from nshutils import snoop as snoop

nshtrainer-0.8.0/src/nshtrainer/ll/trainer.py

@@ -0,0 +1 @@
+from nshtrainer.trainer import *  # noqa: F403

nshtrainer-0.8.0/src/nshtrainer/ll/util.py

@@ -0,0 +1 @@
+from nshtrainer.util import *  # noqa: F403

{nshtrainer-0.6.2 → nshtrainer-0.8.0}/src/nshtrainer/lr_scheduler/reduce_lr_on_plateau.py

@@ -38,7 +38,7 @@ class ReduceLROnPlateauConfig(LRSchedulerConfigBase):
     threshold: float = 1.0e-4
     r"""Threshold for measuring the new optimum, to only focus on significant changes."""
 
-    threshold_mode: str = "rel"
+    threshold_mode: Literal["rel", "abs"] = "rel"
     r"""One of `rel`, `abs`. In `rel` mode, dynamic_threshold = best * (1 + threshold) in 'max' mode or best * (1 - threshold) in `min` mode. In `abs` mode, dynamic_threshold = best + threshold in `max` mode or best - threshold in `min` mode. Default: 'rel'."""
 
     @override

{nshtrainer-0.6.2 → nshtrainer-0.8.0}/src/nshtrainer/model/base.py

@@ -133,7 +133,7 @@ def _psutil():
     return psutil
 
 
-def _try_get(fn: Callable[[], T]) -> T | None:
+def _try_get(fn: Callable[[], T | None]) -> T | None:
     try:
         return fn()
     except Exception as e:

nshtrainer-0.6.2/src/nshtrainer/ll/__init__.py

@@ -1,46 +0,0 @@
-import importlib
-import sys
-from types import ModuleType
-from typing import TYPE_CHECKING
-
-# The name of your new package
-NEW_PACKAGE = "nshtrainer"
-
-# Import the new package
-new_package = importlib.import_module(NEW_PACKAGE)
-
-
-# Create a custom module class that inherits from ModuleType
-class ProxyModule(ModuleType):
-    def __getattr__(self, name):
-        return getattr(new_package, name)
-
-    def __dir__(self):
-        return dir(new_package)
-
-
-# Create a new module instance
-old_module = ProxyModule(__name__)
-
-# Copy attributes from new_package to old_module
-for attr in dir(new_package):
-    if not attr.startswith("__"):
-        setattr(old_module, attr, getattr(new_package, attr))
-
-# Replace the module in sys.modules
-sys.modules[__name__] = old_module
-
-
-# Handle submodule imports
-class SubmoduleProxy:
-    def __getattr__(self, name):
-        return importlib.import_module(f"{NEW_PACKAGE}.{name}")
-
-
-# Add submodule handling to the proxy module
-old_module.__class__ = type(
-    "ProxyModuleWithSubmodules", (ProxyModule, SubmoduleProxy), {}
-)
-
-if TYPE_CHECKING:
-    from nshtrainer import *  # noqa: F401, F403