zeroth-learn 0.2.0__tar.gz → 0.2.1__tar.gz

{zeroth_learn-0.2.0/zeroth_learn.egg-info → zeroth_learn-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zeroth-learn
-Version: 0.2.0
+Version: 0.2.1
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: matplotlib

{zeroth_learn-0.2.0 → zeroth_learn-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "zeroth-learn"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
     "numpy",
     "pandas",

{zeroth_learn-0.2.0 → zeroth_learn-0.2.1}/zeroth/abstract/__init__.py

@@ -7,3 +7,4 @@ from .model import Model, ModelConfig
 from .neural_network import NeuralNetworkConfig, LayerConfig, NeuralNetwork
 from .optimizer import Optimizer
 from .perturbation_matrix import PerturbationMatrix
+from .summary import Summary

{zeroth_learn-0.2.0 → zeroth_learn-0.2.1}/zeroth/abstract/activation.py

@@ -12,9 +12,9 @@ class Activation(ABC):
     @abstractmethod
     def __call__(self, x: float | Array) -> float | Array:
         """Applique la fonction d'activation (forward)."""
-        pass
+        ...
 
     @abstractmethod
     def derivative(self, x: float | Array) -> float | Array:
         """Calcule la dérivée de la fonction d'activation."""
-        pass
+        ...

{zeroth_learn-0.2.0 → zeroth_learn-0.2.1}/zeroth/abstract/blackbox.py

@@ -21,7 +21,7 @@ class BlackBox(ABC):
         Returns:
             Array: Network predictions. Shape: (output_dim, batch_size).
         """
-        pass
+        ...
 
     @abstractmethod
     def init_params(self, params: dict) -> None:
@@ -30,7 +30,7 @@ class BlackBox(ABC):
         Args:
             params (tuple): Tuple containing the parameters (eg: weights and biases).
         """
-        pass
+        ...
 
     @abstractmethod
     def get_params(self) -> dict:
@@ -39,4 +39,4 @@ class BlackBox(ABC):
         Returns:
             dict: (eg: List of Weight matrices, List of Bias vectors).
         """
-        pass
+        ...

{zeroth_learn-0.2.0 → zeroth_learn-0.2.1}/zeroth/abstract/data_creator.py

@@ -9,4 +9,4 @@ class DataCreator(ABC):
 
     @abstractmethod
     def __call__(self) -> Data:
-        pass
+        ...

{zeroth_learn-0.2.0 → zeroth_learn-0.2.1}/zeroth/abstract/loss.py

@@ -15,7 +15,7 @@ class Loss(ABC):
         :param Y_true: shape (batch, out)
         :return: avg loss shape: float
         """
-        pass
+        ...
 
     @staticmethod
     @abstractmethod
@@ -25,7 +25,7 @@ class Loss(ABC):
         :param Y_true: shape (batch, out)
         :return: batch loss shape (batch, )
         """
-        pass
+        ...
 
     @staticmethod
     @abstractmethod
@@ -35,7 +35,7 @@ class Loss(ABC):
         :param Y_true: (batch, out)
         :return: perturbed loss (T, nb_params)
         """
-        pass
+        ...
 
     @staticmethod
     @abstractmethod
@@ -46,13 +46,13 @@ class Loss(ABC):
         :param Y_true: shape (batch, out)
         :return: batch loss shape (batch, )
         """
-        pass
+        ...
 
     @abstractmethod
     def compute_losses_for_zeroth_order(self, pY_pred: Array, Y_true: Array) -> tuple[float, Array]:
-        pass
+        ...
 
     @abstractmethod
     def compute_losses_for_first_order(self, last_layer, Y_pred: Array, Y_true: Array) -> tuple[
         float, Array]:
-        pass
+        ...

{zeroth_learn-0.2.0 → zeroth_learn-0.2.1}/zeroth/abstract/metric.py

@@ -10,4 +10,4 @@ class Metric(ABC):
     @abstractmethod
     def __call__(self, Y_pred: Array, Y_true: Array) -> float:
         """Applique la fonction d'activation (forward)."""
-        pass
+        ...

{zeroth_learn-0.2.0 → zeroth_learn-0.2.1}/zeroth/abstract/model.py

@@ -13,10 +13,11 @@ import pandas as pd
 from .blackbox import BlackBox
 from .loss import Loss
 from .optimizer import Optimizer
+from .summary import Summary
 from ..data import Data
 from ..plot_losses import plot_losses
 from ..types import Array
-from ..utils.dataclasses_utils import config_serializer, Summary
+from ..utils.dataclasses_utils import config_serializer
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -38,10 +39,10 @@ class ModelConfig(ABC, Summary):
 
     @abstractmethod
     def instantiate(self) -> Model:
-        pass
+        ...
 
 
-class Model(ABC, Summary):
+class Model(ABC):
     """
     Base class orchestrating the training and testing loop.
 
@@ -79,7 +80,8 @@ class Model(ABC, Summary):
         print(f"    Training {self.id} Model")
 
         data.batch_size = self.batch_size
-        nb_batches = data.nb_batches
+        nb_batches = len(data)
+
         self.training_loss = np.zeros(self.nb_epochs * nb_batches, dtype=np.float64)
         print_indexes = np.linspace(0, nb_batches - 1, nb_print).astype(int)
 

{zeroth_learn-0.2.0 → zeroth_learn-0.2.1}/zeroth/abstract/neural_network.py

@@ -2,17 +2,18 @@ from abc import ABC
 from dataclasses import dataclass
 
 from .activation import Activation
+from .summary import Summary
 
 
 @dataclass(frozen=True)
-class LayerConfig:
+class LayerConfig(Summary):
     input_dim: int
     output_dim: int
     activation: Activation
 
 
 @dataclass(frozen=True)
-class NeuralNetworkConfig:
+class NeuralNetworkConfig(Summary):
     name: str
     layers_config: list[LayerConfig]
 

{zeroth_learn-0.2.0 → zeroth_learn-0.2.1}/zeroth/abstract/optimizer.py

@@ -26,4 +26,4 @@ class Optimizer(ABC):
         Returns:
             float: The average loss for the processed batch.
         """
-        pass
+        ...

{zeroth_learn-0.2.0 → zeroth_learn-0.2.1}/zeroth/abstract/perturbation_matrix.py

@@ -12,4 +12,4 @@ class PerturbationMatrix(ABC):
     @abstractmethod
     def __call__(self, nb_perturbation: int, nb_parameters: int) -> Array:
         """Applique la fonction d'activation (forward)."""
-        pass
+        ...

zeroth_learn-0.2.1/zeroth/abstract/summary.py

@@ -0,0 +1,13 @@
+import json
+
+from ..utils.dataclasses_utils import config_serializer
+
+
+class Summary:
+    def summary(self) -> None:
+        summary = json.dumps(
+            self,
+            default=config_serializer,
+            indent=4
+        )
+        print(summary)

{zeroth_learn-0.2.0 → zeroth_learn-0.2.1}/zeroth/data.py

@@ -17,14 +17,13 @@ class Data:
 
         self.indices: np.ndarray = np.arange(self.nb_data)
 
+    def __len__(self) -> int:
+        return self.nb_data // self.batch_size
+
     def __iter__(self) -> Iterator[tuple[Array, Array]]:
         for i in range(0, self.nb_data - self.batch_size + 1, self.batch_size):
             batch_idx = self.indices[i:i + self.batch_size]
             yield self.raw_X_train[batch_idx], self.raw_Y_train[batch_idx]
 
-    @property
-    def nb_batches(self) -> int:
-        return self.nb_data // self.batch_size
-
     def permutation(self) -> None:
         self.indices = np.random.permutation(self.nb_data)

{zeroth_learn-0.2.0 → zeroth_learn-0.2.1}/zeroth/experiment.py

@@ -3,14 +3,14 @@ from __future__ import annotations
 import itertools
 import os
 from dataclasses import dataclass, replace
-from typing import Callable, Union
+from typing import Union
 
 import pandas as pd
 
-from .abstract import Model, ModelConfig
+from .abstract import Model, ModelConfig, DataCreator, Summary
 from .data import Data
 from .plot_losses import plot_losses
-from .utils.dataclasses_utils import get_name, set_value_by_path, Summary
+from .utils.dataclasses_utils import get_name, set_value_by_path
 
 
 @dataclass(frozen=True)
@@ -26,7 +26,7 @@ class ExperimentConfig(Summary):
     title: str
     base_model: ModelConfig
     variations: list[VariationConfig]
-    create_data: Callable
+    data_creator: DataCreator
     plot_dimension: int
     smooth_fraction: float
 
@@ -34,7 +34,7 @@ class ExperimentConfig(Summary):
         return Experiment(self)
 
 
-class Experiment(Summary):
+class Experiment:
     """Manages the full lifecycle of a deep learning experiment.
 
     It handles data loading, model instantiation, training loops, and results visualization.
@@ -52,7 +52,7 @@ class Experiment(Summary):
         self.title: str = config.title
         self.base_model_config: ModelConfig = config.base_model
         self.models: list[Model] = generate_models(config.base_model, config.variations)
-        self.data: Data = config.create_data()
+        self.data: Data = config.data_creator()
         self.plot_dimension: int = config.plot_dimension
         self.smooth_fraction: float = config.smooth_fraction
 

{zeroth_learn-0.2.0 → zeroth_learn-0.2.1}/zeroth/first_order/optimizers.py

@@ -8,16 +8,15 @@ import numpy as np
 
 from .layer import Layer
 from .neural_network import FirstOrderNeuralNetwork
-from ..abstract.loss import Loss
-from ..abstract.optimizer import Optimizer
+from ..abstract import Loss, Optimizer, Summary
 from ..types import Array
 
 
 @dataclass(frozen=True)
-class FirstOrderOptimizerConfig(ABC):
+class FirstOrderOptimizerConfig(Summary, ABC):
     @abstractmethod
     def instantiate(self) -> FirstOrderOptimizer:
-        pass
+        ...
 
 
 @dataclass(frozen=True)
@@ -42,7 +41,7 @@ class FirstOrderAdamConfig(FirstOrderSGDConfig):
 class FirstOrderOptimizer(Optimizer):
     @abstractmethod
     def do_descent(self, neural_network, loss, X: Array, Y_true: Array) -> float:
-        pass
+        ...
 
 
 class FirstOrderSGD(FirstOrderOptimizer):

{zeroth_learn-0.2.0 → zeroth_learn-0.2.1}/zeroth/utils/dataclasses_utils.py

@@ -1,4 +1,3 @@
-import json
 from dataclasses import is_dataclass, asdict, replace
 from typing import Any
 
@@ -34,13 +33,3 @@ def config_serializer(obj: Any):
         return getattr(obj, "__name__", str(obj))
 
     return str(obj)
-
-
-class Summary:
-    def summary(self) -> None:
-        summary = json.dumps(
-            self,
-            default=config_serializer,
-            indent=4
-        )
-        print(summary)

{zeroth_learn-0.2.0 → zeroth_learn-0.2.1}/zeroth/zeroth_order/gradient_estimators.py

@@ -5,15 +5,15 @@ from dataclasses import dataclass
 
 import numpy as np
 
-from ..abstract.perturbation_matrix import PerturbationMatrix
+from ..abstract import PerturbationMatrix, Summary
 from ..types import Array
 
 
 @dataclass(frozen=True)
-class GradientEstimatorConfig(ABC):
+class GradientEstimatorConfig(Summary, ABC):
     @abstractmethod
     def instantiate(self, nb_params: int) -> GradientEstimator:
-        pass
+        ...
 
 
 @dataclass(frozen=True)

{zeroth_learn-0.2.0 → zeroth_learn-0.2.1}/zeroth/zeroth_order/optimizers.py

@@ -7,16 +7,15 @@ import numpy as np
 
 from .gradient_estimators import GradientEstimator
 from .zeroth_order_blackbox import ZerothOrderBlackBox
-from ..abstract.loss import Loss
-from ..abstract.optimizer import Optimizer
+from ..abstract import Loss, Optimizer, Summary
 from ..types import Array
 
 
 @dataclass(frozen=True)
-class ZerothOrderOptimizerConfig(ABC):
+class ZerothOrderOptimizerConfig(Summary, ABC):
     @abstractmethod
     def instantiate(self, gradient_estimator: GradientEstimator) -> ZerothOrderOptimizer:
-        pass
+        ...
 
 
 @dataclass(frozen=True)
@@ -42,16 +41,16 @@ class ZerothOrderAdamConfig(ZerothOrderSGDConfig):
 class ZerothOrderOptimizer(Optimizer):
     @abstractmethod
     def do_descent(self, blackbox: ZerothOrderBlackBox, loss: Loss, X: Array, Y_true: Array) -> float:
-        pass
+        ...
 
     @abstractmethod
     def compute_gradient(self, blackbox: ZerothOrderBlackBox, loss: Loss, X: Array, Y_true: Array) -> tuple[
         float, Array]:
-        pass
+        ...
 
     @abstractmethod
     def update_params(self, blackbox: ZerothOrderBlackBox, gradient: Array) -> None:
-        pass
+        ...
 
 
 class ZerothOrderSGD(ZerothOrderOptimizer):

{zeroth_learn-0.2.0 → zeroth_learn-0.2.1}/zeroth/zeroth_order/zeroth_order_blackbox.py

@@ -9,8 +9,8 @@ class ZerothOrderBlackBox(BlackBox):
 
     @abstractmethod
     def forward_perturbed(self, X: Array, gradient_estimator: GradientEstimator) -> Array:
-        pass
+        ...
 
     @abstractmethod
     def update_params(self, grad: Array, learning_rate: float) -> None:
-        pass
+        ...

{zeroth_learn-0.2.0 → zeroth_learn-0.2.1/zeroth_learn.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zeroth-learn
-Version: 0.2.0
+Version: 0.2.1
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: matplotlib

{zeroth_learn-0.2.0 → zeroth_learn-0.2.1}/zeroth_learn.egg-info/SOURCES.txt

@@ -17,6 +17,7 @@ zeroth/abstract/model.py
 zeroth/abstract/neural_network.py
 zeroth/abstract/optimizer.py
 zeroth/abstract/perturbation_matrix.py
+zeroth/abstract/summary.py
 zeroth/first_order/__init__.py
 zeroth/first_order/layer.py
 zeroth/first_order/model.py