nshtrainer 0.6.2__py3-none-any.whl → 0.8.1__py3-none-any.whl

nshtrainer/__init__.py

@@ -6,8 +6,6 @@ from . import lr_scheduler as lr_scheduler
 from . import model as model
 from . import nn as nn
 from . import optimizer as optimizer
-from . import typecheck as typecheck
-from ._snoop import snoop as snoop
 from .actsave import ActLoad as ActLoad
 from .actsave import ActSave as ActSave
 from .data import dataset_transform as dataset_transform

nshtrainer/ll/__init__.py

@@ -1,46 +1,58 @@
-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), {}
+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,
 )
-
-if TYPE_CHECKING:
-    from nshtrainer import *  # noqa: F401, F403
+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/ll/actsave.py

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

nshtrainer/ll/callbacks.py

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

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/ll/data.py

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

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/ll/lr_scheduler.py

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

nshtrainer/ll/model.py

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

nshtrainer/ll/nn.py

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

nshtrainer/ll/optimizer.py

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

nshtrainer/ll/runner.py

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

nshtrainer/ll/snoop.py

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

nshtrainer/ll/trainer.py

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

nshtrainer/ll/util.py

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

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/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.dist-info → nshtrainer-0.8.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nshtrainer
-Version: 0.6.2
+Version: 0.8.1
 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.dist-info → nshtrainer-0.8.1.dist-info}/RECORD

@@ -1,9 +1,8 @@
-nshtrainer/__init__.py,sha256=_r7kBmgGSLVfActlqQeupNolrmBu45xUuSS8odt3HL8,2208
+nshtrainer/__init__.py,sha256=Sl5pD2mDTqPh4lE_xJyhTqkStI3cZE-rH5i_vBMHTWc,2136
 nshtrainer/_experimental/__init__.py,sha256=2tQIcrWT8U8no_AeBTYnozaTmxN40kuAJdGQ4b-PoWM,120
 nshtrainer/_experimental/flops/__init__.py,sha256=edo9Ez3LlrnxkNRX9W6YBhPkRPKYGLpkpnl5gx7sEX8,1550
 nshtrainer/_experimental/flops/flop_counter.py,sha256=-sL0Fy6poXa__hyzUMdZScjPULp4coQELQpPU6p6dXU,25736
 nshtrainer/_experimental/flops/module_tracker.py,sha256=bUL-IRTd0aF_DwmXkZjHZAA31p4ZEhyqhc26XWKQUUY,4922
-nshtrainer/_snoop.py,sha256=2rEemPyMP3aIo2QgPzo_-AlT1oXGWYQipId4RQskMls,58
 nshtrainer/actsave/__init__.py,sha256=_ZuwgRtF1-ekouXNvtZCAS1g_IDYGB4NX8BFSGNGBT8,119
 nshtrainer/actsave/_callback.py,sha256=mnHOtuG9vtHEzz9q4vCvDNC6VvjZsgb4MSSuOoUDh3M,2778
 nshtrainer/callbacks/__init__.py,sha256=I6W33ityL9Ko8jjqHh3WH_8miV59SAe9LxInhoqX5XE,1665
@@ -22,17 +21,30 @@ nshtrainer/callbacks/print_table.py,sha256=FcA-CBWwMf9c1NNRinvYpZC400RNQxuP28bJf
 nshtrainer/callbacks/throughput_monitor.py,sha256=YQLdpX3LGybIiD814yT9yCCVSEXRWf8WwsvVaN5aDBE,1848
 nshtrainer/callbacks/timer.py,sha256=sDXPPcdDKu5xnuK_bjr8plIq9MBuluNJ42Mt9LvPZzc,4610
 nshtrainer/callbacks/wandb_watch.py,sha256=pUpMsNxd03ex1rzOmFw2HzGOXjnQGaH84m8cc2dXo4g,2937
-nshtrainer/config.py,sha256=IXOAl_JWFNX9kPTo_iw4Nc3qXqkKrbA6-ZrvTAjqu6A,104
 nshtrainer/data/__init__.py,sha256=7mk1tr7SWUZ7ySbsf0y0ZPszk7u4QznPhQ-7wnpH9ec,149
 nshtrainer/data/balanced_batch_sampler.py,sha256=bcJBcQjh1hB1yKF_xSlT9AtEWv0BJjYc1CuH2BF-ea8,4392
 nshtrainer/data/transform.py,sha256=JeGxvytQly8hougrsdMmKG8gJ6qvFPDglJCO4Tp6STk,1795
