konfai 1.0.3__py3-none-any.whl → 1.0.5__py3-none-any.whl

konfai/data/augmentation.py

@@ -58,7 +58,7 @@ class DataAugmentationsList():
 
     def load(self, key: str):
         for augmentation, prob in self.dataAugmentationsLoader.items():
-            module, name = _getModule(augmentation, "augmentation")
+            module, name = _getModule(augmentation, "data.augmentation")
             dataAugmentation: DataAugmentation = getattr(importlib.import_module(module), name)(config = None, DL_args="{}.Dataset.augmentations.{}.dataAugmentations".format(DEEP_LEARNING_API_ROOT(), key))
             dataAugmentation.load(prob.prob)
             self.dataAugmentations.append(dataAugmentation)

konfai/data/transform.py

@@ -36,7 +36,7 @@ class TransformLoader:
         pass
     
     def getTransform(self, classpath : str, DL_args : str) -> Transform:
-        module, name = _getModule(classpath, "transform")
+        module, name = _getModule(classpath, "data.transform")
         return config("{}.{}".format(DL_args, classpath))(getattr(importlib.import_module(module), name))(config = None)
 
 class Clip(Transform):

konfai/evaluator.py

@@ -27,7 +27,7 @@ class CriterionsLoader():
     def getCriterions(self, output_group : str, target_group : str) -> dict[torch.nn.Module, CriterionsAttr]:
         criterions = {}
         for module_classpath, criterionsAttr in self.criterionsLoader.items():
-            module, name = _getModule(module_classpath, "measure")
+            module, name = _getModule(module_classpath, "metric.measure")
             criterions[config("{}.metrics.{}.targetsCriterions.{}.criterionsLoader.{}".format(DEEP_LEARNING_API_ROOT(), output_group, target_group, module_classpath))(getattr(importlib.import_module(module), name))(config = None)] = criterionsAttr
         return criterions
 
@@ -90,7 +90,7 @@ class Evaluator(DistributedObject):
         if os.environ["DEEP_LEANING_API_CONFIG_MODE"] != "Done":
             exit(0)
         super().__init__(train_name)
-        self.metric_path = METRICS_DIRECTORY()+self.name+"/"
+        self.metric_path = EVALUATIONS_DIRECTORY()+self.name+"/"
         self.predict_path = PREDICTIONS_DIRECTORY()+self.name+"/"
         self.metricsLoader = metrics
         self.dataset = dataset

konfai/metric/measure.py

@@ -244,7 +244,7 @@ class PerceptualLoss(Criterion):
         def getLoss(self) -> dict[torch.nn.Module, float]:
             result: dict[torch.nn.Module, float] = {}
             for loss, l in self.losses.items():
-                module, name = _getModule(loss, "measure")
+                module, name = _getModule(loss, "metric.measure")
                 result[config(self.DL_args)(getattr(importlib.import_module(module), name))(config=None)] = l   
             return result
         

konfai/network/network.py

@@ -96,7 +96,7 @@ class CriterionsLoader():
     def getCriterions(self, model_classname : str, output_group : str, target_group : str) -> dict[torch.nn.Module, CriterionsAttr]:
         criterions = {}
         for module_classpath, criterionsAttr in self.criterionsLoader.items():
-            module, name = _getModule(module_classpath, "measure")
+            module, name = _getModule(module_classpath, "metric.measure")
             criterionsAttr.isTorchCriterion = module.startswith("torch")
             criterionsAttr.sheduler = criterionsAttr.l.getShedulers("{}.Model.{}.outputsCriterions.{}.targetsCriterions.{}.criterionsLoader.{}".format(DEEP_LEARNING_API_ROOT(), model_classname, output_group, target_group, module_classpath))
             criterions[config("{}.Model.{}.outputsCriterions.{}.targetsCriterions.{}.criterionsLoader.{}".format(DEEP_LEARNING_API_ROOT(), model_classname, output_group, target_group, module_classpath))(getattr(importlib.import_module(module), name))(config = None)] = criterionsAttr

