careamics 0.1.0rc3__tar.gz → 0.1.0rc4__tar.gz

{careamics-0.1.0rc3 → careamics-0.1.0rc4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: careamics
-Version: 0.1.0rc3
+Version: 0.1.0rc4
 Summary: Toolbox for running N2V and friends.
 Project-URL: homepage, https://careamics.github.io/
 Project-URL: repository, https://github.com/CAREamics/careamics

{careamics-0.1.0rc3 → careamics-0.1.0rc4}/src/careamics/__init__.py

@@ -9,16 +9,18 @@ except PackageNotFoundError:
 
 __all__ = [
     "CAREamist",
-    "CAREamicsModule",
+    "CAREamicsModuleWrapper",
+    "CAREamicsPredictData",
+    "CAREamicsTrainData",
     "Configuration",
     "load_configuration",
     "save_configuration",
-    "CAREamicsTrainDataModule",
-    "CAREamicsPredictDataModule",
+    "TrainingDataWrapper",
+    "PredictDataWrapper",
 ]
 
 from .careamist import CAREamist
 from .config import Configuration, load_configuration, save_configuration
-from .lightning_datamodule import CAREamicsTrainDataModule
-from .lightning_module import CAREamicsModule
-from .lightning_prediction_datamodule import CAREamicsPredictDataModule
+from .lightning_datamodule import CAREamicsTrainData, TrainingDataWrapper
+from .lightning_module import CAREamicsModuleWrapper
+from .lightning_prediction_datamodule import CAREamicsPredictData, PredictDataWrapper

{careamics-0.1.0rc3 → careamics-0.1.0rc4}/src/careamics/careamist.py

@@ -20,9 +20,9 @@ from careamics.config import (
 )
 from careamics.config.inference_model import TRANSFORMS_UNION
 from careamics.config.support import SupportedAlgorithm, SupportedData, SupportedLogger
-from careamics.lightning_datamodule import CAREamicsWood
-from careamics.lightning_module import CAREamicsKiln
-from careamics.lightning_prediction_datamodule import CAREamicsClay
+from careamics.lightning_datamodule import CAREamicsTrainData
+from careamics.lightning_module import CAREamicsModule
+from careamics.lightning_prediction_datamodule import CAREamicsPredictData
 from careamics.lightning_prediction_loop import CAREamicsPredictionLoop
 from careamics.model_io import export_to_bmz, load_pretrained
 from careamics.utils import check_path_exists, get_logger
@@ -140,7 +140,7 @@ class CAREamist:
             self.cfg = source
 
             # instantiate model
-            self.model = CAREamicsKiln(
+            self.model = CAREamicsModule(
                 algorithm_config=self.cfg.algorithm_config,
             )
 
@@ -156,7 +156,7 @@ class CAREamist:
                 self.cfg = load_configuration(source)
 
                 # instantiate model
-                self.model = CAREamicsKiln(
+                self.model = CAREamicsModule(
                     algorithm_config=self.cfg.algorithm_config,
                 )
 
@@ -193,8 +193,8 @@ class CAREamist:
         self.trainer.predict_loop = CAREamicsPredictionLoop(self.trainer)
 
         # place holder for the datamodules
-        self.train_datamodule: Optional[CAREamicsWood] = None
-        self.pred_datamodule: Optional[CAREamicsClay] = None
+        self.train_datamodule: Optional[CAREamicsTrainData] = None
+        self.pred_datamodule: Optional[CAREamicsPredictData] = None
 
     def _define_callbacks(self) -> List[Callback]:
         """
@@ -227,7 +227,7 @@ class CAREamist:
     def train(
         self,
         *,
-        datamodule: Optional[CAREamicsWood] = None,
+        datamodule: Optional[CAREamicsTrainData] = None,
         train_source: Optional[Union[Path, str, np.ndarray]] = None,
         val_source: Optional[Union[Path, str, np.ndarray]] = None,
         train_target: Optional[Union[Path, str, np.ndarray]] = None,
@@ -360,7 +360,7 @@ class CAREamist:
                     f"instance (got {type(train_source)})."
                 )
 
-    def _train_on_datamodule(self, datamodule: CAREamicsWood) -> None:
+    def _train_on_datamodule(self, datamodule: CAREamicsTrainData) -> None:
         """
         Train the model on the provided datamodule.
 
@@ -402,7 +402,7 @@ class CAREamist:
             Minimum number of patches to use for validation, by default 5.
         """
         # create datamodule
-        datamodule = CAREamicsWood(
+        datamodule = CAREamicsTrainData(
             data_config=self.cfg.data_config,
             train_data=train_data,
             val_data=val_data,
@@ -458,7 +458,7 @@ class CAREamist:
             path_to_val_target = check_path_exists(path_to_val_target)
 
         # create datamodule
-        datamodule = CAREamicsWood(
+        datamodule = CAREamicsTrainData(
             data_config=self.cfg.data_config,
             train_data=path_to_train_data,
             val_data=path_to_val_data,
@@ -475,7 +475,7 @@ class CAREamist:
     @overload
     def predict(  # numpydoc ignore=GL08
         self,
-        source: CAREamicsClay,
+        source: CAREamicsPredictData,
         *,
         checkpoint: Optional[Literal["best", "last"]] = None,
     ) -> Union[list, np.ndarray]:
@@ -519,7 +519,7 @@ class CAREamist:
 
     def predict(
         self,
-        source: Union[CAREamicsClay, Path, str, np.ndarray],
+        source: Union[CAREamicsPredictData, Path, str, np.ndarray],
         *,
         batch_size: int = 1,
         tile_size: Optional[Tuple[int, ...]] = None,
@@ -587,7 +587,7 @@ class CAREamist:
         ValueError
             If the input is not a CAREamicsClay instance, a path or a numpy array.
         """
-        if isinstance(source, CAREamicsClay):
+        if isinstance(source, CAREamicsPredictData):
             # record datamodule
             self.pred_datamodule = source
 
@@ -623,8 +623,8 @@ class CAREamist:
                 source_path = check_path_exists(source)
 
                 # create datamodule
-                datamodule = CAREamicsClay(
-                    prediction_config=prediction_config,
+                datamodule = CAREamicsPredictData(
+                    pred_config=prediction_config,
                     pred_data=source_path,
                     read_source_func=read_source_func,
                     extension_filter=extension_filter,
@@ -640,8 +640,8 @@ class CAREamist:
 
             elif isinstance(source, np.ndarray):
                 # create datamodule
-                datamodule = CAREamicsClay(
-                    prediction_config=prediction_config,
+                datamodule = CAREamicsPredictData(
+                    pred_config=prediction_config,
                     pred_data=source,
                     dataloader_params=dataloader_params,
                 )

{careamics-0.1.0rc3 → careamics-0.1.0rc4}/src/careamics/config/__init__.py

@@ -2,15 +2,17 @@
 
 
 __all__ = [
-    "AlgorithmModel",
-    "DataModel",
+    "AlgorithmConfig",
+    "DataConfig",
     "Configuration",
     "CheckpointModel",
-    "InferenceModel",
+    "InferenceConfig",
     "load_configuration",
     "save_configuration",
-    "TrainingModel",
+    "TrainingConfig",
     "create_n2v_configuration",
+    "create_n2n_configuration",
+    "create_care_configuration",
     "register_model",
     "CustomModel",
     "create_inference_configuration",
@@ -18,11 +20,13 @@ __all__ = [
     "ConfigurationInformation",
 ]
 
-from .algorithm_model import AlgorithmModel
+from .algorithm_model import AlgorithmConfig
 from .architectures import CustomModel, clear_custom_models, register_model
 from .callback_model import CheckpointModel
 from .configuration_factory import (
+    create_care_configuration,
     create_inference_configuration,
+    create_n2n_configuration,
     create_n2v_configuration,
 )
 from .configuration_model import (
@@ -30,6 +34,6 @@ from .configuration_model import (
     load_configuration,
     save_configuration,
 )
-from .data_model import DataModel
-from .inference_model import InferenceModel
-from .training_model import TrainingModel
+from .data_model import DataConfig
+from .inference_model import InferenceConfig
+from .training_model import TrainingConfig

{careamics-0.1.0rc3 → careamics-0.1.0rc4}/src/careamics/config/algorithm_model.py

@@ -10,7 +10,7 @@ from .architectures import CustomModel, UNetModel, VAEModel
 from .optimizer_models import LrSchedulerModel, OptimizerModel
 
 
-class AlgorithmModel(BaseModel):
+class AlgorithmConfig(BaseModel):
     """Algorithm configuration.
 
     This Pydantic model validates the parameters governing the components of the
@@ -45,7 +45,7 @@ class AlgorithmModel(BaseModel):
     Examples
     --------
     Minimum example:
-    >>> from careamics.config import AlgorithmModel
+    >>> from careamics.config import AlgorithmConfig
     >>> config_dict = {
     ...     "algorithm": "n2v",
     ...     "loss": "n2v",
@@ -53,11 +53,11 @@ class AlgorithmModel(BaseModel):
     ...         "architecture": "UNet",
     ...     }
     ... }
-    >>> config = AlgorithmModel(**config_dict)
+    >>> config = AlgorithmConfig(**config_dict)
 
     Using a custom model:
     >>> from torch import nn, ones
-    >>> from careamics.config import AlgorithmModel, register_model
+    >>> from careamics.config import AlgorithmConfig, register_model
     ...
     >>> @register_model(name="linear_model")
     ... class LinearModel(nn.Module):
@@ -80,7 +80,7 @@ class AlgorithmModel(BaseModel):
     ...         "out_features": 5,
     ...     }
     ... }
-    >>> config = AlgorithmModel(**config_dict)
+    >>> config = AlgorithmConfig(**config_dict)
     """
 
     # Pydantic class configuration

careamics-0.1.0rc4/src/careamics/config/configuration_example.py

@@ -0,0 +1,89 @@
+from .algorithm_model import AlgorithmConfig
+from .architectures import UNetModel
+from .configuration_model import Configuration
+from .data_model import DataConfig
+from .optimizer_models import LrSchedulerModel, OptimizerModel
+from .support import (
+    SupportedActivation,
+    SupportedAlgorithm,
+    SupportedArchitecture,
+    SupportedData,
+    SupportedLogger,
+    SupportedLoss,
+    SupportedOptimizer,
+    SupportedPixelManipulation,
+    SupportedScheduler,
+    SupportedTransform,
+)
+from .training_model import TrainingConfig
+
+
+def full_configuration_example() -> Configuration:
+    """Returns a dictionnary representing a full configuration example.
+
+    Returns
+    -------
+    Configuration
+        Full configuration example.
+    """
+    experiment_name = "Full example"
+    algorithm_model = AlgorithmConfig(
+        algorithm=SupportedAlgorithm.N2V.value,
+        loss=SupportedLoss.N2V.value,
+        model=UNetModel(
+            architecture=SupportedArchitecture.UNET.value,
+            in_channels=1,
+            num_classes=1,
+            depth=2,
+            num_channels_init=32,
+            final_activation=SupportedActivation.NONE.value,
+            n2v2=True,
+        ),
+        optimizer=OptimizerModel(
+            name=SupportedOptimizer.ADAM.value, parameters={"lr": 0.0001}
+        ),
+        lr_scheduler=LrSchedulerModel(
+            name=SupportedScheduler.REDUCE_LR_ON_PLATEAU.value,
+        ),
+    )
+    data_model = DataConfig(
+        data_type=SupportedData.ARRAY.value,
+        patch_size=(256, 256),
+        batch_size=8,
+        axes="YX",
+        transforms=[
+            {
+                "name": SupportedTransform.NORMALIZE.value,
+            },
+            {
+                "name": SupportedTransform.NDFLIP.value,
+                "is_3D": False,
+            },
+            {
+                "name": SupportedTransform.XY_RANDOM_ROTATE90.value,
+                "is_3D": False,
+            },
+            {
+                "name": SupportedTransform.N2V_MANIPULATE.value,
+                "roi_size": 11,
+                "masked_pixel_percentage": 0.2,
+                "strategy": SupportedPixelManipulation.MEDIAN.value,
+            },
+        ],
+        mean=0.485,
+        std=0.229,
+        dataloader_params={
+            "num_workers": 4,
+        },
+    )
+    training_model = TrainingConfig(
+        num_epochs=30,
+        logger=SupportedLogger.WANDB.value,
+    )
+
+    return Configuration(
+        experiment_name=experiment_name,
+        algorithm_config=algorithm_model,
+        data_config=data_model,
+        training_config=training_model,
+    )