Merge pull request #13 from sophieloiz/sl_dart_eds

Debug task utils with ssda parameters
aramis-lab · Oct 5, 2023 · c9abd6d · c9abd6d
2 parents 71a368c + 7485013
commit c9abd6d
Showing 1 changed file with 26 additions and 21 deletions.
diff --git a/clinicadl/train/tasks/task_utils.py b/clinicadl/train/tasks/task_utils.py
@@ -84,11 +84,13 @@ def task_launcher(network_task: str, task_options_list: List[str], **kwargs):
             / "tensor_extraction"
             / kwargs["preprocessing_json"]
         )
-        preprocessing_json_target = (
-            Path(kwargs["caps_target"])
-            / "tensor_extraction"
-            / kwargs["preprocessing_dict_target"]
-        )
+
+        if train_dict["ssda_network"]:
+            preprocessing_json_target = (
+                Path(kwargs["caps_target"])
+                / "tensor_extraction"
+                / kwargs["preprocessing_dict_target"]
+            )
     else:
         caps_dict = CapsDataset.create_caps_dict(
             train_dict["caps_directory"], train_dict["multi_cohort"]
@@ -109,29 +111,32 @@ def task_launcher(network_task: str, task_options_list: List[str], **kwargs):
                 f"in {caps_dict}."
             )
         # To CHECK AND CHANGE
-        caps_target = Path(kwargs["caps_target"])
-        preprocessing_json_target = (
-            caps_target / "tensor_extraction" / kwargs["preprocessing_dict_target"]
-        )
-
-        if preprocessing_json_target.is_file():
-            logger.info(
-                f"Preprocessing JSON {preprocessing_json_target} found in CAPS {caps_target}."
-            )
-            json_found = True
-        if not json_found:
-            raise ValueError(
-                f"Preprocessing JSON {kwargs['preprocessing_json_target']} was not found for any CAPS "
-                f"in {caps_target}."
+        if train_dict["ssda_network"]:
+            caps_target = Path(kwargs["caps_target"])
+            preprocessing_json_target = (
+                caps_target / "tensor_extraction" / kwargs["preprocessing_dict_target"]
             )
 
+            if preprocessing_json_target.is_file():
+                logger.info(
+                    f"Preprocessing JSON {preprocessing_json_target} found in CAPS {caps_target}."
+                )
+                json_found = True
+            if not json_found:
+                raise ValueError(
+                    f"Preprocessing JSON {kwargs['preprocessing_json_target']} was not found for any CAPS "
+                    f"in {caps_target}."
+                )
+
     # Mode and preprocessing
     preprocessing_dict = read_preprocessing(preprocessing_json)
-    preprocessing_dict_target = read_preprocessing(preprocessing_json_target)
     train_dict["preprocessing_dict"] = preprocessing_dict
-    train_dict["preprocessing_dict_target"] = preprocessing_dict_target
     train_dict["mode"] = preprocessing_dict["mode"]
 
+    if train_dict["ssda_network"]:
+        preprocessing_dict_target = read_preprocessing(preprocessing_json_target)
+        train_dict["preprocessing_dict_target"] = preprocessing_dict_target
+
     # Add default values if missing
     if (
         preprocessing_dict["mode"] == "roi"