konfai/predictor.py

@@ -55,7 +55,7 @@ class OutDataset(Dataset, NeedDevice, ABC):
                     transform_type.append(transform)
 
         if self._patchCombine is not None:
-            module, name = _getModule(self._patchCombine, "HDF5")
+            module, name = _getModule(self._patchCombine, "data.HDF5")
             self.patchCombine = getattr(importlib.import_module(module), name)(config = None, DL_args =  "{}.outsDataset.{}.OutDataset".format(DEEP_LEARNING_API_ROOT(), name_layer))
     
     def setPatchConfig(self, patchSize: Union[list[int], None], overlap: Union[int, None], nb_data_augmentation: int) -> None:

konfai/utils/dataset.py

@@ -9,7 +9,6 @@ import os
 
 from lxml import etree
 import csv
-import pandas as pd
 from konfai import DATE
 
 class Plot():
@@ -205,7 +204,7 @@ class Plot():
 
         for label in labels:
             series = series+[label]*max
-
+        import pandas as pd
         df = pd.DataFrame(dict([(k,pd.Series(v)) for k, v in norms.items()]))
         df['Categories'] = pd.Series(series)
         

konfai/utils/utils.py

@@ -35,7 +35,7 @@ def _getModule(classpath : str, type : str) -> tuple[str, str]:
         module = ".".join(classpath.split("_")[:-1])
         name = classpath.split("_")[-1] 
     else:
-        module = ""+type
+        module = "konfai."+type
         name = classpath
     return module, name
 

{konfai-1.0.3.dist-info → konfai-1.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: konfai
-Version: 1.0.3
+Version: 1.0.5
 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.0.3.dist-info → konfai-1.0.5.dist-info}/RECORD

@@ -1,15 +1,15 @@
 konfai/__init__.py,sha256=jXMTNml38eX6FSq9d3C_gJVgRLTKHPBUXqOLC7Pqkuo,828
-konfai/evaluator.py,sha256=emXNtEdKNf_YoJ-mkvdAuIwiwL6n5OvkWKAJmV6oMGc,7440
+konfai/evaluator.py,sha256=kETecCD80sdnLxNN2I5D9D67KZgZ03XBOnFD0BGiFik,7451
 konfai/main.py,sha256=voh5P5UUY0vjBOsd79O23cVK2LR8WH4c_8ep-kI967E,2149
-konfai/predictor.py,sha256=Xmx8TSrYGPYkUjo82n-_7g5oznVzOv26tuytpeyYdtI,20173
+konfai/predictor.py,sha256=-CtMHDaZgnCSz-eKC3MG5_y7CWQI89afWpr7i897RVI,20178
 konfai/trainer.py,sha256=x4Sni2JBOPgcSnpRwHHIQFB7cc0-cZ4L8X9pwZQt0qs,16866
 konfai/data/HDF5.py,sha256=Amexa4zMfsamo0odxHgKBwWlR7WquhGnAmFFVETcpQw,14355
 konfai/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-konfai/data/augmentation.py,sha256=UA-Kpg9luU2CJPTW2Cjqry_AYpMxAdeXKgPIX8a1oSI,31729
+konfai/data/augmentation.py,sha256=-1KYIVE_CuFwGg-AA5M9g5rDpkhwUWczfZA8JVhxNM4,31734
 konfai/data/dataset.py,sha256=azYz6yiwMHNaXlmXRY05PBHHcmrYjnpbXo0jcyachRk,23914
-konfai/data/transform.py,sha256=aiNMd_nGGwQreH6A7h1OcVJGlGHSkKb8Y0I0YoQVSuY,25150
+konfai/data/transform.py,sha256=AI2k0e_ocphxccOyaHUhKtA9-E5B5SwZ0Du-C1mfG84,25155
 konfai/metric/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-konfai/metric/measure.py,sha256=68tuBL6XteJTuQ4KgBBg3mTbNFdK9gfYHCyyqYfYW1c,21805
+konfai/metric/measure.py,sha256=VN4SF1b8WHWckAsoObWKMfTOnOGf9Zm3DKyrK-bkNwg,21812
 konfai/metric/schedulers.py,sha256=UoSr1TW_hrus3DhvOEbDefxCSUGz7lJS_8vbz0GEye8,1370
 konfai/models/classification/convNeXt.py,sha256=TucP-EsQ4wlUX2MvbGYwOwUySJlo9Ljg65n3n-yivS0,9239
 konfai/models/classification/resnet.py,sha256=4EtjXBYLOjE89ywjoPkSR1MflpeMTG2dth1jvw6-lAw,7954
@@ -24,16 +24,16 @@ konfai/models/segmentation/NestedUNet.py,sha256=GnAwQYHzivHN1qouifJyneh9nOFHSloG
 konfai/models/segmentation/UNet.py,sha256=Icd_YddkHpExRxyvhoBTsd4McVkaBOF4Y3L_NrNA6Gs,4214
 konfai/network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 konfai/network/blocks.py,sha256=EN1JN929zzV0FfecgFnVvv8u-WwENFRxloOpfCBkqeU,13529
-konfai/network/network.py,sha256=VIFgZPsUUzpY07uuni84LQ-fGfODc06TsdaWVTpmxGo,45768
+konfai/network/network.py,sha256=7JL7gtWB8vk8wHaQsritaVGDN_fjrmDNkHfIkqJtLSE,45775
 konfai/utils/ITK.py,sha256=OxTieDNNYHGkn7zxJsAG-6ecRG1VYMvn1dlBbBe1DOs,13955
 konfai/utils/Registration.py,sha256=v1srEBOcgDnHrx0YtsK6bcj0yCMH7wNeaQ3wC7gEvOw,8898
 konfai/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 konfai/utils/config.py,sha256=tzIkNUA88EXGpkH-GUFA-BehxC47wAuDbu0M0kWfUIY,9887
-konfai/utils/dataset.py,sha256=Cs736wdSg7nox_zoIoqusbomphPNo97guox81BiG8tc,35510
-konfai/utils/utils.py,sha256=i7bfAMuIjaafy8wMFFgZQWHPJDkpXN61f_mNd4F29Kw,20179
-konfai-1.0.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-konfai-1.0.3.dist-info/METADATA,sha256=0SbiKtK-ESelcVmfcENCLk5quKjbD5JiplUYEdF8p40,2035
-konfai-1.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-konfai-1.0.3.dist-info/entry_points.txt,sha256=fG82HRN5-g39ACSOCtij_I3N6EHxfYnMR0D7TI_8pW8,81
-konfai-1.0.3.dist-info/top_level.txt,sha256=xF470dkIlFoFqTZEOlRehKJr4WU_8OKGXrJqYm9vWKs,7
-konfai-1.0.3.dist-info/RECORD,,
+konfai/utils/dataset.py,sha256=DTAt8AEsAkDWM8ZtiXPUQfS5DQBqdYmXuw2sjOTIYV4,35517
+konfai/utils/utils.py,sha256=hRxqq1cOXewFG417kYQZUGzKqaCK14GNQqjFdRBIVGs,20186
+konfai-1.0.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+konfai-1.0.5.dist-info/METADATA,sha256=qwoW75e1vTp0wIcgKbZk-m9xr9bacJBlENYqwfVRDSU,2035
+konfai-1.0.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+konfai-1.0.5.dist-info/entry_points.txt,sha256=fG82HRN5-g39ACSOCtij_I3N6EHxfYnMR0D7TI_8pW8,81
+konfai-1.0.5.dist-info/top_level.txt,sha256=xF470dkIlFoFqTZEOlRehKJr4WU_8OKGXrJqYm9vWKs,7
+konfai-1.0.5.dist-info/RECORD,,