Skip to content

Commit c74b8e6

Browse files
committed
change default logger to dedicated one
Fix test Fix format
1 parent 774d9be commit c74b8e6

File tree

19 files changed

+28
-24
lines changed

19 files changed

+28
-24
lines changed

pl_examples/basic_examples/lightning_module_template.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"""
22
Example template for defining a system
33
"""
4-
import logging as log
54
import os
65
from argparse import ArgumentParser
76
from collections import OrderedDict
@@ -14,6 +13,7 @@
1413
from torch.utils.data import DataLoader
1514
from torchvision.datasets import MNIST
1615

16+
from pytorch_lightning import _logger as log
1717
from pytorch_lightning.core import LightningModule
1818

1919

pytorch_lightning/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
# We are not importing the rest of the scikit during the build
2525
# process, as it may not be compiled yet
2626
else:
27+
import logging
28+
_logger = logging.getLogger("lightning")
29+
2730
from .core import LightningModule
2831
from .trainer import Trainer
2932
from .callbacks import Callback

pytorch_lightning/callbacks/early_stopping.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
66
"""
77

8-
import logging as log
98
import warnings
109

1110
import numpy as np
1211

1312
from .base import Callback
13+
from pytorch_lightning import _logger as log
1414

1515

1616
class EarlyStopping(Callback):

pytorch_lightning/callbacks/model_checkpoint.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
Automatically save model checkpoints during training.
66
"""
77

8-
import logging as log
98
import os
109
import shutil
1110
import warnings
@@ -14,6 +13,7 @@
1413
import numpy as np
1514

1615
from pytorch_lightning.callbacks.base import Callback
16+
from pytorch_lightning import _logger as log
1717

1818

1919
class ModelCheckpoint(Callback):

pytorch_lightning/core/lightning.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import collections
22
import inspect
3-
import logging as log
43
import os
54
import warnings
65
from abc import ABC, abstractmethod
@@ -15,6 +14,7 @@
1514
from torch.optim.optimizer import Optimizer
1615
from torch.utils.data import DataLoader
1716

17+
from pytorch_lightning import _logger as log
1818
from pytorch_lightning.core.grads import GradInformation
1919
from pytorch_lightning.core.hooks import ModelHooks
2020
from pytorch_lightning.core.memory import ModelSummary

pytorch_lightning/core/memory.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"""
44

55
import gc
6-
import logging as log
76
import os
87
import subprocess
98
from subprocess import PIPE
@@ -15,6 +14,8 @@
1514

1615
import pytorch_lightning as pl
1716

17+
from pytorch_lightning import _logger as log
18+
1819

1920
class ModelSummary(object):
2021

pytorch_lightning/core/saving.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import csv
2-
import logging as log
32
import os
43
from argparse import Namespace
54
from typing import Union, Dict, Any
65

6+
from pytorch_lightning import _logger as log
7+
78

89
class ModelIO(object):
910

pytorch_lightning/loggers/comet.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
-------------
77
"""
88

9-
import logging as log
109
from argparse import Namespace
1110
from typing import Optional, Dict, Union, Any
1211

@@ -27,8 +26,9 @@
2726
import torch
2827
from torch import is_tensor
2928

29+
from pytorch_lightning import _logger as log
30+
from pytorch_lightning.loggers.base import LightningLoggerBase, rank_zero_only
3031
from pytorch_lightning.utilities.debugging import MisconfigurationException
31-
from .base import LightningLoggerBase, rank_zero_only
3232

3333

3434
class CometLogger(LightningLoggerBase):

pytorch_lightning/loggers/mlflow.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ def any_lightning_module_function_or_hook(...):
2323
self.logger.experiment.whatever_ml_flow_supports(...)
2424
2525
"""
26-
import logging as log
2726
from argparse import Namespace
2827
from time import time
2928
from typing import Optional, Dict, Any, Union
@@ -34,7 +33,8 @@ def any_lightning_module_function_or_hook(...):
3433
raise ImportError('You want to use `mlflow` logger which is not installed yet,'
3534
' install it with `pip install mlflow`.')
3635

37-
from .base import LightningLoggerBase, rank_zero_only
36+
from pytorch_lightning import _logger as log
37+
from pytorch_lightning.loggers.base import LightningLoggerBase, rank_zero_only
3838

3939

4040
class MLFlowLogger(LightningLoggerBase):

pytorch_lightning/loggers/neptune.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
NeptuneLogger
77
--------------
88
"""
9-
import logging as log
109
from argparse import Namespace
1110
from typing import Optional, List, Dict, Any, Union, Iterable
1211

@@ -20,6 +19,7 @@
2019
import torch
2120
from torch import is_tensor
2221

22+
from pytorch_lightning import _logger as log
2323
from pytorch_lightning.loggers.base import LightningLoggerBase, rank_zero_only
2424

2525

0 commit comments

Comments
 (0)