deepvisiontools 1.0.2__tar.gz → 1.0.4__tar.gz

{deepvisiontools-1.0.2 → deepvisiontools-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deepvisiontools
-Version: 1.0.2
+Version: 1.0.4
 Summary: deepvisiontools is a library built on torch for training and inference processes for deep learning computer vision tasks.
 Author-email: Lucas Bernigaud Samatan <lucas.bernigaud-samatan@inrae.fr>, Jordan Bernigaud Samatan <jordan.bernigaud-samatan@inrae.fr>
 Maintainer-email: Jordan Bernigaud Samatan <jordan.bernigaud-samatan@inrae.fr>, Lucas Bernigaud Samatan <lucas.bernigaud-samatan@inrae.fr>
@@ -688,7 +688,7 @@ Requires-Dist: torch-tb-profiler<1.0,>=0.4.0
 Requires-Dist: mlflow<4.0,>=3.1.0
 Requires-Dist: fastapi!=0.136.3,<1.0
 Requires-Dist: starlette<2.0,>=1.0.1
-Requires-Dist: ultralytics<8.5.0,>=8.3.28
+Requires-Dist: ultralytics<8.4.57,>=8.3.28
 Requires-Dist: transformers<6.0,>=5.0.0
 Requires-Dist: colorcet<4.0,>=3.1.0
 Requires-Dist: segmentation-models-pytorch<1.0,>=0.4.1
@@ -696,8 +696,8 @@ Requires-Dist: openpyxl<4.0,>=3.1.5
 Requires-Dist: optuna<5.0,>=4.0.0
 Requires-Dist: optuna-dashboard<1.0,>=0.20.0
 Requires-Dist: huggingface_hub<2.0,>=1.5.0
-Requires-Dist: pillow<13.0,>=12.2.0
-Requires-Dist: setuptools<82,>=78.1.1
+Requires-Dist: pillow<13.0,>=12.3.0
+Requires-Dist: setuptools<84,>=83.0.0
 Provides-Extra: dev
 Requires-Dist: pytest<10.0,>=9.0; extra == "dev"
 Requires-Dist: pytest-cov<8.0,>=7.0; extra == "dev"
@@ -729,10 +729,14 @@ Dynamic: license-file
 
 ## News
 
+- Note that some error may occur while using yolo models. If so, check the ultralytics version and downgrade it to below or equal to 8.4.56. Otherwise simply upgrade deepvisiontools above or equal to 1.0.4.
+
 - *release 1.0.0: detector / detector-seg / tabdet / tabdet-seg model wrappers are heavy but powerful models for detection and instance segmentation. However, they are not fully pretrained (only backbone on imagenet). Therefore, on small datasets (< 1000 images ish, but depend on the dataset ...) they can be slightly less competitive than yolo models (also included in the library) that were fully pretrained on coco. We are currently pretraining some of the models but it takes time. We are goind to update the weights once done, so keep tuned for new releases. We suggest you always train a yolo model as well for a baseline comparison. However, on larger datasets they can significantly outperform yolo11x, but again it depends on the dataset ...*
 
 ### patchs
 
+- *1.0.4: fixed inconsistency for yolo wrappers due to modified behaviour in ultralytics forward above 8.4.56 versions. Setting stricted dependency on ultralytics*
+- *1.0.3: fixed ddp desynchronization during validation, made ddp more robust, added ddp timeout control*
 - *1.0.2: added option to concat datasets for deepvisiondataset (DeepVisionDataset.concat)*
 - *1.0.1: fixed inconsistency for yolo wrappers due to modified behaviour in ultralytics between 8.3 and 8.4 versions. Fixed and compatible with both.*
 

{deepvisiontools-1.0.2 → deepvisiontools-1.0.4}/README.md

@@ -12,10 +12,14 @@
 
 ## News
 
+- Note that some error may occur while using yolo models. If so, check the ultralytics version and downgrade it to below or equal to 8.4.56. Otherwise simply upgrade deepvisiontools above or equal to 1.0.4.
+
 - *release 1.0.0: detector / detector-seg / tabdet / tabdet-seg model wrappers are heavy but powerful models for detection and instance segmentation. However, they are not fully pretrained (only backbone on imagenet). Therefore, on small datasets (< 1000 images ish, but depend on the dataset ...) they can be slightly less competitive than yolo models (also included in the library) that were fully pretrained on coco. We are currently pretraining some of the models but it takes time. We are goind to update the weights once done, so keep tuned for new releases. We suggest you always train a yolo model as well for a baseline comparison. However, on larger datasets they can significantly outperform yolo11x, but again it depends on the dataset ...*
 
 ### patchs
 
+- *1.0.4: fixed inconsistency for yolo wrappers due to modified behaviour in ultralytics forward above 8.4.56 versions. Setting stricted dependency on ultralytics*
+- *1.0.3: fixed ddp desynchronization during validation, made ddp more robust, added ddp timeout control*
 - *1.0.2: added option to concat datasets for deepvisiondataset (DeepVisionDataset.concat)*
 - *1.0.1: fixed inconsistency for yolo wrappers due to modified behaviour in ultralytics between 8.3 and 8.4 versions. Fixed and compatible with both.*
 

{deepvisiontools-1.0.2 → deepvisiontools-1.0.4}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=78.1.1,<82"]
+requires = ["setuptools>=83.0.0,<84"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -44,7 +44,7 @@ dependencies = [
   "fastapi!=0.136.3,<1.0",
   "starlette>=1.0.1,<2.0",
 
-  "ultralytics>=8.3.28,<8.5.0",
+  "ultralytics>=8.3.28,<8.4.57",
   "transformers>=5.0.0,<6.0",
   "colorcet>=3.1.0,<4.0",
   "segmentation-models-pytorch>=0.4.1,<1.0",
@@ -52,8 +52,8 @@ dependencies = [
   "optuna>=4.0.0,<5.0",
   "optuna-dashboard>=0.20.0,<1.0",
   "huggingface_hub>=1.5.0,<2.0",
-  "pillow>=12.2.0,<13.0",
-  "setuptools>=78.1.1,<82",
+  "pillow>=12.3.0,<13.0",
+  "setuptools>=83.0.0,<84",
 ]
 
 [project.urls]

{deepvisiontools-1.0.2 → deepvisiontools-1.0.4}/src/deepvisiontools/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.0.2"
+__version__ = "1.0.4"
 
 from .config import current, set_current, use_config
 from .datasets import DeepVisionDataset, DeepVisionLoader

{deepvisiontools-1.0.2 → deepvisiontools-1.0.4}/src/deepvisiontools/data/data.py

@@ -1887,7 +1887,7 @@ class BatchData:
         """
         return [d.value for d in self.datas]
 
-    def scores(self) -> list[torch.Tensor | None | SemanticLogits]:
+    def scores(self) -> list[torch.Tensor | SemanticLogits | None]:
         """
         Return scores tensors for each item as a list.
         """

{deepvisiontools-1.0.2 → deepvisiontools-1.0.4}/src/deepvisiontools/datasets/base.py

@@ -1273,7 +1273,7 @@ class DeepVisionLoader(DataLoader):
         persistent_workers=False,
         pin_memory_device="",
         in_order=True,
-        batch_augmenter: None | BatchAugmenter = None,
+        batch_augmenter: BatchAugmenter | None = None,
     ) -> None:
         self.batch_augmenter = batch_augmenter
         self.base_collate_fn = collate_fn

{deepvisiontools-1.0.2 → deepvisiontools-1.0.4}/src/deepvisiontools/models/base/basemodel.py

@@ -243,6 +243,62 @@ class DeepVisionModel(torch.nn.Module):
 
     # ----------------------------- core steps -----------------------------
 
+    def forward(
+        self,
+        images: torch.Tensor,
+        targets: BatchData | None = None,
+        *,
+        extra_args: dict[str, Any] | None = None,
+        mode: Literal["train", "eval", "valid", "predict"] = "train",
+    ) -> ModelOutput:
+        """
+        DDP-compatible forward dispatcher.
+
+        `DeepVisionModel` keeps the public high-level façade methods
+        `train_step`, `eval_step`, and `predict`. This `forward` method is the
+        module-level entrypoint used by wrappers such as
+        `torch.nn.parallel.DistributedDataParallel`, and dispatches to the same
+        façade methods without changing their behavior.
+
+        Args:
+            images (`torch.Tensor`): Image batch.
+            targets (`BatchData | None`): Optional target batch data.
+            extra_args (`dict[str, Any] | None`): Optional backend-specific
+                keyword payload forwarded to the selected façade method.
+            mode (`Literal["train", "eval", "valid", "predict"]`): Execution
+                path. `"train"` calls `train_step`, `"eval"` and `"valid"` call
+                `eval_step`, and `"predict"` calls `predict`.
+
+        Returns:
+            `ModelOutput`: Standard DeepVisionTools model output.
+
+        ???+ note "DDP note"
+            ```
+            In DDP, the Trainer must call the DDP wrapper itself, not
+            ddp.module.train_step(...). Calling the wrapper triggers PyTorch's
+            distributed forward/backward bookkeeping, while this dispatcher keeps
+            the DeepVisionTools façade API unchanged.
+            ```
+        """
+        if mode == "train":
+            return self.train_step(images, targets, extra_args=extra_args)
+
+        if mode in {"eval", "valid"}:
+            return self.eval_step(images, targets, extra_args=extra_args)
+
+        if mode == "predict":
+            if targets is not None:
+                raise ValueError(
+                    "DeepVisionModel.forward(mode='predict') expects targets=None."
+                )
+            return self.predict(images, extra_args=extra_args)
+
+        raise ValueError(
+            "Unsupported DeepVisionModel.forward mode. "
+            "Expected one of {'train', 'eval', 'valid', 'predict'}, "
+            f"got {mode!r}."
+        )
+
     def train_step(
         self,
         images: torch.Tensor,

{deepvisiontools-1.0.2 → deepvisiontools-1.0.4}/src/deepvisiontools/models/detectors/models/commons/commonblocks.py

@@ -135,7 +135,7 @@ class ConvBNAct(nn.Module):
         g: int = 1,
         bias: bool = False,
         act: bool = True,
-        norm: Literal["gn", "bn", "none"] | None | bool = "gn",
+        norm: Literal["gn", "bn", "none"] | bool | None = "gn",
     ):
         super().__init__()
 

{deepvisiontools-1.0.2 → deepvisiontools-1.0.4}/src/deepvisiontools/models/smp/smp.py

@@ -56,7 +56,7 @@ class SMPBackend(Module):
         else:
             self.model = arch  # already constructed
 
-    def forward(self, x: torch.Tensor, extra_args: None | dict = None) -> torch.Tensor:
+    def forward(self, x: torch.Tensor, extra_args: dict | None = None) -> torch.Tensor:
         """
         Forward once through the SMP model.
 

{deepvisiontools-1.0.2 → deepvisiontools-1.0.4}/src/deepvisiontools/models/yolo/yolo.py

@@ -412,7 +412,7 @@ class YOLOBackend(Module):
 
         self.pad_mult = _stride_from_arch(arch)
 
-    def forward(self, x: torch.Tensor, extra_args: None | dict = None):
+    def forward(self, x: torch.Tensor, extra_args: dict | None = None):
         """
         Single forward for train/eval.
 

{deepvisiontools-1.0.2 → deepvisiontools-1.0.4}/src/deepvisiontools/models/yoloseg/yoloseg.py

@@ -366,7 +366,7 @@ class YOLOSEGBackend(Module):
 
         self.pad_mult = _stride_from_arch(arch)
 
-    def forward(self, x: torch.Tensor, extra_args: None | dict = None):
+    def forward(self, x: torch.Tensor, extra_args: dict | None = None):
         """
         Single forward for train/eval.
 

{deepvisiontools-1.0.2 → deepvisiontools-1.0.4}/src/deepvisiontools/train/trainconfig.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import copy
 import datetime as _dt
 import importlib
+import math
 import platform
 import sys
 from collections.abc import Callable, Sequence
@@ -371,6 +372,9 @@ class DevicesConfig:
         ```
         - device=None + strategy="auto": choose "cuda" if available, else "cpu" with warning.
         - strategy="auto" matches trainer logic (DDP if >1 GPU).
+        - ddp_timeout_seconds controls the distributed process-group timeout for
+          DDP collectives. If None, DDPStrategy reads DVT_DDP_TIMEOUT_SECONDS
+          when present, otherwise it uses its internal default.
         ```
     """
 
@@ -381,6 +385,9 @@ class DevicesConfig:
     num_workers: int | None = None
     pin_memory: bool | None = None
 
+    # None -> DDPStrategy env/default policy
+    ddp_timeout_seconds: float | None = None
+
     def __post_init__(self) -> None:
         if self.device is not None:
             dev = str(self.device).strip().lower()
@@ -400,6 +407,15 @@ class DevicesConfig:
         if self.pin_memory is not None:
             self.pin_memory = bool(self.pin_memory)
 
+        if self.ddp_timeout_seconds is not None:
+            timeout = float(self.ddp_timeout_seconds)
+            if not math.isfinite(timeout) or timeout <= 0.0:
+                raise ValueError(
+                    "DevicesConfig.ddp_timeout_seconds must be a positive finite "
+                    f"number of seconds. Got {self.ddp_timeout_seconds!r}."
+                )
+            self.ddp_timeout_seconds = timeout
+
 
 @dataclass
 class WarmupConfig: