Fix network loading (#1533)

* Add warning if the imported network does not have the right keys Signed-off-by: Matthias Hadlich <[email protected]> * Update warning Signed-off-by: Matthias Hadlich <[email protected]> * Set load_strict to false for deepedit Signed-off-by: Matthias Hadlich <[email protected]> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Set load_strict=False for all existing models Signed-off-by: Matthias Hadlich <[email protected]> * Fix double load_strict=False Signed-off-by: Matthias Hadlich <[email protected]> --------- Signed-off-by: Matthias Hadlich <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: tangy5 <[email protected]> Co-authored-by: SACHIDANAND ALLE <[email protected]>
Project-MONAI · Aug 31, 2023 · c90f42c · c90f42c
1 parent 7208641
commit c90f42c
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 3 deletions.
diff --git a/monailabel/tasks/infer/bundle.py b/monailabel/tasks/infer/bundle.py
@@ -87,6 +87,7 @@ def __init__(
         extend_load_image: bool = True,
         add_post_restore: bool = True,
         dropout: float = 0.0,
+        load_strict=False,
         **kwargs,
     ):
         self.valid: bool = False
@@ -149,6 +150,7 @@ def __init__(
             dimension=dimension,
             description=description,
             preload=strtobool(conf.get("preload", "false")),
+            load_strict=load_strict,
             **kwargs,
         )
 

diff --git a/sample-apps/endoscopy/lib/infers/deepedit.py b/sample-apps/endoscopy/lib/infers/deepedit.py
@@ -55,6 +55,7 @@ def __init__(
             labels=labels,
             dimension=dimension,
             description=description,
+            load_strict=False,
             **kwargs,
         )
 

diff --git a/sample-apps/endoscopy/lib/infers/inbody.py b/sample-apps/endoscopy/lib/infers/inbody.py
@@ -24,7 +24,7 @@ class InBody(BundleInferTask):
     """
 
     def __init__(self, path: str, conf: Dict[str, str], **kwargs):
-        super().__init__(path, conf, type=InferType.CLASSIFICATION, add_post_restore=False, **kwargs)
+        super().__init__(path, conf, type=InferType.CLASSIFICATION, add_post_restore=False, load_strict=False, **kwargs)
 
         # Override Labels
         self.labels = {"InBody": 0, "OutBody": 1}

diff --git a/sample-apps/endoscopy/lib/infers/tooltracking.py b/sample-apps/endoscopy/lib/infers/tooltracking.py
@@ -28,7 +28,7 @@ class ToolTracking(BundleInferTask):
     """
 
     def __init__(self, path: str, conf: Dict[str, str], **kwargs):
-        super().__init__(path, conf, type=InferType.SEGMENTATION, **kwargs)
+        super().__init__(path, conf, type=InferType.SEGMENTATION, load_strict=False, **kwargs)
 
         # Override Labels
         self.labels = {"Tool": 1}

diff --git a/sample-apps/pathology/lib/infers/classification_nuclei.py b/sample-apps/pathology/lib/infers/classification_nuclei.py
@@ -24,7 +24,7 @@ class ClassificationNuclei(BundleInferTask):
     """
 
     def __init__(self, path: str, conf: Dict[str, str], **kwargs):
-        super().__init__(path, conf, type=InferType.CLASSIFICATION, add_post_restore=False, **kwargs)
+        super().__init__(path, conf, type=InferType.CLASSIFICATION, add_post_restore=False, load_strict=False, **kwargs)
 
         # Override Labels
         self.labels = {

diff --git a/sample-apps/pathology/lib/infers/nuclick.py b/sample-apps/pathology/lib/infers/nuclick.py
@@ -38,6 +38,7 @@ def __init__(self, path: str, conf: Dict[str, str], **kwargs):
             conf,
             type=InferType.ANNOTATION,
             add_post_restore=False,
+            load_strict=False,
             **kwargs,
             pre_filter=[LoadImaged, SqueezeDimd],
             post_filter=[KeepLargestConnectedComponentd, SaveImaged],

diff --git a/sample-apps/pathology/lib/infers/segmentation_nuclei.py b/sample-apps/pathology/lib/infers/segmentation_nuclei.py
@@ -48,6 +48,7 @@ def __init__(
             labels=labels,
             dimension=dimension,
             description=description,
+            load_strict=False,
             **kwargs,
         )
 

diff --git a/sample-apps/radiology/lib/infers/deepedit.py b/sample-apps/radiology/lib/infers/deepedit.py
@@ -65,6 +65,7 @@ def __init__(
             input_key="image",
             output_label_key="pred",
             output_json_key="result",
+            load_strict=False,
             **kwargs,
         )
 

diff --git a/sample-apps/radiology/lib/infers/deepgrow.py b/sample-apps/radiology/lib/infers/deepgrow.py
@@ -63,6 +63,7 @@ def __init__(
             labels=labels,
             dimension=dimension,
             description=description,
+            load_strict=False,
             **kwargs,
         )
 

diff --git a/sample-apps/radiology/lib/infers/deepgrow_pipeline.py b/sample-apps/radiology/lib/infers/deepgrow_pipeline.py
@@ -68,6 +68,7 @@ def __init__(
             dimension=dimension,
             description=description,
             config={"cache_transforms": True, "cache_transforms_in_memory": True, "cache_transforms_ttl": 300},
+            load_strict=False,
         )
         self.model_3d = model_3d
         self.spatial_size = spatial_size

diff --git a/sample-apps/radiology/lib/infers/localization_spine.py b/sample-apps/radiology/lib/infers/localization_spine.py
@@ -54,6 +54,7 @@ def __init__(
             labels=labels,
             dimension=dimension,
             description=description,
+            load_strict=False,
             **kwargs,
         )
         self.target_spacing = target_spacing

diff --git a/sample-apps/radiology/lib/infers/localization_vertebra.py b/sample-apps/radiology/lib/infers/localization_vertebra.py
@@ -56,6 +56,7 @@ def __init__(
             labels=labels,
             dimension=dimension,
             description=description,
+            load_strict=False,
             **kwargs,
         )
         self.target_spacing = target_spacing

diff --git a/sample-apps/radiology/lib/infers/segmentation.py b/sample-apps/radiology/lib/infers/segmentation.py
@@ -54,6 +54,7 @@ def __init__(
             labels=labels,
             dimension=dimension,
             description=description,
+            load_strict=False,
             **kwargs,
         )
         self.target_spacing = target_spacing

diff --git a/sample-apps/radiology/lib/infers/segmentation_spleen.py b/sample-apps/radiology/lib/infers/segmentation_spleen.py
@@ -53,6 +53,7 @@ def __init__(
             labels=labels,
             dimension=dimension,
             description=description,
+            load_strict=False,
             **kwargs,
         )
         self.target_spacing = target_spacing

diff --git a/sample-apps/radiology/lib/infers/segmentation_vertebra.py b/sample-apps/radiology/lib/infers/segmentation_vertebra.py
@@ -63,6 +63,7 @@ def __init__(
             labels=labels,
             dimension=dimension,
             description=description,
+            load_strict=False,
             **kwargs,
         )
         self.target_spacing = target_spacing

diff --git a/sample-apps/radiology/lib/infers/vertebra_pipeline.py b/sample-apps/radiology/lib/infers/vertebra_pipeline.py
@@ -47,6 +47,7 @@ def __init__(
             labels=task_seg_vertebra.labels,
             dimension=task_seg_vertebra.dimension,
             description=description,
+            load_strict=False,
             **kwargs,
         )