Skip to content

Do not overwrite root logger #72416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

from ...utils.log_utils import get_logger

_logger = get_logger(logging.INFO)
_logger = get_logger(logging.INFO, __name__)
from ..random import determinate_rng, is_enable_auto_rand_ctrl
from .common import (
DistributedOperatorImplContainer,
Expand Down
2 changes: 1 addition & 1 deletion python/paddle/distributed/auto_parallel/random.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from .process_mesh import retrieve_unique_id_for_process_mesh
from .static.utils import _get_idx_in_axis

_logger = get_logger(logging.INFO)
_logger = get_logger(logging.INFO, __name__)

_rng_name_to_seed = {}
_rng_name_to_states = {}
Expand Down
2 changes: 1 addition & 1 deletion python/paddle/distributed/auto_parallel/static/cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -1230,7 +1230,7 @@ def __repr__(self):
return self.__str__()


logger = get_logger(logging.INFO)
logger = get_logger(logging.INFO, __name__)


def get_default_cluster(json_config=None, auto_config=None):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def __init__(self, tensors_dict, pre_strategy, cur_strategy):
self._tensors_dict = self._check_tensor_dict(tensors_dict)
self._pre_strategy = self._check_pre_strategy(pre_strategy)
self._cur_strategy = self._check_cur_strategy(cur_strategy)
self._logger = get_logger(logging.INFO)
self._logger = get_logger(logging.INFO, __name__)

def _check_tensor_dict(self, tensors_dict):
if not tensors_dict:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def _process_path(path):

class DistributedSaver:
def __init__(self):
self._logger = get_logger(logging.INFO)
self._logger = get_logger(logging.INFO, __name__)

def save(self, path, serial_program, dist_main_program, dist_context):
def _save_state(program, path, mode="param"):
Expand Down
2 changes: 1 addition & 1 deletion python/paddle/distributed/auto_parallel/static/engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ def __init__(
)
self._strategy = strategy or Strategy()

self._logger = get_logger(logging.INFO)
self._logger = get_logger(logging.INFO, __name__)

# for compute cost
# TODO: remove _fwd_main_progs and _orig_optimizer and _pir_main_progs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def __init__(self, mode, completer, dist_context):
assert self._dist_context._is_initialized
self._pass_context = self._dist_context.pass_context
self._strategy = self._dist_context.strategy
self._logger = get_logger(logging.INFO)
self._logger = get_logger(logging.INFO, __name__)

@property
def is_train(self):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def completer(self):
return self._completer

def plan(self):
logger = get_logger(logging.INFO)
logger = get_logger(logging.INFO, __name__)
path = None
if self._dist_context._json_config:
try:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,7 @@ def __init__(self, dist_context, mode="train", level="o1"):
self._mode = mode
assert level in ["o1", "o2"]
self._level = level
self._logger = get_logger(logging.INFO)
self._logger = get_logger(logging.INFO, __name__)
self._use_dp = False

# forward sub program
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
from .group_sharded_storage import GradStorage
from .group_sharded_utils import Type, device_guard

logger_ = get_logger(logging.WARNING)
logger_ = get_logger(logging.WARNING, __name__)


def _trainable(param):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
from ..utils.log_utils import get_logger
from .pass_base import PassBase, register_pass

logger = get_logger(logging.INFO)
logger = get_logger(logging.INFO, __name__)


class RecomputeState(ProgramStats):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
)
from .pipeline_pass_base import PipelinePassBase

logger = get_logger(logging.INFO)
logger = get_logger(logging.INFO, __name__)


@register_pass("pipeline_scheduler_1F1B")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from ..pass_base import register_pass
from .pipeline_pass_base import PipelinePassBase

logger = get_logger(logging.INFO)
logger = get_logger(logging.INFO, __name__)


@register_pass("pipeline_scheduler_Eager1F1B")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
)
from .pipeline_pass_base import PipelinePassBase

logger = get_logger(logging.INFO)
logger = get_logger(logging.INFO, __name__)


@register_pass("pipeline_scheduler_FThenB")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
set_skip_gc_vars,
)

logger = get_logger(logging.INFO)
logger = get_logger(logging.INFO, __name__)


class PipelinePassBase(PassBase):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
)
from .pipeline_pass_base import PipelinePassBase

logger = get_logger(logging.INFO)
logger = get_logger(logging.INFO, __name__)


@register_pass("pipeline_scheduler_VPP")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from ..pass_base import register_pass
from .pipeline_pass_base import PipelinePassBase

logger = get_logger(logging.INFO)
logger = get_logger(logging.INFO, __name__)


class PipelineZeroBubbleBase(PipelinePassBase):
Expand Down
2 changes: 1 addition & 1 deletion python/paddle/distributed/sharding/group_sharded.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
from paddle.distributed.communication.group import Group
from paddle.nn import Layer

logger_ = get_logger(logging.WARNING)
logger_ = get_logger(logging.WARNING, __name__)


def group_sharded_parallel(
Expand Down
2 changes: 1 addition & 1 deletion python/paddle/distributed/utils/launch_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

from ..utils.log_utils import get_logger

logger = get_logger("INFO", "root")
logger = get_logger("INFO", __name__)


def get_cluster_from_args(args, selected_gpus):
Expand Down
2 changes: 1 addition & 1 deletion python/paddle/distributed/utils/log_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import logging


def get_logger(log_level, name="root"):
def get_logger(log_level, name):
logger = logging.getLogger(name)

# Avoid printing multiple logs
Expand Down
2 changes: 1 addition & 1 deletion python/paddle/distributed/utils/process_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import paddle
from paddle.distributed.utils.log_utils import get_logger

logger = get_logger("INFO", "root")
logger = get_logger("INFO", __name__)

SUCCESS_CODE = 0
FAIL_CODE = 1
Expand Down
Loading