-nshtrainer/ll/__init__.py,sha256=u3wEyfc8kIsdRwZ8jpmywkEykHX4iIa-xA4we9GSuYE,1128
+nshtrainer/ll/__init__.py,sha256=qraZm_bAvoLR69w5iiAic9-TT4sR0g_iKnttiXbb5y0,2658
+nshtrainer/ll/actsave.py,sha256=QJ7yJIqvabpZzumX7PLPzkh6dfqY-zxiEdzv48VtZEY,123
+nshtrainer/ll/callbacks.py,sha256=AxyUmc8aGRSjx6WwwgXYCmdJ73rwLuEAEH0AGRosojQ,49
+nshtrainer/ll/config.py,sha256=fKumJf42HY2FITX1QUM1OTXkYD6U2np2ciyd4PFRPZ8,145
+nshtrainer/ll/data.py,sha256=zRG0FRje-jtSHximVzkHIHzpwsyQxpHCoACFihNKLPM,44
+nshtrainer/ll/log.py,sha256=d4BB3TyM8imK65EXOiOeUTF0zFM1ropbe7Vq3DeB0xU,140
+nshtrainer/ll/lr_scheduler.py,sha256=7xjhN6L69BCUzFhcy33NtMtPuCzHiB611zVWFg92lQ0,52
+nshtrainer/ll/model.py,sha256=6I9gQjEFT2Veer-UmcPy05Pt3mnvaxYX1b3sOdaF96A,45
+nshtrainer/ll/nn.py,sha256=8qiRDFwojIxkB7-LtNWk4mLL2tJbaskHYofDsOIHiNg,42
+nshtrainer/ll/optimizer.py,sha256=3T-VZtT73jVvwCNJGDjgGEbzs-1LFTzMQH-SB_58mSo,49
+nshtrainer/ll/runner.py,sha256=B0m5VEhNKIjF1aFmqPkonkQxDoRL2jeHZGsV3zwhSVE,117
+nshtrainer/ll/snoop.py,sha256=hG9VCdm8mIZytHLZgUKRSoWqg55rVvUpBAH-OSiwgvI,36
+nshtrainer/ll/trainer.py,sha256=hkn2xPtrSPQ7LqQhbyAKuMfNyHdhqB9bDPvgRCK8oJM,47
+nshtrainer/ll/typecheck.py,sha256=ryV1Tzcf7hJ4I19H1oQVkikU9spmRk8jyIKQZ5UF7pQ,62
+nshtrainer/ll/util.py,sha256=PQGu5Ff1raizxjXdm2rFFu4Mo816dBIYmItjkJX1_qk,44
 nshtrainer/lr_scheduler/__init__.py,sha256=uEvgaFAs-4s_bAEMaildy0GT6OvgpgOEKTuzqutESHE,736
 nshtrainer/lr_scheduler/_base.py,sha256=7xOIuxQ86YHbFWG5a3gX46emQj1WN_LaY4-i0Q1TDBg,3659
 nshtrainer/lr_scheduler/linear_warmup_cosine.py,sha256=mn6cyizyI_stkXtg6zxIEGF9btIxMRWigUHUTlUYCSw,5221
-nshtrainer/lr_scheduler/reduce_lr_on_plateau.py,sha256=2ZdlV0RUMwg2DClzqYHr8_EKT1jZBUlSD39e-XlCsC4,2764
+nshtrainer/lr_scheduler/reduce_lr_on_plateau.py,sha256=h76oTHYpMxauV_l6lviya5DW-WKArwxxf7ZQizhmbCw,2782
 nshtrainer/model/__init__.py,sha256=y32Hla-5whpzLL2BtCJpBakSp8o-1nQbpO0j_-xq_Po,1864
-nshtrainer/model/base.py,sha256=EMkOtp4YWGPHM0HPSTLbx75T9vlYmXO4XyD725xU70w,21453
+nshtrainer/model/base.py,sha256=k2Qk_rH4FsBOib2PISXnG97SBlgeD1w_jw02NE4zEQI,21460
 nshtrainer/model/config.py,sha256=6lATW6-Z1SIDgQ1IWrGBVQKTr8DhL5b_rFbJHQz0d5o,66796
 nshtrainer/model/modules/callback.py,sha256=JF59U9-CjJsAIspEhTJbVaGN0wGctZG7UquE3IS7R8A,6408
 nshtrainer/model/modules/debug.py,sha256=DTVty8cKnzj1GCULRyGx_sWTTsq9NLi30dzqjRTnuCU,1127
@@ -53,12 +65,11 @@ nshtrainer/scripts/find_packages.py,sha256=FbdlfmAefttFSMfaT0A46a-oHLP_ioaQKihwB
 nshtrainer/trainer/__init__.py,sha256=P2rmr8oBVTHk-HJHYPcUwWqDEArMbPR4_rPpATbWK3E,40
 nshtrainer/trainer/signal_connector.py,sha256=QAoPM_C5JJOVQebcrJOimUUD3GHyoeZUqCEAvzZlT4U,8710
 nshtrainer/trainer/trainer.py,sha256=eYEYfY9v70MuorHcSf8nqM7f2CkmUHhpPcjCk4FJD7k,14034
-nshtrainer/typecheck.py,sha256=ryV1Tzcf7hJ4I19H1oQVkikU9spmRk8jyIKQZ5UF7pQ,62
 nshtrainer/util/environment.py,sha256=_SEtiQ_s5bL5pllUlf96AOUv15kNvCPvocVC13S7mIk,4166
 nshtrainer/util/seed.py,sha256=HEXgVs-wldByahOysKwq7506OHxdYTEgmP-tDQVAEkQ,287
 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.6.2.dist-info/METADATA,sha256=TTXxrNVSf7oLTDywORfH9G0gH8oDHsNTuYsucQw5BWE,788
-nshtrainer-0.6.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-nshtrainer-0.6.2.dist-info/RECORD,,
+nshtrainer-0.8.1.dist-info/METADATA,sha256=_uS2pF8uKS0wtS3Huc0zaLyVJnOPvy6m_8jaP-ucTzg,647
+nshtrainer-0.8.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+nshtrainer-0.8.1.dist-info/RECORD,,

nshtrainer/_snoop.py

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

nshtrainer/config.py

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