konfai 1.1.7__tar.gz → 1.1.8__tar.gz

{konfai-1.1.7 → konfai-1.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: konfai
-Version: 1.1.7
+Version: 1.1.8
 Summary: Modular and configurable Deep Learning framework with YAML and PyTorch
 Author-email: Valentin Boussot <boussot.v@gmail.com>
 License-Expression: Apache-2.0

{konfai-1.1.7 → konfai-1.1.8}/konfai/data/data_manager.py

@@ -282,7 +282,7 @@ class Data(ABC):
         self.dataAugmentationsList = dataAugmentationsList
         self.batch_size = batch_size
         self.dataSet_args = dict(groups_src=self.groups_src, inlineAugmentations=inlineAugmentations, dataAugmentationsList = list(self.dataAugmentationsList.values()), use_cache = use_cache, buffer_size=batch_size+1, patch_size=self.patch.patch_size if self.patch is not None else None, overlap=self.patch.overlap if self.patch is not None else None)
-        self.dataLoader_args = dict(num_workers=int(os.environ["KONFAI_WORKERS"]), pin_memory=True)
+        self.dataLoader_args = dict(num_workers=int(os.environ["KONFAI_WORKERS"]) if use_cache else 0, pin_memory=True)
         self.data : list[list[dict[str, list[DatasetManager]]], dict[str, list[DatasetManager]]] = []
         self.map : list[list[list[tuple[int, int, int]]], list[tuple[int, int, int]]] = []
         self.datasets: dict[str, Dataset] = {}

{konfai-1.1.7 → konfai-1.1.8}/konfai/data/transform.py

@@ -250,7 +250,6 @@ class ResampleToShape(Resample):
         self.shape = torch.tensor([0 if s < 0 else s for s in shape])
 
     def transformShape(self, shape: list[int], cache_attribute: Attribute) -> list[int]:
-        print(shape)
         if "Spacing" not in cache_attribute:
             TransformError("Missing 'Spacing' in cache attributes, the data is likely not a valid image.",
                         "Make sure your input is a image (e.g., .nii, .mha) with proper metadata.")
@@ -260,7 +259,6 @@ class ResampleToShape(Resample):
         for i, s in enumerate(self.shape):
             if s == 0:
                 new_shape[i] = shape[i]
-        print(new_shape)
         return new_shape
     
     def __call__(self, name: str, input: torch.Tensor, cache_attribute: Attribute) -> torch.Tensor:

{konfai-1.1.7 → konfai-1.1.8}/konfai/predictor.py

@@ -64,7 +64,7 @@ class OutDataset(Dataset, NeedDevice, ABC):
 
         module, name = _getModule(self.reduction_classpath, "konfai.predictor")
         if module == "konfai.predictor":
-            self.reduction = getattr(importlib.import_module(module), name)
+            self.reduction = getattr(importlib.import_module(module), name)()
         else:
             self.reduction = config("{}.outsDataset.{}.OutDataset.{}".format(KONFAI_ROOT(), name_layer, self.reduction_classpath))(getattr(importlib.import_module(module), name))(config = None)
        
@@ -184,7 +184,6 @@ class OutSameAsGroupDataset(OutDataset):
         result = torch.cat([self._getOutput(index, index_augmentation, dataset).unsqueeze(0) for index_augmentation in self.output_layer_accumulator[index].keys()], dim=0)
         self.output_layer_accumulator.pop(index)
         result = self.reduction(result.float()).to(result.dtype)
-            
         for transform in self.after_reduction_transforms:
             result = transform(self.names[index], result, self.attributes[index][0][0])
 
@@ -303,7 +302,7 @@ class ModelComposite(Network):
         for module_outputs in result.values():
             for key, tensor in module_outputs:
                 aggregated[key].append(tensor)
-
+        
         final_outputs = []
         for key, tensors in aggregated.items():
             final_outputs.append((key, self.combine(torch.stack(tensors, dim=0))))
@@ -404,7 +403,7 @@ class Predictor(DistributedObject):
         
         module, name = _getModule(self.combine_classpath, "konfai.predictor")
         if module == "konfai.predictor":
-            combine = getattr(importlib.import_module(module), name)
+            combine = getattr(importlib.import_module(module), name)()
         else:
             combine = config("{}.{}".format(KONFAI_ROOT(), self.combine_classpath))(getattr(importlib.import_module(module), name))(config = None)
        

{konfai-1.1.7 → konfai-1.1.8}/konfai.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: konfai
-Version: 1.1.7
+Version: 1.1.8
 Summary: Modular and configurable Deep Learning framework with YAML and PyTorch
 Author-email: Valentin Boussot <boussot.v@gmail.com>
 License-Expression: Apache-2.0

{konfai-1.1.7 → konfai-1.1.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "konfai"
-version = "1.1.7"
+version = "1.1.8"
 description = "Modular and configurable Deep Learning framework with YAML and PyTorch"
 readme = "README.md"
 requires-python = ">=3.8"