Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
6 changes: 3 additions & 3 deletions python/paddle/fluid/contrib/slim/core/compressor.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
from .... import profiler
from .... import scope_guard
from ....data_feeder import DataFeeder
from ....log_helper import get_logger
from ..graph import *
from .config import ConfigFactory
import numpy as np
Expand All @@ -31,9 +32,8 @@

__all__ = ['Context', 'Compressor']

logging.basicConfig(format='%(asctime)s-%(levelname)s: %(message)s')
_logger = logging.getLogger(__name__)
_logger.setLevel(logging.INFO)
_logger = get_logger(
__name__, logging.INFO, fmt='%(asctime)s-%(levelname)s: %(message)s')


def cached_reader(reader, sampled_rate, cache_path, cached_id):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@

from ..core.strategy import Strategy
from ....framework import Program, Variable, program_guard
from ....log_helper import get_logger
from .... import Executor
import logging

__all__ = ['DistillationStrategy']

logging.basicConfig(format='%(asctime)s-%(levelname)s: %(message)s')
_logger = logging.getLogger(__name__)
_logger.setLevel(logging.INFO)
_logger = get_logger(
__name__, logging.INFO, fmt='%(asctime)s-%(levelname)s: %(message)s')


class DistillationStrategy(Strategy):
Expand Down
6 changes: 3 additions & 3 deletions python/paddle/fluid/contrib/slim/prune/prune_strategy.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from ..core.strategy import Strategy
from ..graph import VarWrapper, OpWrapper, GraphWrapper
from ....framework import Program, program_guard, Parameter
from ....log_helper import get_logger
from .... import layers
import prettytable as pt
import numpy as np
Expand All @@ -28,9 +29,8 @@

__all__ = ['SensitivePruneStrategy', 'UniformPruneStrategy']

logging.basicConfig(format='%(asctime)s-%(levelname)s: %(message)s')
_logger = logging.getLogger(__name__)
_logger.setLevel(logging.INFO)
_logger = get_logger(
__name__, logging.INFO, fmt='%(asctime)s-%(levelname)s: %(message)s')


class PruneStrategy(Strategy):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
from ....compiler import CompiledProgram
from ....compiler import BuildStrategy
from ....framework import IrGraph, Variable, Program
from ....log_helper import get_logger
from ..core.strategy import Strategy
from .quantization_pass import *

__all__ = ['QuantizationStrategy']

logging.basicConfig(format='%(asctime)s-%(levelname)s: %(message)s')
_logger = logging.getLogger(__name__)
_logger.setLevel(logging.INFO)
_logger = get_logger(
__name__, logging.INFO, fmt='%(asctime)s-%(levelname)s: %(message)s')


class QuantizationStrategy(Strategy):
Expand Down
6 changes: 3 additions & 3 deletions python/paddle/fluid/contrib/utils/hdfs_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
import errno

import logging
from paddle.fluid.log_helper import get_logger

__all__ = ["HDFSClient", "multi_download", "multi_upload"]

logging.basicConfig(format='%(asctime)s - %(levelname)s - %(message)s')
_logger = logging.getLogger("hdfs_utils")
_logger.setLevel(logging.INFO)
_logger = get_logger(
__name__, logging.INFO, fmt='%(asctime)s-%(levelname)s: %(message)s')


class HDFSClient(object):
Expand Down
8 changes: 5 additions & 3 deletions python/paddle/fluid/contrib/utils/lookup_table_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,17 @@
from paddle.fluid import core
from paddle.fluid import io
from paddle.fluid import Program
from paddle.fluid.log_helper import get_logger

__all__ = [
"load_persistables_for_increment", "load_persistables_for_inference",
"convert_dist_to_sparse_program"
]

logging.basicConfig(format='%(asctime)s - %(levelname)s - %(message)s')
_logger = logging.getLogger("lookup_table_utils")
_logger.setLevel(logging.INFO)
_logger = get_logger(
'lookup_table_utils',
logging.INFO,
fmt='%(asctime)s-%(levelname)s: %(message)s')

