From e5f0b7ac59fb77e2f9259aab6a88fb7d8117745e Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Wed, 26 Jun 2024 19:49:14 +0200
Subject: [PATCH] [various] Use __name__ to obtain appropriate logger
---
src/mednet/libs/classification/engine/evaluator.py | 2 +-
src/mednet/libs/classification/engine/predictor.py | 2 +-
src/mednet/libs/classification/engine/saliency/completeness.py | 2 +-
src/mednet/libs/classification/engine/saliency/generator.py | 2 +-
.../libs/classification/engine/saliency/interpretability.py | 2 +-
src/mednet/libs/classification/engine/saliency/viewer.py | 2 +-
src/mednet/libs/classification/models/alexnet.py | 2 +-
src/mednet/libs/classification/models/densenet.py | 2 +-
src/mednet/libs/classification/models/loss_weights.py | 2 +-
src/mednet/libs/classification/models/pasa.py | 2 +-
src/mednet/libs/common/data/augmentations.py | 2 +-
src/mednet/libs/common/data/datamodule.py | 2 +-
src/mednet/libs/common/data/split.py | 2 +-
src/mednet/libs/common/engine/callbacks.py | 2 +-
src/mednet/libs/common/engine/device.py | 2 +-
src/mednet/libs/common/engine/trainer.py | 2 +-
src/mednet/libs/common/models/loss_weights.py | 2 +-
src/mednet/libs/common/models/model.py | 2 +-
src/mednet/libs/common/models/normalizer.py | 2 +-
src/mednet/libs/common/scripts/utils.py | 2 +-
src/mednet/libs/common/utils/checkpointer.py | 2 +-
src/mednet/libs/common/utils/resources.py | 2 +-
src/mednet/libs/segmentation/engine/predictor.py | 2 +-
src/mednet/libs/segmentation/models/driu.py | 2 +-
src/mednet/libs/segmentation/models/driu_bn.py | 2 +-
src/mednet/libs/segmentation/models/driu_od.py | 2 +-
src/mednet/libs/segmentation/models/driu_pix.py | 2 +-
src/mednet/libs/segmentation/models/hed.py | 2 +-
src/mednet/libs/segmentation/models/m2unet.py | 2 +-
src/mednet/libs/segmentation/models/unet.py | 2 +-
30 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/mednet/libs/classification/engine/evaluator.py b/src/mednet/libs/classification/engine/evaluator.py
index 598fb3b8..acbf79b3 100644
--- a/src/mednet/libs/classification/engine/evaluator.py
+++ b/src/mednet/libs/classification/engine/evaluator.py
@@ -20,7 +20,7 @@ from matplotlib import pyplot as plt
from ..models.typing import BinaryPrediction
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
def eer_threshold(predictions: Iterable[BinaryPrediction]) -> float:
diff --git a/src/mednet/libs/classification/engine/predictor.py b/src/mednet/libs/classification/engine/predictor.py
index d0298a3e..752070f6 100644
--- a/src/mednet/libs/classification/engine/predictor.py
+++ b/src/mednet/libs/classification/engine/predictor.py
@@ -16,7 +16,7 @@ from ..models.typing import (
MultiClassPredictionSplit,
)
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
class _JSONMetadataCollector(lightning.pytorch.callbacks.BasePredictionWriter):
diff --git a/src/mednet/libs/classification/engine/saliency/completeness.py b/src/mednet/libs/classification/engine/saliency/completeness.py
index c7f3be68..2eac5429 100644
--- a/src/mednet/libs/classification/engine/saliency/completeness.py
+++ b/src/mednet/libs/classification/engine/saliency/completeness.py
@@ -21,7 +21,7 @@ from pytorch_grad_cam.utils.model_targets import ClassifierOutputTarget
from ...models.typing import SaliencyMapAlgorithm
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
class SigmoidClassifierOutputTarget(torch.nn.Module):
diff --git a/src/mednet/libs/classification/engine/saliency/generator.py b/src/mednet/libs/classification/engine/saliency/generator.py
index 2b9badf1..5fc43415 100644
--- a/src/mednet/libs/classification/engine/saliency/generator.py
+++ b/src/mednet/libs/classification/engine/saliency/generator.py
@@ -15,7 +15,7 @@ from mednet.libs.common.engine.device import DeviceManager
from ...models.typing import SaliencyMapAlgorithm
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
def _create_saliency_map_callable(
diff --git a/src/mednet/libs/classification/engine/saliency/interpretability.py b/src/mednet/libs/classification/engine/saliency/interpretability.py
index da96650e..7348361c 100644
--- a/src/mednet/libs/classification/engine/saliency/interpretability.py
+++ b/src/mednet/libs/classification/engine/saliency/interpretability.py
@@ -16,7 +16,7 @@ from tqdm import tqdm
from ...config.data.tbx11k.datamodule import BoundingBox, BoundingBoxes
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
SaliencyMap: typing.TypeAlias = (
typing.Sequence[typing.Sequence[float]] | numpy.typing.NDArray[numpy.double]
diff --git a/src/mednet/libs/classification/engine/saliency/viewer.py b/src/mednet/libs/classification/engine/saliency/viewer.py
index 063ce737..112820a0 100644
--- a/src/mednet/libs/classification/engine/saliency/viewer.py
+++ b/src/mednet/libs/classification/engine/saliency/viewer.py
@@ -17,7 +17,7 @@ from tqdm import tqdm
from ...config.data.tbx11k.datamodule import BoundingBox, BoundingBoxes
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
def _overlay_saliency_map(
diff --git a/src/mednet/libs/classification/models/alexnet.py b/src/mednet/libs/classification/models/alexnet.py
index 7e20c594..4d888881 100644
--- a/src/mednet/libs/classification/models/alexnet.py
+++ b/src/mednet/libs/classification/models/alexnet.py
@@ -13,7 +13,7 @@ import torchvision.models as models
from mednet.libs.common.data.typing import TransformSequence
from mednet.libs.common.models.model import Model
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
class Alexnet(Model):
diff --git a/src/mednet/libs/classification/models/densenet.py b/src/mednet/libs/classification/models/densenet.py
index 5f41f1ae..82f8d99f 100644
--- a/src/mednet/libs/classification/models/densenet.py
+++ b/src/mednet/libs/classification/models/densenet.py
@@ -13,7 +13,7 @@ import torchvision.models as models
from mednet.libs.common.data.typing import TransformSequence
from mednet.libs.common.models.model import Model
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
class Densenet(Model):
diff --git a/src/mednet/libs/classification/models/loss_weights.py b/src/mednet/libs/classification/models/loss_weights.py
index 5f646e32..e9de5375 100644
--- a/src/mednet/libs/classification/models/loss_weights.py
+++ b/src/mednet/libs/classification/models/loss_weights.py
@@ -8,7 +8,7 @@ import torch
import torch.utils.data
from mednet.libs.common.data.typing import DataLoader
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
def _get_label_weights(
diff --git a/src/mednet/libs/classification/models/pasa.py b/src/mednet/libs/classification/models/pasa.py
index 37415a76..0b5c24da 100644
--- a/src/mednet/libs/classification/models/pasa.py
+++ b/src/mednet/libs/classification/models/pasa.py
@@ -13,7 +13,7 @@ import torch.utils.data
from mednet.libs.common.data.typing import TransformSequence
from mednet.libs.common.models.model import Model
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
class Pasa(Model):
diff --git a/src/mednet/libs/common/data/augmentations.py b/src/mednet/libs/common/data/augmentations.py
index cd186191..fcf8887d 100644
--- a/src/mednet/libs/common/data/augmentations.py
+++ b/src/mednet/libs/common/data/augmentations.py
@@ -22,7 +22,7 @@ import numpy.typing
import torch
from scipy.ndimage import gaussian_filter, map_coordinates
-logger = logging.getLogger("mednet.libs.classification.common")
+logger = logging.getLogger(__name__)
def _elastic_deformation_on_image(
diff --git a/src/mednet/libs/common/data/datamodule.py b/src/mednet/libs/common/data/datamodule.py
index 4439b990..f0ed67b5 100644
--- a/src/mednet/libs/common/data/datamodule.py
+++ b/src/mednet/libs/common/data/datamodule.py
@@ -28,7 +28,7 @@ from .typing import (
TransformSequence,
)
-logger = logging.getLogger("mednet.libs.classification.common")
+logger = logging.getLogger(__name__)
def _sample_size_bytes(s: Sample) -> int:
diff --git a/src/mednet/libs/common/data/split.py b/src/mednet/libs/common/data/split.py
index 14d0ac08..aace283f 100644
--- a/src/mednet/libs/common/data/split.py
+++ b/src/mednet/libs/common/data/split.py
@@ -13,7 +13,7 @@ import typing
import torch
from mednet.libs.common.data.typing import DatabaseSplit, RawDataLoader
-logger = logging.getLogger("mednet.libs.classification.common")
+logger = logging.getLogger(__name__)
class JSONDatabaseSplit(DatabaseSplit):
diff --git a/src/mednet/libs/common/engine/callbacks.py b/src/mednet/libs/common/engine/callbacks.py
index 652f7fee..3d108a8d 100644
--- a/src/mednet/libs/common/engine/callbacks.py
+++ b/src/mednet/libs/common/engine/callbacks.py
@@ -13,7 +13,7 @@ import torch
from ..utils.resources import ResourceMonitor, aggregate
-logger = logging.getLogger("mednet.libs.classification.common")
+logger = logging.getLogger(__name__)
class LoggingCallback(lightning.pytorch.Callback):
diff --git a/src/mednet/libs/common/engine/device.py b/src/mednet/libs/common/engine/device.py
index efbbbd77..4375cbb3 100644
--- a/src/mednet/libs/common/engine/device.py
+++ b/src/mednet/libs/common/engine/device.py
@@ -9,7 +9,7 @@ import typing
import torch
import torch.backends
-logger = logging.getLogger("mednet.libs.classification.common")
+logger = logging.getLogger(__name__)
SupportedPytorchDevice: typing.TypeAlias = typing.Literal[
diff --git a/src/mednet/libs/common/engine/trainer.py b/src/mednet/libs/common/engine/trainer.py
index 7d0e8b38..5d3f2a0d 100644
--- a/src/mednet/libs/common/engine/trainer.py
+++ b/src/mednet/libs/common/engine/trainer.py
@@ -15,7 +15,7 @@ from ..utils.resources import ResourceMonitor
from .callbacks import LoggingCallback
from .device import DeviceManager
-logger = logging.getLogger("mednet.libs.classification.common")
+logger = logging.getLogger(__name__)
def run(
diff --git a/src/mednet/libs/common/models/loss_weights.py b/src/mednet/libs/common/models/loss_weights.py
index 596c9e7b..74f7ef38 100644
--- a/src/mednet/libs/common/models/loss_weights.py
+++ b/src/mednet/libs/common/models/loss_weights.py
@@ -9,7 +9,7 @@ from collections import Counter
import torch
import torch.utils.data
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
def compute_binary_weights(targets):
diff --git a/src/mednet/libs/common/models/model.py b/src/mednet/libs/common/models/model.py
index fb4c6e18..4dc98b1d 100644
--- a/src/mednet/libs/common/models/model.py
+++ b/src/mednet/libs/common/models/model.py
@@ -16,7 +16,7 @@ from mednet.libs.common.data.typing import TransformSequence
from .loss_weights import get_positive_weights
from .typing import Checkpoint
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
class Model(pl.LightningModule):
diff --git a/src/mednet/libs/common/models/normalizer.py b/src/mednet/libs/common/models/normalizer.py
index cc15adec..47ea5caf 100644
--- a/src/mednet/libs/common/models/normalizer.py
+++ b/src/mednet/libs/common/models/normalizer.py
@@ -11,7 +11,7 @@ import torch.utils.data
import torchvision.transforms
import tqdm
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
def make_z_normalizer(
diff --git a/src/mednet/libs/common/scripts/utils.py b/src/mednet/libs/common/scripts/utils.py
index e9e8c087..35c47787 100644
--- a/src/mednet/libs/common/scripts/utils.py
+++ b/src/mednet/libs/common/scripts/utils.py
@@ -15,7 +15,7 @@ import lightning.pytorch.callbacks
import torch.nn
from mednet.libs.common.engine.device import SupportedPytorchDevice
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
JSONable: typing.TypeAlias = (
typing.Mapping[str, "JSONable"]
diff --git a/src/mednet/libs/common/utils/checkpointer.py b/src/mednet/libs/common/utils/checkpointer.py
index a063dbe0..19450a13 100644
--- a/src/mednet/libs/common/utils/checkpointer.py
+++ b/src/mednet/libs/common/utils/checkpointer.py
@@ -7,7 +7,7 @@ import pathlib
import re
import typing
-logger = logging.getLogger("mednet.libs.classification.common")
+logger = logging.getLogger(__name__)
CHECKPOINT_ALIASES = {
diff --git a/src/mednet/libs/common/utils/resources.py b/src/mednet/libs/common/utils/resources.py
index ca99d2f7..aaa1b6f0 100644
--- a/src/mednet/libs/common/utils/resources.py
+++ b/src/mednet/libs/common/utils/resources.py
@@ -19,7 +19,7 @@ import numpy
import psutil
from mednet.libs.common.engine.device import SupportedPytorchDevice
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
_nvidia_smi = shutil.which("nvidia-smi")
"""Location of the nvidia-smi program, if one exists."""
diff --git a/src/mednet/libs/segmentation/engine/predictor.py b/src/mednet/libs/segmentation/engine/predictor.py
index 0e5c290f..ecac9359 100644
--- a/src/mednet/libs/segmentation/engine/predictor.py
+++ b/src/mednet/libs/segmentation/engine/predictor.py
@@ -13,7 +13,7 @@ import torch.utils.data
import tqdm
from mednet.libs.common.engine.device import DeviceManager
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
class _HDF5Writer(lightning.pytorch.callbacks.BasePredictionWriter):
diff --git a/src/mednet/libs/segmentation/models/driu.py b/src/mednet/libs/segmentation/models/driu.py
index 6dbdef78..eac0afc0 100644
--- a/src/mednet/libs/segmentation/models/driu.py
+++ b/src/mednet/libs/segmentation/models/driu.py
@@ -15,7 +15,7 @@ from .backbones.vgg import vgg16_for_segmentation
from .losses import SoftJaccardBCELogitsLoss
from .make_layers import UpsampleCropBlock, conv_with_kaiming_uniform
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
class ConcatFuseBlock(torch.nn.Module):
diff --git a/src/mednet/libs/segmentation/models/driu_bn.py b/src/mednet/libs/segmentation/models/driu_bn.py
index 07ddc625..7804ed06 100644
--- a/src/mednet/libs/segmentation/models/driu_bn.py
+++ b/src/mednet/libs/segmentation/models/driu_bn.py
@@ -15,7 +15,7 @@ from .backbones.vgg import vgg16_for_segmentation
from .losses import SoftJaccardBCELogitsLoss
from .make_layers import UpsampleCropBlock, conv_with_kaiming_uniform
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
class ConcatFuseBlock(torch.nn.Module):
diff --git a/src/mednet/libs/segmentation/models/driu_od.py b/src/mednet/libs/segmentation/models/driu_od.py
index 1e1802af..be7416c7 100644
--- a/src/mednet/libs/segmentation/models/driu_od.py
+++ b/src/mednet/libs/segmentation/models/driu_od.py
@@ -16,7 +16,7 @@ from .driu import ConcatFuseBlock
from .losses import SoftJaccardBCELogitsLoss
from .make_layers import UpsampleCropBlock
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
class DRIUODHead(torch.nn.Module):
diff --git a/src/mednet/libs/segmentation/models/driu_pix.py b/src/mednet/libs/segmentation/models/driu_pix.py
index 29942643..23218a57 100644
--- a/src/mednet/libs/segmentation/models/driu_pix.py
+++ b/src/mednet/libs/segmentation/models/driu_pix.py
@@ -16,7 +16,7 @@ from .driu import ConcatFuseBlock
from .losses import SoftJaccardBCELogitsLoss
from .make_layers import UpsampleCropBlock
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
class DRIUPIXHead(torch.nn.Module):
diff --git a/src/mednet/libs/segmentation/models/hed.py b/src/mednet/libs/segmentation/models/hed.py
index e3bcd094..8771f558 100644
--- a/src/mednet/libs/segmentation/models/hed.py
+++ b/src/mednet/libs/segmentation/models/hed.py
@@ -14,7 +14,7 @@ from .backbones.vgg import vgg16_for_segmentation
from .losses import MultiSoftJaccardBCELogitsLoss
from .make_layers import UpsampleCropBlock, conv_with_kaiming_uniform
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
class ConcatFuseBlock(torch.nn.Module):
diff --git a/src/mednet/libs/segmentation/models/m2unet.py b/src/mednet/libs/segmentation/models/m2unet.py
index d934881c..60f97967 100644
--- a/src/mednet/libs/segmentation/models/m2unet.py
+++ b/src/mednet/libs/segmentation/models/m2unet.py
@@ -14,7 +14,7 @@ from torchvision.models.mobilenetv2 import InvertedResidual
from .backbones.mobilenetv2 import mobilenet_v2_for_segmentation
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
class DecoderBlock(torch.nn.Module):
diff --git a/src/mednet/libs/segmentation/models/unet.py b/src/mednet/libs/segmentation/models/unet.py
index 04317572..7a3ee9bb 100644
--- a/src/mednet/libs/segmentation/models/unet.py
+++ b/src/mednet/libs/segmentation/models/unet.py
@@ -14,7 +14,7 @@ from .backbones.vgg import vgg16_for_segmentation
from .losses import SoftJaccardBCELogitsLoss
from .make_layers import UnetBlock, conv_with_kaiming_uniform
-logger = logging.getLogger("mednet")
+logger = logging.getLogger(__name__)
class UNetHead(torch.nn.Module):
--
GitLab