From c10d7b8cb7f6b367955ddde3480a347562249518 Mon Sep 17 00:00:00 2001 From: Shruthi42 <13177030+Shruthi42@users.noreply.github.com> Date: Thu, 2 Sep 2021 12:36:00 +0100 Subject: [PATCH 1/2] Use SSLEncoder in Covid model --- InnerEye/ML/configs/classification/CovidModel.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/InnerEye/ML/configs/classification/CovidModel.py b/InnerEye/ML/configs/classification/CovidModel.py index ef64ad634..5403afa44 100644 --- a/InnerEye/ML/configs/classification/CovidModel.py +++ b/InnerEye/ML/configs/classification/CovidModel.py @@ -19,10 +19,10 @@ from InnerEye.Common.common_util import ModelProcessing, get_best_epoch_results_path from InnerEye.Common.metrics_constants import LoggingColumns +from InnerEye.ML.SSL.encoders import SSLEncoder from InnerEye.ML.SSL.lightning_containers.ssl_container import EncoderName - from InnerEye.ML.SSL.lightning_modules.ssl_classifier_module import SSLClassifier -from InnerEye.ML.SSL.utils import create_ssl_encoder, create_ssl_image_classifier, load_yaml_augmentation_config +from InnerEye.ML.SSL.utils import create_ssl_image_classifier, load_yaml_augmentation_config from InnerEye.ML.augmentations.transform_pipeline import create_cxr_transforms_from_config from InnerEye.ML.common import ModelExecutionMode @@ -158,7 +158,7 @@ def create_model(self) -> LightningModule: freeze_encoder=self.freeze_encoder) else: - encoder = create_ssl_encoder(encoder_name=EncoderName.densenet121.value) + encoder = SSLEncoder(encoder_name=EncoderName.densenet121.value) model = SSLClassifier(num_classes=self.num_classes, encoder=encoder, freeze_encoder=self.freeze_encoder, From a3da0393d9285f6001bac1f4634fdb4c7b599bde Mon Sep 17 00:00:00 2001 From: Shruthi42 <13177030+Shruthi42@users.noreply.github.com> Date: Thu, 2 Sep 2021 13:25:56 +0100 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecbb44671..097e7de53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -64,6 +64,8 @@ in inference-only runs when using lightning containers. - ([#553](https://github.com/microsoft/InnerEye-DeepLearning/pull/553)) Fix incomplete test data module setup in Lightning inference. - ([#557](https://github.com/microsoft/InnerEye-DeepLearning/pull/557)) Fix issue where learning rate was not set correctly in the SimCLR module +- ([#558](https://github.com/microsoft/InnerEye-DeepLearning/pull/558)) Fix issue with the CovidModel config where model + weights from a finetuning run were incompatible with the model architecture created for non-finetuning runs. ### Removed