model_filename = "__model__"
lookup_table_dir = "__lookup_table__"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@

import paddle
import paddle.fluid.incubate.data_generator as data_generator
from paddle.fluid.log_helper import get_logger

logging.basicConfig()
logger = logging.getLogger("paddle")
logger.setLevel(logging.INFO)
logger = get_logger(
"paddle", logging.INFO, fmt='%(asctime)s - %(levelname)s - %(message)s')

DATA_URL = "http://paddle-ctr-data.bj.bcebos.com/avazu_ctr_data.tgz"
DATA_MD5 = "c11df99fbd14e53cd4bfa6567344b26e"
Expand Down
6 changes: 3 additions & 3 deletions python/paddle/fluid/incubate/fleet/tests/fleet_deep_ctr.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
import paddle.fluid.incubate.fleet.base.role_maker as role_maker
from paddle.fluid.incubate.fleet.parameter_server.distributed_transpiler import fleet
from paddle.fluid.transpiler.distribute_transpiler import DistributeTranspilerConfig
from paddle.fluid.log_helper import get_logger

import ctr_dataset_reader

logging.basicConfig(format='%(asctime)s - %(levelname)s - %(message)s')
logger = logging.getLogger("fluid")
logger.setLevel(logging.INFO)
logger = get_logger(
"fluid", logging.INFO, fmt='%(asctime)s - %(levelname)s - %(message)s')


def parse_args():
Expand Down
6 changes: 3 additions & 3 deletions python/paddle/fluid/io.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
from paddle.fluid.executor import Executor
from paddle.fluid.evaluator import Evaluator
from paddle.fluid.framework import Program, Parameter, default_main_program, default_startup_program, Variable, program_guard
from paddle.fluid.log_helper import get_logger
from . import reader
from .reader import *
from . import core
Expand All @@ -35,9 +36,8 @@
'load_persistables', 'save_inference_model', 'load_inference_model'
] + reader.__all__

logging.basicConfig(format='%(asctime)s-%(levelname)s: %(message)s')
_logger = logging.getLogger(__name__)
_logger.setLevel(logging.INFO)
_logger = get_logger(
__name__, logging.INFO, fmt='%(asctime)s-%(levelname)s: %(message)s')


def is_parameter(var):
Expand Down
52 changes: 52 additions & 0 deletions python/paddle/fluid/log_helper.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

from __future__ import print_function

import logging

__all__ = ['get_logger']


def get_logger(name, level, fmt=None):
"""
Get logger from logging with given name, level and format without
setting logging basicConfig. For setting basicConfig in paddle
will disable basicConfig setting after import paddle.

Args:
name (str): The logger name.
level (logging.LEVEL): The base level of the logger
fmt (str): Format of logger output

Returns:
logging.Logger: logging logger with given setttings

Examples:
.. code-block:: python

logger = log_helper.get_logger(__name__, logging.INFO,
fmt='%(asctime)s-%(levelname)s: %(message)s')
"""

logger = logging.getLogger(name)
logger.setLevel(level)
handler = logging.StreamHandler()

if fmt:
formatter = logging.Formatter(fmt=fmt)
handler.setFormatter(formatter)

logger.addHandler(handler)
return logger
4 changes: 2 additions & 2 deletions python/paddle/fluid/net_drawer.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@

import paddle.fluid.core as core
import paddle.fluid.proto.framework_pb2 as framework_pb2
from paddle.fluid.log_helper import get_logger

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

try:
from .graphviz import Graph
Expand Down
6 changes: 3 additions & 3 deletions python/paddle/fluid/tests/unittests/dist_ctr_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
import paddle
import tarfile

logging.basicConfig()
logger = logging.getLogger("paddle")
logger.setLevel(logging.INFO)
from paddle.fluid.log_helper import get_logger

logger = get_logger("paddle", logging.INFO)

DATA_URL = "http://paddle-ctr-data.bj.bcebos.com/avazu_ctr_data.tgz"
DATA_MD5 = "c11df99fbd14e53cd4bfa6567344b26e"
Expand Down