Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean MapsManager #658

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
14ed3e7
first try to create a validator
camillebrianceau Sep 24, 2024
d831968
test to integrate validator config
camillebrianceau Sep 25, 2024
9af760f
create a tmp config to remove parameter from the maps manager
camillebrianceau Sep 25, 2024
1495680
create a tmp config to remove parameter from the maps manager
camillebrianceau Sep 25, 2024
c035d75
step 2
camillebrianceau Sep 26, 2024
0d76a8c
pass tests
camillebrianceau Sep 26, 2024
7874eb9
review
camillebrianceau Sep 26, 2024
f1ed177
review
camillebrianceau Sep 26, 2024
463e287
Merge branch 'cb_create_validator' into cb_init_maps
camillebrianceau Sep 26, 2024
4a08e25
create the get_dataloader function
camillebrianceau Sep 27, 2024
278f021
Merge branch 'refactoring' into cb_init_maps
camillebrianceau Sep 27, 2024
de0c1f4
undo changes in MapsManager to put it in another PR
camillebrianceau Sep 30, 2024
8ba862d
pep8
camillebrianceau Sep 30, 2024
8337c9a
test to remove the train multi
camillebrianceau Sep 30, 2024
72b3f0a
test validation attr
camillebrianceau Sep 30, 2024
d184a51
test validation attr
camillebrianceau Sep 30, 2024
ecbcb35
init split manager in another PR
camillebrianceau Sep 30, 2024
745fab5
maps_dir VS maps_path
camillebrianceau Sep 30, 2024
4ef55b8
multi-network
camillebrianceau Sep 30, 2024
06b8f8a
multi-network
camillebrianceau Oct 1, 2024
6533084
multi-network
camillebrianceau Oct 1, 2024
ab3769e
multi-network
camillebrianceau Oct 1, 2024
90c7080
final commit
camillebrianceau Oct 1, 2024
a401701
review
camillebrianceau Oct 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 56 additions & 3 deletions clinicadl/API_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
from pathlib import Path

from clinicadl.caps_dataset.caps_dataset_config import CapsDatasetConfig
from clinicadl.caps_dataset.data import return_dataset
from clinicadl.prepare_data.prepare_data import DeepLearningPrepareData
from clinicadl.trainer.config.classification import ClassificationConfig
from clinicadl.trainer.trainer import Trainer
Expand All @@ -12,6 +15,56 @@

DeepLearningPrepareData(image_config)

config = ClassificationConfig()
trainer = Trainer(config)
trainer.train(split_list=config.cross_validation.split, overwrite=True)
dataset = return_dataset(
input_dir,
data_df,
preprocessing_dict,
transforms_config,
label,
label_code,
cnn_index,
label_presence,
multi_cohort,
)

split_config = SplitConfig()
splitter = Splitter(split_config)

validator_config = ValidatorConfig()
validator = Validator(validator_config)

train_config = ClassificationConfig()
trainer = Trainer(train_config, validator)

for split in splitter.split_iterator():
for network in range(
first_network, self.maps_manager.num_networks
): # for multi_network
###### actual _train_single method of the Trainer ############
train_loader = trainer.get_dataloader(dataset, split, network, "train", config)
valid_loader = validator.get_dataloader(
dataset, split, network, "valid", config
) # ?? validatior, trainer ?

trainer._train(
train_loader,
valid_loader,
split=split,
network=network,
resume=resume, # in a config class
callbacks=[CodeCarbonTracker], # in a config class ?
)

validator._ensemble_prediction(
self.maps_manager,
"train",
split,
self.config.validation.selection_metrics,
)
validator._ensemble_prediction(
self.maps_manager,
"validation",
split,
self.config.validation.selection_metrics,
)
###### end ############
Loading
Loading