From fee9392a6047bbe4766a34e4a361c170fdcf7035 Mon Sep 17 00:00:00 2001
From: Yoann Schneider <yschneider@teklia.com>
Date: Tue, 29 Aug 2023 10:46:11 +0200
Subject: [PATCH] Define dedicated logger for each module
---
dan/__init__.py | 1 -
dan/datasets/analyze/statistics.py | 3 ++-
dan/datasets/extract/extract.py | 3 ++-
dan/ocr/predict/attention.py | 3 ++-
dan/ocr/predict/prediction.py | 4 +++-
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/dan/__init__.py b/dan/__init__.py
index b74e8889..def77203 100644
--- a/dan/__init__.py
+++ b/dan/__init__.py
@@ -5,4 +5,3 @@ logging.basicConfig(
level=logging.INFO,
format="%(asctime)s %(levelname)s/%(name)s: %(message)s",
)
-logger = logging.getLogger(__name__)
diff --git a/dan/datasets/analyze/statistics.py b/dan/datasets/analyze/statistics.py
index c5f62664..efdc0ef6 100644
--- a/dan/datasets/analyze/statistics.py
+++ b/dan/datasets/analyze/statistics.py
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
+import logging
from collections import Counter, defaultdict
from pathlib import Path
from typing import Dict, List, Optional
@@ -8,7 +9,7 @@ import numpy as np
from mdutils.mdutils import MdUtils
from prettytable import MARKDOWN, PrettyTable
-from dan import logger
+logger = logging.getLogger(__name__)
METRIC_COLUMN = "Metric"
diff --git a/dan/datasets/extract/extract.py b/dan/datasets/extract/extract.py
index c00bd696..724b386e 100644
--- a/dan/datasets/extract/extract.py
+++ b/dan/datasets/extract/extract.py
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
import json
+import logging
import pickle
import random
from collections import defaultdict
@@ -12,7 +13,6 @@ import numpy as np
from tqdm import tqdm
from arkindex_export import open_database
-from dan import logger
from dan.datasets.extract.db import (
Element,
get_elements,
@@ -37,6 +37,7 @@ IMAGES_DIR = "images" # Subpath to the images directory.
SPLIT_NAMES = ["train", "val", "test"]
IIIF_URL_SUFFIX = "/full/full/0/default.jpg"
+logger = logging.getLogger(__name__)
class ArkindexExtractor:
diff --git a/dan/ocr/predict/attention.py b/dan/ocr/predict/attention.py
index 20b1adff..f5d84a0b 100644
--- a/dan/ocr/predict/attention.py
+++ b/dan/ocr/predict/attention.py
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
+import logging
import re
from typing import List, Tuple
@@ -8,7 +9,7 @@ import torch
from PIL import Image
from torchvision.transforms.functional import to_pil_image
-from dan import logger
+logger = logging.getLogger(__name__)
def parse_delimiters(delimiters: List[str]) -> re.Pattern:
diff --git a/dan/ocr/predict/prediction.py b/dan/ocr/predict/prediction.py
index cdca2a90..84f94a88 100644
--- a/dan/ocr/predict/prediction.py
+++ b/dan/ocr/predict/prediction.py
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
import json
+import logging
import pickle
import re
from itertools import pairwise
@@ -11,7 +12,6 @@ import numpy as np
import torch
import yaml
-from dan import logger
from dan.ocr.decoder import GlobalHTADecoder
from dan.ocr.encoder import FCN_Encoder
from dan.ocr.predict.attention import (
@@ -29,6 +29,8 @@ from dan.utils import (
read_image,
)
+logger = logging.getLogger(__name__)
+
class DAN:
"""
--
GitLab