netloader 3.11.2__tar.gz → 3.11.3__tar.gz

{netloader-3.11.2 → netloader-3.11.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netloader
-Version: 3.11.2
+Version: 3.11.3
 Summary: Utility to generate and train PyTorch neural network objects from JSON files
 Author-email: Ethan Tregidga <ethan.tregidga@epfl.ch>
 License-Expression: MIT

{netloader-3.11.2 → netloader-3.11.3}/netloader/__init__.py

@@ -6,7 +6,7 @@ import logging
 import warnings
 
 
-__version__ = '3.11.2'
+__version__ = '3.11.3'
 __author__ = 'Ethan Tregidga'
 logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.WARNING)
 warnings.filterwarnings('once', category=DeprecationWarning, module=r'^netloader(\.|$)')

{netloader-3.11.2 → netloader-3.11.3}/netloader/architectures/base.py

@@ -62,6 +62,8 @@ class BaseArchitecture(UtilityMixin, ABC, Generic[LossCT, TensorLossCT]):
         Architecture optimiser
     scheduler : LRScheduler
         Optimiser scheduler
+    run : Run | None
+        Weights & Biases run object for logging and tracking experiments
     net : BaseNetwork
         Neural network
     """

{netloader-3.11.2 → netloader-3.11.3}/netloader/architectures/encoder_decoder.py

@@ -27,7 +27,7 @@ class BaseEncoder(BaseArchitecture):
     description : str
         Description of the architecture
     version : str
-        Version of the architecture
+        Version of the architecture when it was created or re-saved
     losses : tuple[list[LossCT], list[LossCT]]
         Architecture training and validation losses as a float or dictionary of losses for each loss
         function
@@ -42,6 +42,8 @@ class BaseEncoder(BaseArchitecture):
         Architecture optimiser
     scheduler : LRScheduler
         Optimiser scheduler
+    run : Run | None
+        Weights & Biases run object for logging and tracking experiments
     net : BaseNetwork
         Neural network
     """
@@ -211,6 +213,8 @@ class Autoencoder(BaseArchitecture):
     ----------
     description : str
         Description of the architecture
+    version : str
+        Version of the architecture when it was created or re-saved
     losses : tuple[list[LossCT], list[LossCT]]
         Architecture training and validation losses as a float or dictionary of losses for each loss
         function
@@ -223,6 +227,8 @@ class Autoencoder(BaseArchitecture):
         Architecture optimiser
     scheduler : LRScheduler
         Optimiser scheduler
+    run : Run | None
+        Weights & Biases run object for logging and tracking experiments
     net : BaseNetwork
         Neural network
     reconstruct_func : BaseLoss
@@ -427,6 +433,8 @@ class Decoder(BaseArchitecture):
     ----------
     description : str
         Description of the architecture
+    version : str
+        Version of the architecture when it was created or re-saved
     losses : tuple[list[LossCT], list[LossCT]]
         Architecture training and validation losses as a float or dictionary of losses for each loss
         function
@@ -441,6 +449,8 @@ class Decoder(BaseArchitecture):
         Architecture optimiser
     scheduler : LRScheduler
         Optimiser scheduler
+    run : Run | None
+        Weights & Biases run object for logging and tracking experiments
     net : BaseNetwork
         Neural network
     """
@@ -587,6 +597,8 @@ class Encoder(BaseEncoder):
     ----------
     description : str
         Description of the architecture
+    version : str
+        Version of the architecture when it was created or re-saved
     losses : tuple[list[LossCT], list[LossCT]]
         Architecture training and validation losses as a float or dictionary of losses for each loss
         function
@@ -601,6 +613,8 @@ class Encoder(BaseEncoder):
         Architecture optimiser
     scheduler : LRScheduler
         Optimiser scheduler
+    run : Run | None
+        Weights & Biases run object for logging and tracking experiments
     net : BaseNetwork
         Neural network
     """

{netloader-3.11.2 → netloader-3.11.3}/netloader/architectures/flows.py

@@ -14,8 +14,8 @@ from zuko.distributions import NormalizingFlow
 from netloader.data import Data
 from netloader.utils import label_change
 from netloader.loss_funcs import BaseLoss
-from netloader.network import BaseNetwork
 from netloader.transforms import BaseTransform
+from netloader.network import BaseNetwork, Network
 from netloader.architectures.base import BaseArchitecture
 from netloader.architectures.encoder_decoder import BaseEncoder
 from netloader.utils.types import NDArrayLike, TensorListLike, NDArrayListLike, TensorT
