caps directory optional

aramis-lab · Oct 17, 2024 · c2d4a23 · c2d4a23
1 parent c5219f1
commit c2d4a23
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/clinicadl/caps_dataset/data_config.py b/clinicadl/caps_dataset/data_config.py
@@ -24,7 +24,7 @@ class DataConfig(BaseModel):  # TODO : put in data module
     that must be passed by the user.
     """
 
-    caps_directory: Path
+    caps_directory: Optional[Path] = None
     baseline: bool = False
     diagnoses: Tuple[str, ...] = ("AD", "CN")
     data_df: Optional[pd.DataFrame] = None

diff --git a/clinicadl/interpret/config.py b/clinicadl/interpret/config.py
@@ -4,7 +4,7 @@
 
 from pydantic import BaseModel, field_validator
 
-from clinicadl.caps_dataset.data_config import DataConfig as DataBaseConfig
+from clinicadl.caps_dataset.data_config import DataConfig
 from clinicadl.caps_dataset.dataloader_config import DataLoaderConfig
 from clinicadl.interpret.gradients import GradCam, Gradients, VanillaBackProp
 from clinicadl.maps_manager.config import MapsManagerConfig as MapsManagerConfigBase
@@ -30,10 +30,6 @@ def check_output_saving_tensor(self, network_task: str) -> None:
             )
 
 
-class DataConfig(DataBaseConfig):
-    caps_directory: Optional[Path] = None
-
-
 class InterpretBaseConfig(BaseModel):
     name: str
     method: InterpretationMethod = InterpretationMethod.GRADIENTS

diff --git a/clinicadl/predictor/predictor.py b/clinicadl/predictor/predictor.py
@@ -402,7 +402,6 @@ def interpret(self):
         group_df = self._config.data.create_groupe_df()
         self._check_data_group(group_df)
 
-        assert self._config.split
         for split in self.splitter.split_iterator():
             logger.info(f"Interpretation of split {split}")
             df_group, parameters_group = self.get_group_info(

diff --git a/tests/test_interpret.py b/tests/test_interpret.py
@@ -87,11 +87,11 @@ def run_interpret(cnn_input, tmp_out_dir, ref_dir):
             "name": f"test-{method}",
             "method_cls": method,
         }
-        options = merge_options_and_maps_json_options(maps_path / "maps.json", **dict_)
-        interpret_config = InterpretConfig(**options)
+        # options = merge_options_and_maps_json_options(maps_path / "maps.json", **dict_)
+        interpret_config = InterpretConfig(**dict_)
 
         interpret_manager = Predictor(interpret_config)
         interpret_manager.interpret()
         interpret_map = interpret_manager.get_interpretation(
-            "train", f"test-{interpret_config.method}"
+            "train", f"test-{interpret_config.interpret.method}"
         )