|
1 | | -# type: ignore |
2 | 1 | import gc |
3 | 2 | import logging |
4 | 3 | import os |
|
37 | 36 | NNUNET_N_SPATIAL_DIMS, |
38 | 37 | Module2LossWrapper, |
39 | 38 | NnunetConfig, |
| 39 | + NnUNetDataLoaderWrapper, |
40 | 40 | PolyLRSchedulerWrapper, |
41 | 41 | StreamToLogger, |
42 | 42 | convert_deep_supervision_dict_to_list, |
43 | 43 | convert_deep_supervision_list_to_dict, |
44 | | - nnUNetDataLoaderWrapper, |
45 | 44 | prepare_loss_arg, |
46 | 45 | use_default_signal_handlers, |
47 | 46 | ) |
@@ -238,7 +237,7 @@ def _compute_preds_and_losses( |
238 | 237 | optimizer.zero_grad() |
239 | 238 |
|
240 | 239 | # Call user defined methods to get predictions and compute loss |
241 | | - preds, features = self._predict_with_model(model, input) |
| 240 | + preds, features = self.predict_with_model(model, input) |
242 | 241 | target = self.transform_target(target) |
243 | 242 | losses = self.compute_training_loss(preds, features, target) |
244 | 243 |
|
@@ -326,10 +325,10 @@ def get_data_loaders(self, config: Config) -> tuple[DataLoader, DataLoader]: |
326 | 325 | shape = self.plans["configurations"][fullres_cfg]["median_image_size_in_voxels"] |
327 | 326 |
|
328 | 327 | # Wrap nnunet dataloaders to make them compatible with fl4health |
329 | | - train_loader = nnUNetDataLoaderWrapper( |
| 328 | + train_loader = NnUNetDataLoaderWrapper( |
330 | 329 | nnunet_augmenter=train_loader, nnunet_config=self.nnunet_config, ref_image_shape=shape |
331 | 330 | ) |
332 | | - val_loader = nnUNetDataLoaderWrapper( |
| 331 | + val_loader = NnUNetDataLoaderWrapper( |
333 | 332 | nnunet_augmenter=val_loader, nnunet_config=self.nnunet_config, ref_image_shape=shape |
334 | 333 | ) |
335 | 334 | log(INFO, f"{len(val_loader)}, {len(val_loader.dataset)}, {val_loader.nnunet_dataloader.batch_size}") |
@@ -636,7 +635,7 @@ def setup_client(self, config: Config) -> None: |
636 | 635 | super().setup_client(config) |
637 | 636 |
|
638 | 637 | @override |
639 | | - def _predict_with_model( |
| 638 | + def predict_with_model( |
640 | 639 | self, model: torch.nn.Module, input: TorchInputType |
641 | 640 | ) -> tuple[TorchPredType, dict[str, torch.Tensor]]: |
642 | 641 | """ |
@@ -918,7 +917,7 @@ def shutdown_dataloader(self, dataloader: DataLoader | None, dl_name: str | None |
918 | 917 | dl_name (str | None): A string that identifies the dataloader to shutdown. Used for logging purposes. |
919 | 918 | Defaults to None |
920 | 919 | """ |
921 | | - if dataloader is not None and isinstance(dataloader, nnUNetDataLoaderWrapper): |
| 920 | + if dataloader is not None and isinstance(dataloader, NnUNetDataLoaderWrapper): |
922 | 921 | if self.verbose: |
923 | 922 | log(INFO, f"\tShutting down nnunet dataloader: {dl_name}") |
924 | 923 | dataloader.shutdown() |
|
0 commit comments