From 145e8f7404e4fa6af86609efd47fa3dd31edc8d5 Mon Sep 17 00:00:00 2001
From: dcarron <daniel.carron@idiap.ch>
Date: Wed, 26 Jun 2024 17:16:32 +0200
Subject: [PATCH] [normalizer] Do not call to super().set_normalizer() as it
was moved
---
src/mednet/libs/classification/models/alexnet.py | 8 +++++++-
src/mednet/libs/classification/models/densenet.py | 8 +++++++-
src/mednet/libs/segmentation/models/driu.py | 8 +++++++-
src/mednet/libs/segmentation/models/driu_bn.py | 8 +++++++-
src/mednet/libs/segmentation/models/driu_od.py | 8 +++++++-
src/mednet/libs/segmentation/models/driu_pix.py | 8 +++++++-
src/mednet/libs/segmentation/models/hed.py | 8 +++++++-
src/mednet/libs/segmentation/models/m2unet.py | 8 +++++++-
src/mednet/libs/segmentation/models/unet.py | 8 +++++++-
9 files changed, 63 insertions(+), 9 deletions(-)
diff --git a/src/mednet/libs/classification/models/alexnet.py b/src/mednet/libs/classification/models/alexnet.py
index 4d888881..653e1cae 100644
--- a/src/mednet/libs/classification/models/alexnet.py
+++ b/src/mednet/libs/classification/models/alexnet.py
@@ -115,7 +115,13 @@ class Alexnet(Model):
)
self.normalizer = make_imagenet_normalizer()
else:
- super().set_normalizer(dataloader)
+ from .normalizer import make_z_normalizer
+
+ logger.info(
+ f"Uninitialised {self.name} model - "
+ f"computing z-norm factors from train dataloader.",
+ )
+ self.normalizer = make_z_normalizer(dataloader)
def training_step(self, batch, _):
images = batch[0]
diff --git a/src/mednet/libs/classification/models/densenet.py b/src/mednet/libs/classification/models/densenet.py
index 82f8d99f..e89ab7ba 100644
--- a/src/mednet/libs/classification/models/densenet.py
+++ b/src/mednet/libs/classification/models/densenet.py
@@ -118,7 +118,13 @@ class Densenet(Model):
)
self.normalizer = make_imagenet_normalizer()
else:
- super().set_normalizer(dataloader)
+ from .normalizer import make_z_normalizer
+
+ logger.info(
+ f"Uninitialised {self.name} model - "
+ f"computing z-norm factors from train dataloader.",
+ )
+ self.normalizer = make_z_normalizer(dataloader)
def training_step(self, batch, _):
images = batch[0]
diff --git a/src/mednet/libs/segmentation/models/driu.py b/src/mednet/libs/segmentation/models/driu.py
index 76608301..2f0a5cd7 100644
--- a/src/mednet/libs/segmentation/models/driu.py
+++ b/src/mednet/libs/segmentation/models/driu.py
@@ -158,7 +158,13 @@ class DRIU(Model):
)
self.normalizer = make_imagenet_normalizer()
else:
- super().set_normalizer(dataloader)
+ from .normalizer import make_z_normalizer
+
+ logger.info(
+ f"Uninitialised {self.name} model - "
+ f"computing z-norm factors from train dataloader.",
+ )
+ self.normalizer = make_z_normalizer(dataloader)
def training_step(self, batch, batch_idx):
images = batch[0]["image"]
diff --git a/src/mednet/libs/segmentation/models/driu_bn.py b/src/mednet/libs/segmentation/models/driu_bn.py
index f14f911b..c80f88a0 100644
--- a/src/mednet/libs/segmentation/models/driu_bn.py
+++ b/src/mednet/libs/segmentation/models/driu_bn.py
@@ -161,7 +161,13 @@ class DRIUBN(Model):
)
self.normalizer = make_imagenet_normalizer()
else:
- super().set_normalizer(dataloader)
+ from .normalizer import make_z_normalizer
+
+ logger.info(
+ f"Uninitialised {self.name} model - "
+ f"computing z-norm factors from train dataloader.",
+ )
+ self.normalizer = make_z_normalizer(dataloader)
def training_step(self, batch, batch_idx):
images = batch[0]["image"]
diff --git a/src/mednet/libs/segmentation/models/driu_od.py b/src/mednet/libs/segmentation/models/driu_od.py
index d810c471..ad76cb0a 100644
--- a/src/mednet/libs/segmentation/models/driu_od.py
+++ b/src/mednet/libs/segmentation/models/driu_od.py
@@ -143,7 +143,13 @@ class DRIUOD(Model):
)
self.normalizer = make_imagenet_normalizer()
else:
- super().set_normalizer(dataloader)
+ from .normalizer import make_z_normalizer
+
+ logger.info(
+ f"Uninitialised {self.name} model - "
+ f"computing z-norm factors from train dataloader.",
+ )
+ self.normalizer = make_z_normalizer(dataloader)
def training_step(self, batch, batch_idx):
images = batch[0]["image"]
diff --git a/src/mednet/libs/segmentation/models/driu_pix.py b/src/mednet/libs/segmentation/models/driu_pix.py
index a85ac3ab..e65cba0d 100644
--- a/src/mednet/libs/segmentation/models/driu_pix.py
+++ b/src/mednet/libs/segmentation/models/driu_pix.py
@@ -147,7 +147,13 @@ class DRIUPix(Model):
)
self.normalizer = make_imagenet_normalizer()
else:
- super().set_normalizer(dataloader)
+ from .normalizer import make_z_normalizer
+
+ logger.info(
+ f"Uninitialised {self.name} model - "
+ f"computing z-norm factors from train dataloader.",
+ )
+ self.normalizer = make_z_normalizer(dataloader)
def training_step(self, batch, batch_idx):
images = batch[0]["image"]
diff --git a/src/mednet/libs/segmentation/models/hed.py b/src/mednet/libs/segmentation/models/hed.py
index 80e4665e..630695d8 100644
--- a/src/mednet/libs/segmentation/models/hed.py
+++ b/src/mednet/libs/segmentation/models/hed.py
@@ -162,7 +162,13 @@ class HED(Model):
)
self.normalizer = make_imagenet_normalizer()
else:
- super().set_normalizer(dataloader)
+ from .normalizer import make_z_normalizer
+
+ logger.info(
+ f"Uninitialised {self.name} model - "
+ f"computing z-norm factors from train dataloader.",
+ )
+ self.normalizer = make_z_normalizer(dataloader)
def training_step(self, batch, batch_idx):
images = batch[0]["image"]
diff --git a/src/mednet/libs/segmentation/models/m2unet.py b/src/mednet/libs/segmentation/models/m2unet.py
index ccc94c29..10560a8c 100644
--- a/src/mednet/libs/segmentation/models/m2unet.py
+++ b/src/mednet/libs/segmentation/models/m2unet.py
@@ -210,7 +210,13 @@ class M2UNET(Model):
)
self.normalizer = make_imagenet_normalizer()
else:
- super().set_normalizer(dataloader)
+ from .normalizer import make_z_normalizer
+
+ logger.info(
+ f"Uninitialised {self.name} model - "
+ f"computing z-norm factors from train dataloader.",
+ )
+ self.normalizer = make_z_normalizer(dataloader)
def training_step(self, batch, batch_idx):
images = batch[0]["image"]
diff --git a/src/mednet/libs/segmentation/models/unet.py b/src/mednet/libs/segmentation/models/unet.py
index 36136bcb..f1b6f2ff 100644
--- a/src/mednet/libs/segmentation/models/unet.py
+++ b/src/mednet/libs/segmentation/models/unet.py
@@ -151,7 +151,13 @@ class Unet(Model):
)
self.normalizer = make_imagenet_normalizer()
else:
- super().set_normalizer(dataloader)
+ from .normalizer import make_z_normalizer
+
+ logger.info(
+ f"Uninitialised {self.name} model - "
+ f"computing z-norm factors from train dataloader.",
+ )
+ self.normalizer = make_z_normalizer(dataloader)
def training_step(self, batch, batch_idx):
images = batch[0]["image"]
--
GitLab