@@ -29,10 +29,10 @@ class NormFlow(BaseArchitecture):
 
     Attributes
     ----------
-    net : BaseNetwork
-        Neural spline flow
     description : str
         Description of the architecture
+    version : str
+        Version of the architecture when it was created or re-saved
     losses : tuple[list[LossCT], list[LossCT]]
         Architecture training and validation losses as a float or dictionary of losses for each loss
         function
@@ -45,6 +45,10 @@ class NormFlow(BaseArchitecture):
         Architecture optimiser
     scheduler : LRScheduler
         Optimiser scheduler
+    run : Run | None
+        Weights & Biases run object for logging and tracking experiments
+    net : BaseNetwork
+        Neural spline flow
     """
     @staticmethod
     def _data_loader_translation(low_dim: TensorT, high_dim: TensorT) -> tuple[TensorT, TensorT]:
@@ -132,6 +136,8 @@ class NormFlowEncoder(BaseEncoder):
     ----------
     description : str
         Description of the architecture
+    version : str
+        Version of the architecture when it was created or re-saved
     losses : tuple[list[LossCT], list[LossCT]]
         Architecture training and validation losses as a float or dictionary of losses for each loss
         function
@@ -146,6 +152,8 @@ class NormFlowEncoder(BaseEncoder):
         Architecture optimiser
     scheduler : LRScheduler
         Optimiser scheduler
+    run : Run | None
+        Weights & Biases run object for logging and tracking experiments
     net : BaseNetwork
         Neural network
     """
@@ -222,7 +230,7 @@ class NormFlowEncoder(BaseEncoder):
             net,
             overwrite=overwrite,
             mix_precision=mix_precision,
-            learning_rate=0,
+            learning_rate=0.,
             description=description,
             verbose=verbose,
             classes=classes,
@@ -243,7 +251,7 @@ class NormFlowEncoder(BaseEncoder):
             'max': transform,
             'meds': transform,
         }
-        assert isinstance(self.net, nn.ModuleList)
+        assert isinstance(self.net, (nn.ModuleList, Network))
 
         if not self._train_encoder:
             self.net.layers[:-1].requires_grad_(False)

{netloader-3.11.2 → netloader-3.11.3}/netloader/models/misc.py

@@ -183,7 +183,7 @@ class MultiNetwork(BaseNetwork[TypedModuleList[CompatibleNetwork | Network]]):
     def __setstate__(self, state: dict[str, Any]) -> None:
         super().__setstate__(state)
         self._cache = state.get('save_outputs', False)
-        self.layers = TypedModuleList(state.get('layers', []))
+        self.layers = TypedModuleList(state.get('layers', state.get('net')))
 
     def forward(self, x: TensorListLike) -> TensorListLike:
         """

{netloader-3.11.2 → netloader-3.11.3}/netloader/network.py

@@ -81,7 +81,7 @@ class BaseNetwork(nn.Module, ABC, Generic[ModuleListT]):
         """
         if item == 'net':
             warn(
-                'CompatibleNetwork.net is deprecated, please use CompatibleNetwork.layers '
+                'BaseNetwork.net is deprecated, please use BaseNetwork.layers '
                 'instead',
                 DeprecationWarning,
                 stacklevel=2,
@@ -100,6 +100,28 @@ class BaseNetwork(nn.Module, ABC, Generic[ModuleListT]):
         """
         return {'name': self.name, 'version': netloader.__version__}
 
+    def __setattr__(self, key: str, value: Any) -> None:
+        """
+        Sets the attribute of the network.
+
+        Parameters
+        ----------
+        key : str
+            Name of the attribute to set
+        value : Any
+            Value to set the attribute to
+        """
+        if key == 'net':
+            warn(
+                'BaseNetwork.net is deprecated, please use BaseNetwork.layers '
+                'instead',
+                DeprecationWarning,
+                stacklevel=2,
+            )
+            super().__setattr__('layers', value)
+        else:
+            super().__setattr__(key, value)
+
     def __setstate__(self, state: dict[str, Any]) -> None:
         """
         Sets the state of the network for pickling

{netloader-3.11.2 → netloader-3.11.3}/netloader.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netloader
-Version: 3.11.2
+Version: 3.11.3
 Summary: Utility to generate and train PyTorch neural network objects from JSON files
 Author-email: Ethan Tregidga <ethan.tregidga@epfl.ch>
 License-Expression: MIT