diff --git a/src/transformers/__init__.py b/src/transformers/__init__.py index 5c001403b2..1676ce5f66 100755 --- a/src/transformers/__init__.py +++ b/src/transformers/__init__.py @@ -17,8 +17,6 @@ else: absl.logging.set_stderrthreshold("info") absl.logging._warn_preinit_stderr = False -import logging - # Configurations from .configuration_albert import ALBERT_PRETRAINED_CONFIG_ARCHIVE_MAP, AlbertConfig from .configuration_auto import ALL_PRETRAINED_CONFIG_ARCHIVE_MAP, CONFIG_MAPPING, AutoConfig @@ -184,9 +182,10 @@ from .tokenization_xlnet import SPIECE_UNDERLINE, XLNetTokenizer from .trainer_utils import EvalPrediction, set_seed from .training_args import TrainingArguments from .training_args_tf import TFTrainingArguments +from .utils import logging -logger = logging.getLogger(__name__) # pylint: disable=invalid-name +logger = logging.get_logger(__name__) # pylint: disable=invalid-name if is_sklearn_available(): diff --git a/src/transformers/activations.py b/src/transformers/activations.py index 8a1206ee28..a50f7defe5 100644 --- a/src/transformers/activations.py +++ b/src/transformers/activations.py @@ -1,11 +1,12 @@ -import logging import math import torch import torch.nn.functional as F +from .utils import logging -logger = logging.getLogger(__name__) + +logger = logging.get_logger(__name__) def swish(x): diff --git a/src/transformers/benchmark/benchmark.py b/src/transformers/benchmark/benchmark.py index ba0222cb6f..92b39f436e 100644 --- a/src/transformers/benchmark/benchmark.py +++ b/src/transformers/benchmark/benchmark.py @@ -18,13 +18,13 @@ """ -import logging import timeit from typing import Callable, Optional from ..configuration_utils import PretrainedConfig from ..file_utils import is_py3nvml_available, is_torch_available from ..modeling_auto import MODEL_MAPPING, MODEL_WITH_LM_HEAD_MAPPING +from ..utils import logging from .benchmark_utils import ( Benchmark, Memory, @@ -45,7 +45,7 @@ if is_py3nvml_available(): import py3nvml.py3nvml as nvml -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) class PyTorchBenchmark(Benchmark): diff --git a/src/transformers/benchmark/benchmark_args.py b/src/transformers/benchmark/benchmark_args.py index 0ecac83adf..aecefd8ba1 100644 --- a/src/transformers/benchmark/benchmark_args.py +++ b/src/transformers/benchmark/benchmark_args.py @@ -14,11 +14,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import logging from dataclasses import dataclass, field from typing import Tuple from ..file_utils import cached_property, is_torch_available, is_torch_tpu_available, torch_required +from ..utils import logging from .benchmark_args_utils import BenchmarkArguments @@ -29,7 +29,7 @@ if is_torch_tpu_available(): import torch_xla.core.xla_model as xm -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) @dataclass diff --git a/src/transformers/benchmark/benchmark_args_tf.py b/src/transformers/benchmark/benchmark_args_tf.py index 0076ffd933..0adbe6e4c6 100644 --- a/src/transformers/benchmark/benchmark_args_tf.py +++ b/src/transformers/benchmark/benchmark_args_tf.py @@ -14,11 +14,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import logging from dataclasses import dataclass, field from typing import Tuple from ..file_utils import cached_property, is_tf_available, tf_required +from ..utils import logging from .benchmark_args_utils import BenchmarkArguments @@ -26,7 +26,7 @@ if is_tf_available(): import tensorflow as tf -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) @dataclass diff --git a/src/transformers/benchmark/benchmark_args_utils.py b/src/transformers/benchmark/benchmark_args_utils.py index 4904225805..afabee2794 100644 --- a/src/transformers/benchmark/benchmark_args_utils.py +++ b/src/transformers/benchmark/benchmark_args_utils.py @@ -16,13 +16,14 @@ import dataclasses import json -import logging from dataclasses import dataclass, field from time import time from typing import List +from ..utils import logging -logger = logging.getLogger(__name__) + +logger = logging.get_logger(__name__) def list_field(default=None, metadata=None): diff --git a/src/transformers/benchmark/benchmark_tf.py b/src/transformers/benchmark/benchmark_tf.py index bb21be3333..be74df675f 100644 --- a/src/transformers/benchmark/benchmark_tf.py +++ b/src/transformers/benchmark/benchmark_tf.py @@ -18,7 +18,6 @@ """ -import logging import random import timeit from functools import wraps @@ -27,6 +26,7 @@ from typing import Callable, Optional from ..configuration_utils import PretrainedConfig from ..file_utils import is_py3nvml_available, is_tf_available from ..modeling_tf_auto import TF_MODEL_MAPPING, TF_MODEL_WITH_LM_HEAD_MAPPING +from ..utils import logging from .benchmark_utils import ( Benchmark, Memory, @@ -46,7 +46,7 @@ if is_tf_available(): if is_py3nvml_available(): import py3nvml.py3nvml as nvml -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) def run_with_tf_optimizations(do_eager_mode: bool, use_xla: bool): diff --git a/src/transformers/benchmark/benchmark_utils.py b/src/transformers/benchmark/benchmark_utils.py index 9b64dd5308..d7194fd62b 100644 --- a/src/transformers/benchmark/benchmark_utils.py +++ b/src/transformers/benchmark/benchmark_utils.py @@ -7,7 +7,6 @@ Copyright by the AllenNLP authors. import copy import csv import linecache -import logging import os import platform import sys @@ -22,6 +21,7 @@ from transformers import AutoConfig, PretrainedConfig from transformers import __version__ as version from ..file_utils import is_psutil_available, is_py3nvml_available, is_tf_available, is_torch_available +from ..utils import logging from .benchmark_args_utils import BenchmarkArguments @@ -43,7 +43,7 @@ else: from signal import SIGKILL -logger = logging.getLogger(__name__) # pylint: disable=invalid-name +logger = logging.get_logger(__name__) # pylint: disable=invalid-name _is_memory_tracing_enabled = False @@ -94,7 +94,7 @@ def separate_process_wrapper_fn(func: Callable[[], None], do_multi_processing: b return result if do_multi_processing: - logging.info("fFunction {func} is executed in its own process...") + logger.info(f"Function {func} is executed in its own process...") return multi_process_func else: return func diff --git a/src/transformers/commands/convert.py b/src/transformers/commands/convert.py index 96464e3f91..8c3f952f4a 100644 --- a/src/transformers/commands/convert.py +++ b/src/transformers/commands/convert.py @@ -1,8 +1,9 @@ from argparse import ArgumentParser, Namespace -from logging import getLogger from transformers.commands import BaseTransformersCLICommand +from ..utils import logging + def convert_command_factory(args: Namespace): """ @@ -52,7 +53,7 @@ class ConvertCommand(BaseTransformersCLICommand): finetuning_task_name: str, *args ): - self._logger = getLogger("transformers-cli/converting") + self._logger = logging.get_logger("transformers-cli/converting") self._logger.info("Loading model {}".format(model_type)) self._model_type = model_type diff --git a/src/transformers/commands/run.py b/src/transformers/commands/run.py index fdc88c55e4..ba6c6de7ce 100644 --- a/src/transformers/commands/run.py +++ b/src/transformers/commands/run.py @@ -1,11 +1,12 @@ -import logging from argparse import ArgumentParser from transformers.commands import BaseTransformersCLICommand from transformers.pipelines import SUPPORTED_TASKS, Pipeline, PipelineDataFormat, pipeline +from ..utils import logging -logger = logging.getLogger(__name__) # pylint: disable=invalid-name + +logger = logging.get_logger(__name__) # pylint: disable=invalid-name def try_infer_format_from_ext(path: str): diff --git a/src/transformers/commands/serving.py b/src/transformers/commands/serving.py index 7cea46ab28..f078f6a8d0 100644 --- a/src/transformers/commands/serving.py +++ b/src/transformers/commands/serving.py @@ -1,4 +1,3 @@ -import logging from argparse import ArgumentParser, Namespace from typing import Any, List, Optional @@ -6,6 +5,8 @@ from transformers import Pipeline from transformers.commands import BaseTransformersCLICommand from transformers.pipelines import SUPPORTED_TASKS, pipeline +from ..utils import logging + try: from fastapi import Body, FastAPI, HTTPException diff --git a/src/transformers/commands/train.py b/src/transformers/commands/train.py index 36d8831806..92299b4d8d 100644 --- a/src/transformers/commands/train.py +++ b/src/transformers/commands/train.py @@ -1,11 +1,12 @@ import os from argparse import ArgumentParser, Namespace -from logging import getLogger from transformers import SingleSentenceClassificationProcessor as Processor from transformers import TextClassificationPipeline, is_tf_available, is_torch_available from transformers.commands import BaseTransformersCLICommand +from ..utils import logging + if not is_tf_available() and not is_torch_available(): raise RuntimeError("At least one of PyTorch or TensorFlow 2.0+ should be installed to use CLI training") @@ -76,7 +77,7 @@ class TrainCommand(BaseTransformersCLICommand): train_parser.set_defaults(func=train_command_factory) def __init__(self, args: Namespace): - self.logger = getLogger("transformers-cli/training") + self.logger = logging.get_logger("transformers-cli/training") self.framework = "tf" if is_tf_available() else "torch" diff --git a/src/transformers/configuration_auto.py b/src/transformers/configuration_auto.py index 62090e931a..96916488e0 100644 --- a/src/transformers/configuration_auto.py +++ b/src/transformers/configuration_auto.py @@ -15,7 +15,6 @@ """ Auto Config class. """ -import logging from collections import OrderedDict from .configuration_albert import ALBERT_PRETRAINED_CONFIG_ARCHIVE_MAP, AlbertConfig @@ -45,9 +44,6 @@ from .configuration_xlm_roberta import XLM_ROBERTA_PRETRAINED_CONFIG_ARCHIVE_MAP from .configuration_xlnet import XLNET_PRETRAINED_CONFIG_ARCHIVE_MAP, XLNetConfig -logger = logging.getLogger(__name__) - - ALL_PRETRAINED_CONFIG_ARCHIVE_MAP = dict( (key, value) for pretrained_map in [ diff --git a/src/transformers/configuration_bart.py b/src/transformers/configuration_bart.py index 4840998295..999dd1c60e 100644 --- a/src/transformers/configuration_bart.py +++ b/src/transformers/configuration_bart.py @@ -14,14 +14,12 @@ # limitations under the License. """ BART configuration """ - -import logging - from .configuration_utils import PretrainedConfig from .file_utils import add_start_docstrings_to_callable +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) BART_PRETRAINED_CONFIG_ARCHIVE_MAP = { "facebook/bart-base": "https://s3.amazonaws.com/models.huggingface.co/bert/facebook/bart-base/config.json", diff --git a/src/transformers/configuration_bert.py b/src/transformers/configuration_bert.py index 8e815837bc..c0c00bedcd 100644 --- a/src/transformers/configuration_bert.py +++ b/src/transformers/configuration_bert.py @@ -15,13 +15,11 @@ # limitations under the License. """ BERT model configuration """ - -import logging - from .configuration_utils import PretrainedConfig +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) BERT_PRETRAINED_CONFIG_ARCHIVE_MAP = { "bert-base-uncased": "https://s3.amazonaws.com/models.huggingface.co/bert/bert-base-uncased-config.json", diff --git a/src/transformers/configuration_camembert.py b/src/transformers/configuration_camembert.py index 6ca969beae..da039c139d 100644 --- a/src/transformers/configuration_camembert.py +++ b/src/transformers/configuration_camembert.py @@ -15,13 +15,11 @@ # limitations under the License. """ CamemBERT configuration """ - -import logging - from .configuration_roberta import RobertaConfig +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) CAMEMBERT_PRETRAINED_CONFIG_ARCHIVE_MAP = { "camembert-base": "https://s3.amazonaws.com/models.huggingface.co/bert/camembert-base-config.json", diff --git a/src/transformers/configuration_ctrl.py b/src/transformers/configuration_ctrl.py index 1059525691..139799e057 100644 --- a/src/transformers/configuration_ctrl.py +++ b/src/transformers/configuration_ctrl.py @@ -14,13 +14,11 @@ # limitations under the License. """ Salesforce CTRL configuration """ - -import logging - from .configuration_utils import PretrainedConfig +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) CTRL_PRETRAINED_CONFIG_ARCHIVE_MAP = {"ctrl": "https://s3.amazonaws.com/models.huggingface.co/bert/ctrl-config.json"} diff --git a/src/transformers/configuration_distilbert.py b/src/transformers/configuration_distilbert.py index 9bd9baf228..949b9e0b6d 100644 --- a/src/transformers/configuration_distilbert.py +++ b/src/transformers/configuration_distilbert.py @@ -14,13 +14,11 @@ # limitations under the License. """ DistilBERT model configuration """ - -import logging - from .configuration_utils import PretrainedConfig +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) DISTILBERT_PRETRAINED_CONFIG_ARCHIVE_MAP = { "distilbert-base-uncased": "https://s3.amazonaws.com/models.huggingface.co/bert/distilbert-base-uncased-config.json", diff --git a/src/transformers/configuration_dpr.py b/src/transformers/configuration_dpr.py index 5fe02a655e..a012a8a7b9 100644 --- a/src/transformers/configuration_dpr.py +++ b/src/transformers/configuration_dpr.py @@ -14,13 +14,11 @@ # limitations under the License. """ DPR model configuration """ - -import logging - from .configuration_bert import BertConfig +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) DPR_PRETRAINED_CONFIG_ARCHIVE_MAP = { "facebook/dpr-ctx_encoder-single-nq-base": "https://s3.amazonaws.com/models.huggingface.co/bert/facebook/dpr-ctx_encoder-single-nq-base/config.json", diff --git a/src/transformers/configuration_electra.py b/src/transformers/configuration_electra.py index be8c7d6d8b..7295a5941e 100644 --- a/src/transformers/configuration_electra.py +++ b/src/transformers/configuration_electra.py @@ -15,13 +15,11 @@ # limitations under the License. """ ELECTRA model configuration """ - -import logging - from .configuration_utils import PretrainedConfig +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) ELECTRA_PRETRAINED_CONFIG_ARCHIVE_MAP = { "google/electra-small-generator": "https://s3.amazonaws.com/models.huggingface.co/bert/google/electra-small-generator/config.json", diff --git a/src/transformers/configuration_encoder_decoder.py b/src/transformers/configuration_encoder_decoder.py index 65c4021d3b..af9f21a49b 100644 --- a/src/transformers/configuration_encoder_decoder.py +++ b/src/transformers/configuration_encoder_decoder.py @@ -15,12 +15,12 @@ # limitations under the License. import copy -import logging from .configuration_utils import PretrainedConfig +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) class EncoderDecoderConfig(PretrainedConfig): diff --git a/src/transformers/configuration_flaubert.py b/src/transformers/configuration_flaubert.py index 7b3cc886b2..bb5dc114ba 100644 --- a/src/transformers/configuration_flaubert.py +++ b/src/transformers/configuration_flaubert.py @@ -14,13 +14,11 @@ # limitations under the License. """ Flaubert configuration, based on XLM. """ - -import logging - from .configuration_xlm import XLMConfig +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) FLAUBERT_PRETRAINED_CONFIG_ARCHIVE_MAP = { "flaubert/flaubert_small_cased": "https://s3.amazonaws.com/models.huggingface.co/bert/flaubert/flaubert_small_cased/config.json", diff --git a/src/transformers/configuration_gpt2.py b/src/transformers/configuration_gpt2.py index 91fa257b24..d2ebdb4034 100644 --- a/src/transformers/configuration_gpt2.py +++ b/src/transformers/configuration_gpt2.py @@ -15,13 +15,11 @@ # limitations under the License. """ OpenAI GPT-2 configuration """ - -import logging - from .configuration_utils import PretrainedConfig +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) GPT2_PRETRAINED_CONFIG_ARCHIVE_MAP = { "gpt2": "https://s3.amazonaws.com/models.huggingface.co/bert/gpt2-config.json", diff --git a/src/transformers/configuration_longformer.py b/src/transformers/configuration_longformer.py index a9081cf7a9..21a8f37a4c 100644 --- a/src/transformers/configuration_longformer.py +++ b/src/transformers/configuration_longformer.py @@ -14,13 +14,13 @@ # limitations under the License. """ Longformer configuration """ -import logging from typing import List, Union from .configuration_roberta import RobertaConfig +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) LONGFORMER_PRETRAINED_CONFIG_ARCHIVE_MAP = { "allenai/longformer-base-4096": "https://s3.amazonaws.com/models.huggingface.co/bert/allenai/longformer-base-4096/config.json", diff --git a/src/transformers/configuration_mbart.py b/src/transformers/configuration_mbart.py index a01fef6914..5fbd51dd38 100644 --- a/src/transformers/configuration_mbart.py +++ b/src/transformers/configuration_mbart.py @@ -14,12 +14,11 @@ # limitations under the License. """ MBART configuration """ -import logging - from .configuration_bart import BartConfig +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) MBART_PRETRAINED_CONFIG_ARCHIVE_MAP = { "facebook/mbart-large-en-ro": "https://s3.amazonaws.com/models.huggingface.co/bert/facebook/mbart-large-en-ro/config.json", diff --git a/src/transformers/configuration_mmbt.py b/src/transformers/configuration_mmbt.py index 56a35e237c..dc3d3b78dd 100644 --- a/src/transformers/configuration_mmbt.py +++ b/src/transformers/configuration_mmbt.py @@ -15,11 +15,10 @@ # limitations under the License. """ MMBT configuration """ - -import logging +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) class MMBTConfig(object): diff --git a/src/transformers/configuration_mobilebert.py b/src/transformers/configuration_mobilebert.py index d70c2f3e7b..83216243b3 100644 --- a/src/transformers/configuration_mobilebert.py +++ b/src/transformers/configuration_mobilebert.py @@ -12,12 +12,11 @@ # limitations under the License. """ MobileBERT model configuration """ -import logging - from .configuration_utils import PretrainedConfig +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) MOBILEBERT_PRETRAINED_CONFIG_ARCHIVE_MAP = { "mobilebert-uncased": "https://s3.amazonaws.com/models.huggingface.co/bert/google/mobilebert-uncased/config.json" diff --git a/src/transformers/configuration_openai.py b/src/transformers/configuration_openai.py index deeed60ea7..4ec26a93bb 100644 --- a/src/transformers/configuration_openai.py +++ b/src/transformers/configuration_openai.py @@ -15,13 +15,11 @@ # limitations under the License. """ OpenAI GPT configuration """ - -import logging - from .configuration_utils import PretrainedConfig +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) OPENAI_GPT_PRETRAINED_CONFIG_ARCHIVE_MAP = { "openai-gpt": "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-config.json" diff --git a/src/transformers/configuration_pegasus.py b/src/transformers/configuration_pegasus.py index 93c6736d03..a9c92e6a6d 100644 --- a/src/transformers/configuration_pegasus.py +++ b/src/transformers/configuration_pegasus.py @@ -14,13 +14,12 @@ # limitations under the License. """ PEGASUS model configuration """ -import logging - from .configuration_bart import BART_CONFIG_ARGS_DOC, BartConfig from .file_utils import add_start_docstrings_to_callable +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) # These config values do not vary between checkpoints DEFAULTS = dict( diff --git a/src/transformers/configuration_reformer.py b/src/transformers/configuration_reformer.py index eace75a00f..9e501144d7 100755 --- a/src/transformers/configuration_reformer.py +++ b/src/transformers/configuration_reformer.py @@ -15,13 +15,11 @@ # limitations under the License. """ Reformer model configuration """ - -import logging - from .configuration_utils import PretrainedConfig +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) REFORMER_PRETRAINED_CONFIG_ARCHIVE_MAP = { "google/reformer-crime-and-punishment": "https://cdn.huggingface.co/google/reformer-crime-and-punishment/config.json", diff --git a/src/transformers/configuration_retribert.py b/src/transformers/configuration_retribert.py index 882c7c80cd..8df4749f51 100644 --- a/src/transformers/configuration_retribert.py +++ b/src/transformers/configuration_retribert.py @@ -14,13 +14,11 @@ # limitations under the License. """ RetriBERT model configuration """ - -import logging - from .configuration_utils import PretrainedConfig +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) # TODO: uploadto AWS RETRIBERT_PRETRAINED_CONFIG_ARCHIVE_MAP = { diff --git a/src/transformers/configuration_roberta.py b/src/transformers/configuration_roberta.py index 439888e269..ddb6bad3f2 100644 --- a/src/transformers/configuration_roberta.py +++ b/src/transformers/configuration_roberta.py @@ -15,13 +15,11 @@ # limitations under the License. """ RoBERTa configuration """ - -import logging - from .configuration_bert import BertConfig +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) ROBERTA_PRETRAINED_CONFIG_ARCHIVE_MAP = { "roberta-base": "https://s3.amazonaws.com/models.huggingface.co/bert/roberta-base-config.json", diff --git a/src/transformers/configuration_t5.py b/src/transformers/configuration_t5.py index a60915ec39..63ffd9d420 100644 --- a/src/transformers/configuration_t5.py +++ b/src/transformers/configuration_t5.py @@ -14,13 +14,11 @@ # limitations under the License. """ T5 model configuration """ - -import logging - from .configuration_utils import PretrainedConfig +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) T5_PRETRAINED_CONFIG_ARCHIVE_MAP = { "t5-small": "https://s3.amazonaws.com/models.huggingface.co/bert/t5-small-config.json", diff --git a/src/transformers/configuration_transfo_xl.py b/src/transformers/configuration_transfo_xl.py index b9c91151b1..e0e2682e13 100644 --- a/src/transformers/configuration_transfo_xl.py +++ b/src/transformers/configuration_transfo_xl.py @@ -16,13 +16,12 @@ """ Transformer XL configuration """ -import logging import warnings - from .configuration_utils import PretrainedConfig +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) TRANSFO_XL_PRETRAINED_CONFIG_ARCHIVE_MAP = { "transfo-xl-wt103": "https://s3.amazonaws.com/models.huggingface.co/bert/transfo-xl-wt103-config.json", diff --git a/src/transformers/configuration_utils.py b/src/transformers/configuration_utils.py index c82fe8d211..7eeca428f1 100755 --- a/src/transformers/configuration_utils.py +++ b/src/transformers/configuration_utils.py @@ -18,14 +18,14 @@ import copy import json -import logging import os from typing import Any, Dict, Tuple from .file_utils import CONFIG_NAME, cached_path, hf_bucket_url, is_remote_url +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) class PretrainedConfig(object): diff --git a/src/transformers/configuration_xlm.py b/src/transformers/configuration_xlm.py index d87321a14f..8ee44b56ae 100644 --- a/src/transformers/configuration_xlm.py +++ b/src/transformers/configuration_xlm.py @@ -14,13 +14,11 @@ # limitations under the License. """ XLM configuration """ - -import logging - from .configuration_utils import PretrainedConfig +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) XLM_PRETRAINED_CONFIG_ARCHIVE_MAP = { "xlm-mlm-en-2048": "https://s3.amazonaws.com/models.huggingface.co/bert/xlm-mlm-en-2048-config.json", diff --git a/src/transformers/configuration_xlm_roberta.py b/src/transformers/configuration_xlm_roberta.py index 3a4a0c5185..17e188a7df 100644 --- a/src/transformers/configuration_xlm_roberta.py +++ b/src/transformers/configuration_xlm_roberta.py @@ -15,13 +15,11 @@ # limitations under the License. """ XLM-RoBERTa configuration """ - -import logging - from .configuration_roberta import RobertaConfig +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) XLM_ROBERTA_PRETRAINED_CONFIG_ARCHIVE_MAP = { "xlm-roberta-base": "https://s3.amazonaws.com/models.huggingface.co/bert/xlm-roberta-base-config.json", diff --git a/src/transformers/configuration_xlnet.py b/src/transformers/configuration_xlnet.py index 4c50335d7e..0fd04b0c4f 100644 --- a/src/transformers/configuration_xlnet.py +++ b/src/transformers/configuration_xlnet.py @@ -15,13 +15,13 @@ # limitations under the License. """ XLNet configuration """ -import logging import warnings from .configuration_utils import PretrainedConfig +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) XLNET_PRETRAINED_CONFIG_ARCHIVE_MAP = { "xlnet-base-cased": "https://s3.amazonaws.com/models.huggingface.co/bert/xlnet-base-cased-config.json", diff --git a/src/transformers/convert_albert_original_tf_checkpoint_to_pytorch.py b/src/transformers/convert_albert_original_tf_checkpoint_to_pytorch.py index 4dd240be73..8fabca0fbd 100644 --- a/src/transformers/convert_albert_original_tf_checkpoint_to_pytorch.py +++ b/src/transformers/convert_albert_original_tf_checkpoint_to_pytorch.py @@ -16,14 +16,15 @@ import argparse -import logging import torch from transformers import AlbertConfig, AlbertForPreTraining, load_tf_weights_in_albert +from .utils import logging -logging.basicConfig(level=logging.INFO) + +logging.set_verbosity_info() def convert_tf_checkpoint_to_pytorch(tf_checkpoint_path, albert_config_file, pytorch_dump_path): diff --git a/src/transformers/convert_bart_original_pytorch_checkpoint_to_pytorch.py b/src/transformers/convert_bart_original_pytorch_checkpoint_to_pytorch.py index 52efc88f61..8f460a5914 100644 --- a/src/transformers/convert_bart_original_pytorch_checkpoint_to_pytorch.py +++ b/src/transformers/convert_bart_original_pytorch_checkpoint_to_pytorch.py @@ -16,7 +16,6 @@ import argparse -import logging import os from pathlib import Path @@ -33,6 +32,8 @@ from transformers import ( ) from transformers.modeling_bart import _make_linear_from_emb +from .utils import logging + FAIRSEQ_MODELS = ["bart.large", "bart.large.mnli", "bart.large.cnn", "bart_xsum/model.pt"] extra_arch = {"bart.large": BartModel, "bart.large.mnli": BartForSequenceClassification} @@ -40,8 +41,8 @@ if version.parse(fairseq.__version__) < version.parse("0.9.0"): raise Exception("requires fairseq >= 0.9.0") -logging.basicConfig(level=logging.INFO) -logger = logging.getLogger(__name__) +logging.set_verbosity_info() +logger = logging.get_logger(__name__) SAMPLE_TEXT = " Hello world! cécé herlolip" diff --git a/src/transformers/convert_bert_original_tf2_checkpoint_to_pytorch.py b/src/transformers/convert_bert_original_tf2_checkpoint_to_pytorch.py index 0e37b24246..a68bf25487 100644 --- a/src/transformers/convert_bert_original_tf2_checkpoint_to_pytorch.py +++ b/src/transformers/convert_bert_original_tf2_checkpoint_to_pytorch.py @@ -8,7 +8,6 @@ The script re-maps the TF2.x Bert weight names to the original names, so the mod You may adapt this script to include classification/MLM/NSP/etc. heads. """ import argparse -import logging import os import re @@ -17,9 +16,11 @@ import torch from transformers import BertConfig, BertModel +from .utils import logging -logging.basicConfig(level=logging.INFO) -logger = logging.getLogger(__name__) + +logging.set_verbosity_info() +logger = logging.get_logger(__name__) def load_tf2_weights_in_bert(model, tf_checkpoint_path, config): diff --git a/src/transformers/convert_bert_original_tf_checkpoint_to_pytorch.py b/src/transformers/convert_bert_original_tf_checkpoint_to_pytorch.py index 806ace556a..bc1c8d128f 100755 --- a/src/transformers/convert_bert_original_tf_checkpoint_to_pytorch.py +++ b/src/transformers/convert_bert_original_tf_checkpoint_to_pytorch.py @@ -16,14 +16,15 @@ import argparse -import logging import torch from transformers import BertConfig, BertForPreTraining, load_tf_weights_in_bert +from .utils import logging -logging.basicConfig(level=logging.INFO) + +logging.set_verbosity_info() def convert_tf_checkpoint_to_pytorch(tf_checkpoint_path, bert_config_file, pytorch_dump_path): diff --git a/src/transformers/convert_electra_original_tf_checkpoint_to_pytorch.py b/src/transformers/convert_electra_original_tf_checkpoint_to_pytorch.py index 1b7579524b..b5f1278ddb 100644 --- a/src/transformers/convert_electra_original_tf_checkpoint_to_pytorch.py +++ b/src/transformers/convert_electra_original_tf_checkpoint_to_pytorch.py @@ -16,14 +16,15 @@ import argparse -import logging import torch from transformers import ElectraConfig, ElectraForMaskedLM, ElectraForPreTraining, load_tf_weights_in_electra +from .utils import logging -logging.basicConfig(level=logging.INFO) + +logging.set_verbosity_info() def convert_tf_checkpoint_to_pytorch(tf_checkpoint_path, config_file, pytorch_dump_path, discriminator_or_generator): diff --git a/src/transformers/convert_gpt2_original_tf_checkpoint_to_pytorch.py b/src/transformers/convert_gpt2_original_tf_checkpoint_to_pytorch.py index d86b6b0c88..4324bc5a8d 100755 --- a/src/transformers/convert_gpt2_original_tf_checkpoint_to_pytorch.py +++ b/src/transformers/convert_gpt2_original_tf_checkpoint_to_pytorch.py @@ -16,14 +16,15 @@ import argparse -import logging import torch from transformers import CONFIG_NAME, WEIGHTS_NAME, GPT2Config, GPT2Model, load_tf_weights_in_gpt2 +from .utils import logging -logging.basicConfig(level=logging.INFO) + +logging.set_verbosity_info() def convert_gpt2_checkpoint_to_pytorch(gpt2_checkpoint_path, gpt2_config_file, pytorch_dump_folder_path): diff --git a/src/transformers/convert_mobilebert_original_tf_checkpoint_to_pytorch.py b/src/transformers/convert_mobilebert_original_tf_checkpoint_to_pytorch.py index 9651069baa..468c503fd7 100644 --- a/src/transformers/convert_mobilebert_original_tf_checkpoint_to_pytorch.py +++ b/src/transformers/convert_mobilebert_original_tf_checkpoint_to_pytorch.py @@ -1,12 +1,13 @@ import argparse -import logging import torch from transformers import MobileBertConfig, MobileBertForPreTraining, load_tf_weights_in_mobilebert +from .utils import logging -logging.basicConfig(level=logging.INFO) + +logging.set_verbosity_info() def convert_tf_checkpoint_to_pytorch(tf_checkpoint_path, mobilebert_config_file, pytorch_dump_path): diff --git a/src/transformers/convert_openai_original_tf_checkpoint_to_pytorch.py b/src/transformers/convert_openai_original_tf_checkpoint_to_pytorch.py index a1e1b80272..83760e00d6 100755 --- a/src/transformers/convert_openai_original_tf_checkpoint_to_pytorch.py +++ b/src/transformers/convert_openai_original_tf_checkpoint_to_pytorch.py @@ -16,14 +16,15 @@ import argparse -import logging import torch from transformers import CONFIG_NAME, WEIGHTS_NAME, OpenAIGPTConfig, OpenAIGPTModel, load_tf_weights_in_openai_gpt +from .utils import logging -logging.basicConfig(level=logging.INFO) + +logging.set_verbosity_info() def convert_openai_checkpoint_to_pytorch(openai_checkpoint_folder_path, openai_config_file, pytorch_dump_folder_path): diff --git a/src/transformers/convert_pytorch_checkpoint_to_tf2.py b/src/transformers/convert_pytorch_checkpoint_to_tf2.py index d201850206..5e27ee62b6 100755 --- a/src/transformers/convert_pytorch_checkpoint_to_tf2.py +++ b/src/transformers/convert_pytorch_checkpoint_to_tf2.py @@ -16,7 +16,6 @@ import argparse -import logging import os from transformers import ( @@ -76,6 +75,8 @@ from transformers import ( ) from transformers.file_utils import hf_bucket_url +from .utils import logging + if is_torch_available(): import numpy as np @@ -104,7 +105,7 @@ if is_torch_available(): ) -logging.basicConfig(level=logging.INFO) +logging.set_verbosity_info() MODEL_CLASSES = { "bert": (BertConfig, TFBertForPreTraining, BertForPreTraining, BERT_PRETRAINED_CONFIG_ARCHIVE_MAP,), diff --git a/src/transformers/convert_reformer_trax_checkpoint_to_pytorch.py b/src/transformers/convert_reformer_trax_checkpoint_to_pytorch.py index 5e6dee7c08..ace650260f 100755 --- a/src/transformers/convert_reformer_trax_checkpoint_to_pytorch.py +++ b/src/transformers/convert_reformer_trax_checkpoint_to_pytorch.py @@ -16,7 +16,6 @@ import argparse -import logging import pickle import numpy as np @@ -24,8 +23,10 @@ import torch from transformers import ReformerConfig, ReformerModelWithLMHead +from .utils import logging -logging.basicConfig(level=logging.INFO) + +logging.set_verbosity_info() def set_param(torch_layer, weight, bias=None): diff --git a/src/transformers/convert_roberta_original_pytorch_checkpoint_to_pytorch.py b/src/transformers/convert_roberta_original_pytorch_checkpoint_to_pytorch.py index ab3a4864b0..5b4857cb76 100644 --- a/src/transformers/convert_roberta_original_pytorch_checkpoint_to_pytorch.py +++ b/src/transformers/convert_roberta_original_pytorch_checkpoint_to_pytorch.py @@ -16,7 +16,6 @@ import argparse -import logging import pathlib import fairseq @@ -28,13 +27,15 @@ from packaging import version from transformers.modeling_bert import BertIntermediate, BertLayer, BertOutput, BertSelfAttention, BertSelfOutput from transformers.modeling_roberta import RobertaConfig, RobertaForMaskedLM, RobertaForSequenceClassification +from .utils import logging + if version.parse(fairseq.__version__) < version.parse("0.9.0"): raise Exception("requires fairseq >= 0.9.0") -logging.basicConfig(level=logging.INFO) -logger = logging.getLogger(__name__) +logging.set_verbosity_info() +logger = logging.get_logger(__name__) SAMPLE_TEXT = "Hello world! cécé herlolip" diff --git a/src/transformers/convert_t5_original_tf_checkpoint_to_pytorch.py b/src/transformers/convert_t5_original_tf_checkpoint_to_pytorch.py index e497a5a641..2e1b5c35e2 100755 --- a/src/transformers/convert_t5_original_tf_checkpoint_to_pytorch.py +++ b/src/transformers/convert_t5_original_tf_checkpoint_to_pytorch.py @@ -16,14 +16,15 @@ import argparse -import logging import torch from transformers import T5Config, T5Model, load_tf_weights_in_t5 +from .utils import logging -logging.basicConfig(level=logging.INFO) + +logging.set_verbosity_info() def convert_tf_checkpoint_to_pytorch(tf_checkpoint_path, config_file, pytorch_dump_path): diff --git a/src/transformers/convert_transfo_xl_original_tf_checkpoint_to_pytorch.py b/src/transformers/convert_transfo_xl_original_tf_checkpoint_to_pytorch.py index 3a9048ba8e..d07ae69f4f 100755 --- a/src/transformers/convert_transfo_xl_original_tf_checkpoint_to_pytorch.py +++ b/src/transformers/convert_transfo_xl_original_tf_checkpoint_to_pytorch.py @@ -16,7 +16,6 @@ import argparse -import logging import os import pickle import sys @@ -33,8 +32,10 @@ from transformers import ( ) from transformers.tokenization_transfo_xl import CORPUS_NAME, VOCAB_FILES_NAMES +from .utils import logging -logging.basicConfig(level=logging.INFO) + +logging.set_verbosity_info() # We do this to be able to load python 2 datasets pickles # See e.g. https://stackoverflow.com/questions/2121874/python-pickling-after-changing-a-modules-directory/2121918#2121918 diff --git a/src/transformers/convert_xlm_original_pytorch_checkpoint_to_pytorch.py b/src/transformers/convert_xlm_original_pytorch_checkpoint_to_pytorch.py index 7d66dc5b31..7a72d3daa4 100755 --- a/src/transformers/convert_xlm_original_pytorch_checkpoint_to_pytorch.py +++ b/src/transformers/convert_xlm_original_pytorch_checkpoint_to_pytorch.py @@ -17,7 +17,6 @@ import argparse import json -import logging import numpy import torch @@ -25,8 +24,10 @@ import torch from transformers import CONFIG_NAME, WEIGHTS_NAME from transformers.tokenization_xlm import VOCAB_FILES_NAMES +from .utils import logging -logging.basicConfig(level=logging.INFO) + +logging.set_verbosity_info() def convert_xlm_checkpoint_to_pytorch(xlm_checkpoint_path, pytorch_dump_folder_path): diff --git a/src/transformers/convert_xlnet_original_tf_checkpoint_to_pytorch.py b/src/transformers/convert_xlnet_original_tf_checkpoint_to_pytorch.py index 51eed0e121..633fd01ca6 100755 --- a/src/transformers/convert_xlnet_original_tf_checkpoint_to_pytorch.py +++ b/src/transformers/convert_xlnet_original_tf_checkpoint_to_pytorch.py @@ -16,7 +16,6 @@ import argparse -import logging import os import torch @@ -31,6 +30,8 @@ from transformers import ( load_tf_weights_in_xlnet, ) +from .utils import logging + GLUE_TASKS_NUM_LABELS = { "cola": 2, @@ -45,7 +46,7 @@ GLUE_TASKS_NUM_LABELS = { } -logging.basicConfig(level=logging.INFO) +logging.set_verbosity_info() def convert_xlnet_checkpoint_to_pytorch( diff --git a/src/transformers/data/datasets/glue.py b/src/transformers/data/datasets/glue.py index 18bce5349e..9dcd1477b9 100644 --- a/src/transformers/data/datasets/glue.py +++ b/src/transformers/data/datasets/glue.py @@ -1,4 +1,3 @@ -import logging import os import time from dataclasses import dataclass, field @@ -14,11 +13,12 @@ from ...tokenization_bart import BartTokenizer, BartTokenizerFast from ...tokenization_roberta import RobertaTokenizer, RobertaTokenizerFast from ...tokenization_utils import PreTrainedTokenizer from ...tokenization_xlm_roberta import XLMRobertaTokenizer +from ...utils import logging from ..processors.glue import glue_convert_examples_to_features, glue_output_modes, glue_processors from ..processors.utils import InputFeatures -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) @dataclass diff --git a/src/transformers/data/datasets/language_modeling.py b/src/transformers/data/datasets/language_modeling.py index 10ae455cbe..50b8b86e22 100644 --- a/src/transformers/data/datasets/language_modeling.py +++ b/src/transformers/data/datasets/language_modeling.py @@ -1,4 +1,3 @@ -import logging import os import pickle import time @@ -9,9 +8,10 @@ from torch.utils.data.dataset import Dataset from filelock import FileLock from ...tokenization_utils import PreTrainedTokenizer +from ...utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) class TextDataset(Dataset): diff --git a/src/transformers/data/datasets/squad.py b/src/transformers/data/datasets/squad.py index b6ec86e4ae..6d51c80a93 100644 --- a/src/transformers/data/datasets/squad.py +++ b/src/transformers/data/datasets/squad.py @@ -1,4 +1,3 @@ -import logging import os import time from dataclasses import dataclass, field @@ -12,10 +11,11 @@ from filelock import FileLock from ...modeling_auto import MODEL_FOR_QUESTION_ANSWERING_MAPPING from ...tokenization_utils import PreTrainedTokenizer +from ...utils import logging from ..processors.squad import SquadFeatures, SquadV1Processor, SquadV2Processor, squad_convert_examples_to_features -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) MODEL_CONFIG_CLASSES = list(MODEL_FOR_QUESTION_ANSWERING_MAPPING.keys()) MODEL_TYPES = tuple(conf.model_type for conf in MODEL_CONFIG_CLASSES) diff --git a/src/transformers/data/metrics/squad_metrics.py b/src/transformers/data/metrics/squad_metrics.py index d01c34bf08..b93db890e8 100644 --- a/src/transformers/data/metrics/squad_metrics.py +++ b/src/transformers/data/metrics/squad_metrics.py @@ -10,15 +10,16 @@ that a question is unanswerable. import collections import json -import logging import math import re import string from transformers.tokenization_bert import BasicTokenizer +from ...utils import logging -logger = logging.getLogger(__name__) + +logger = logging.get_logger(__name__) def normalize_answer(s): diff --git a/src/transformers/data/processors/glue.py b/src/transformers/data/processors/glue.py index e8e0cd21d4..1143e08494 100644 --- a/src/transformers/data/processors/glue.py +++ b/src/transformers/data/processors/glue.py @@ -15,7 +15,6 @@ # limitations under the License. """ GLUE processors and helpers """ -import logging import os from dataclasses import asdict from enum import Enum @@ -23,13 +22,14 @@ from typing import List, Optional, Union from ...file_utils import is_tf_available from ...tokenization_utils import PreTrainedTokenizer +from ...utils import logging from .utils import DataProcessor, InputExample, InputFeatures if is_tf_available(): import tensorflow as tf -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) def glue_convert_examples_to_features( diff --git a/src/transformers/data/processors/squad.py b/src/transformers/data/processors/squad.py index 190e37fc8c..0c73f81bf4 100644 --- a/src/transformers/data/processors/squad.py +++ b/src/transformers/data/processors/squad.py @@ -1,5 +1,4 @@ import json -import logging import os from functools import partial from multiprocessing import Pool, cpu_count @@ -10,6 +9,7 @@ from tqdm import tqdm from ...file_utils import is_tf_available, is_torch_available from ...tokenization_bert import whitespace_tokenize from ...tokenization_utils_base import TruncationStrategy +from ...utils import logging from .utils import DataProcessor @@ -24,7 +24,7 @@ if is_torch_available(): if is_tf_available(): import tensorflow as tf -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) def _improve_answer_span(doc_tokens, input_start, input_end, tokenizer, orig_answer_text): diff --git a/src/transformers/data/processors/utils.py b/src/transformers/data/processors/utils.py index 7df0471608..5eeb9c9b62 100644 --- a/src/transformers/data/processors/utils.py +++ b/src/transformers/data/processors/utils.py @@ -17,14 +17,14 @@ import csv import dataclasses import json -import logging from dataclasses import dataclass from typing import List, Optional, Union from ...file_utils import is_tf_available, is_torch_available +from ...utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) @dataclass diff --git a/src/transformers/data/processors/xnli.py b/src/transformers/data/processors/xnli.py index 8564634e0d..f7407641c3 100644 --- a/src/transformers/data/processors/xnli.py +++ b/src/transformers/data/processors/xnli.py @@ -16,13 +16,13 @@ """ XNLI utils (dataset loading and evaluation) """ -import logging import os +from ...utils import logging from .utils import DataProcessor, InputExample -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) class XnliProcessor(DataProcessor): diff --git a/src/transformers/file_utils.py b/src/transformers/file_utils.py index 1907195078..ca08a383eb 100644 --- a/src/transformers/file_utils.py +++ b/src/transformers/file_utils.py @@ -6,7 +6,6 @@ Copyright by the AllenNLP authors. import fnmatch import json -import logging import os import re import shutil @@ -30,9 +29,10 @@ import requests from filelock import FileLock from . import __version__ +from .utils import logging -logger = logging.getLogger(__name__) # pylint: disable=invalid-name +logger = logging.get_logger(__name__) # pylint: disable=invalid-name try: USE_TF = os.environ.get("USE_TF", "AUTO").upper() @@ -757,7 +757,7 @@ def http_get(url, temp_file, proxies=None, resume_size=0, user_agent: Union[Dict total=total, initial=resume_size, desc="Downloading", - disable=bool(logger.getEffectiveLevel() == logging.NOTSET), + disable=bool(logging.get_verbosity() > logging.NOTSET), ) for chunk in response.iter_content(chunk_size=1024): if chunk: # filter out keep-alive new chunks diff --git a/src/transformers/generation_tf_utils.py b/src/transformers/generation_tf_utils.py index 81599a0fd0..bbc41595d1 100644 --- a/src/transformers/generation_tf_utils.py +++ b/src/transformers/generation_tf_utils.py @@ -14,13 +14,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -import logging - import numpy as np import tensorflow as tf +from .utils import logging -logger = logging.getLogger(__name__) + +logger = logging.get_logger(__name__) class TFGenerationMixin: diff --git a/src/transformers/generation_utils.py b/src/transformers/generation_utils.py index 97cf096642..18f2230004 100644 --- a/src/transformers/generation_utils.py +++ b/src/transformers/generation_utils.py @@ -14,15 +14,16 @@ # See the License for the specific language governing permissions and # limitations under the License. -import logging from typing import Iterable, List, Optional, Tuple import torch from torch import Tensor from torch.nn import functional as F +from .utils import logging -logger = logging.getLogger(__name__) + +logger = logging.get_logger(__name__) class GenerationMixin: diff --git a/src/transformers/modelcard.py b/src/transformers/modelcard.py index d37fa76a4a..bc253d9208 100644 --- a/src/transformers/modelcard.py +++ b/src/transformers/modelcard.py @@ -17,7 +17,6 @@ import copy import json -import logging import os from .configuration_auto import ALL_PRETRAINED_CONFIG_ARCHIVE_MAP @@ -30,9 +29,10 @@ from .file_utils import ( hf_bucket_url, is_remote_url, ) +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) class ModelCard: diff --git a/src/transformers/modeling_albert.py b/src/transformers/modeling_albert.py index fb43e7cb29..02b9160e2a 100755 --- a/src/transformers/modeling_albert.py +++ b/src/transformers/modeling_albert.py @@ -14,7 +14,6 @@ # limitations under the License. """PyTorch ALBERT model. """ -import logging import math import os import warnings @@ -44,9 +43,10 @@ from .modeling_outputs import ( TokenClassifierOutput, ) from .modeling_utils import PreTrainedModel, apply_chunking_to_forward, find_pruneable_heads_and_indices +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "AlbertConfig" _TOKENIZER_FOR_DOC = "AlbertTokenizer" diff --git a/src/transformers/modeling_auto.py b/src/transformers/modeling_auto.py index 4f56e473c5..0c647c28b0 100644 --- a/src/transformers/modeling_auto.py +++ b/src/transformers/modeling_auto.py @@ -15,7 +15,6 @@ """ Auto Model class. """ -import logging import warnings from collections import OrderedDict @@ -172,9 +171,10 @@ from .modeling_xlnet import ( XLNetLMHeadModel, XLNetModel, ) +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) MODEL_MAPPING = OrderedDict( diff --git a/src/transformers/modeling_bart.py b/src/transformers/modeling_bart.py index e8c107be7f..e9ec5f7e0b 100644 --- a/src/transformers/modeling_bart.py +++ b/src/transformers/modeling_bart.py @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. """PyTorch BART model, ported from the fairseq repo.""" -import logging import math import random import warnings @@ -43,9 +42,10 @@ from .modeling_outputs import ( Seq2SeqSequenceClassifierOutput, ) from .modeling_utils import PreTrainedModel +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "BartConfig" _TOKENIZER_FOR_DOC = "BartTokenizer" diff --git a/src/transformers/modeling_bert.py b/src/transformers/modeling_bert.py index b22dec2aa8..3d0b963a83 100755 --- a/src/transformers/modeling_bert.py +++ b/src/transformers/modeling_bert.py @@ -16,7 +16,6 @@ """PyTorch BERT model. """ -import logging import math import os import warnings @@ -54,9 +53,10 @@ from .modeling_utils import ( find_pruneable_heads_and_indices, prune_linear_layer, ) +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "BertConfig" _TOKENIZER_FOR_DOC = "BertTokenizer" diff --git a/src/transformers/modeling_camembert.py b/src/transformers/modeling_camembert.py index 797b4f06e1..5c5e9f95dd 100644 --- a/src/transformers/modeling_camembert.py +++ b/src/transformers/modeling_camembert.py @@ -15,8 +15,6 @@ # limitations under the License. """PyTorch CamemBERT model. """ -import logging - from .configuration_camembert import CamembertConfig from .file_utils import add_start_docstrings from .modeling_roberta import ( @@ -28,9 +26,10 @@ from .modeling_roberta import ( RobertaForTokenClassification, RobertaModel, ) +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _TOKENIZER_FOR_DOC = "CamembertTokenizer" diff --git a/src/transformers/modeling_ctrl.py b/src/transformers/modeling_ctrl.py index 653aaa5016..6bb15e999a 100644 --- a/src/transformers/modeling_ctrl.py +++ b/src/transformers/modeling_ctrl.py @@ -16,7 +16,6 @@ """ PyTorch CTRL model.""" -import logging import warnings import numpy as np @@ -28,9 +27,10 @@ from .configuration_ctrl import CTRLConfig from .file_utils import add_code_sample_docstrings, add_start_docstrings, add_start_docstrings_to_callable from .modeling_outputs import BaseModelOutputWithPast, CausalLMOutputWithPast from .modeling_utils import Conv1D, PreTrainedModel, find_pruneable_heads_and_indices, prune_linear_layer +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "CTRLConfig" _TOKENIZER_FOR_DOC = "CTRLTokenizer" diff --git a/src/transformers/modeling_distilbert.py b/src/transformers/modeling_distilbert.py index 7c932a79f0..39117c162a 100755 --- a/src/transformers/modeling_distilbert.py +++ b/src/transformers/modeling_distilbert.py @@ -19,7 +19,6 @@ import copy -import logging import math import warnings @@ -50,9 +49,10 @@ from .modeling_utils import ( find_pruneable_heads_and_indices, prune_linear_layer, ) +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "DistilBertConfig" _TOKENIZER_FOR_DOC = "DistilBertTokenizer" diff --git a/src/transformers/modeling_dpr.py b/src/transformers/modeling_dpr.py index fde9952461..5714964586 100644 --- a/src/transformers/modeling_dpr.py +++ b/src/transformers/modeling_dpr.py @@ -15,7 +15,6 @@ """ PyTorch DPR model for Open Domain Question Answering.""" -import logging from dataclasses import dataclass from typing import Optional, Tuple, Union @@ -27,9 +26,10 @@ from .file_utils import ModelOutput, add_start_docstrings, add_start_docstrings_ from .modeling_bert import BertModel from .modeling_outputs import BaseModelOutputWithPooling from .modeling_utils import PreTrainedModel +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "DPRConfig" diff --git a/src/transformers/modeling_electra.py b/src/transformers/modeling_electra.py index 56aa02808c..354c08b5d9 100644 --- a/src/transformers/modeling_electra.py +++ b/src/transformers/modeling_electra.py @@ -1,4 +1,3 @@ -import logging import os import warnings from dataclasses import dataclass @@ -27,9 +26,10 @@ from .modeling_outputs import ( TokenClassifierOutput, ) from .modeling_utils import SequenceSummary +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "ElectraConfig" _TOKENIZER_FOR_DOC = "ElectraTokenizer" diff --git a/src/transformers/modeling_encoder_decoder.py b/src/transformers/modeling_encoder_decoder.py index b351d32142..ed1d651591 100644 --- a/src/transformers/modeling_encoder_decoder.py +++ b/src/transformers/modeling_encoder_decoder.py @@ -15,15 +15,15 @@ """ Classes to support Encoder-Decoder architectures """ -import logging from typing import Optional from .configuration_encoder_decoder import EncoderDecoderConfig from .configuration_utils import PretrainedConfig from .modeling_utils import PreTrainedModel +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) class EncoderDecoderModel(PreTrainedModel): diff --git a/src/transformers/modeling_flaubert.py b/src/transformers/modeling_flaubert.py index a778c2f1e3..694f03f74b 100644 --- a/src/transformers/modeling_flaubert.py +++ b/src/transformers/modeling_flaubert.py @@ -15,7 +15,6 @@ """ PyTorch Flaubert model, based on XLM. """ -import logging import random import torch @@ -34,9 +33,10 @@ from .modeling_xlm import ( XLMWithLMHeadModel, get_masks, ) +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "FlaubertConfig" _TOKENIZER_FOR_DOC = "FlaubertTokenizer" diff --git a/src/transformers/modeling_gpt2.py b/src/transformers/modeling_gpt2.py index 9ab3877d4e..889c2e2a04 100644 --- a/src/transformers/modeling_gpt2.py +++ b/src/transformers/modeling_gpt2.py @@ -16,7 +16,6 @@ """PyTorch OpenAI GPT-2 model.""" -import logging import os import warnings from dataclasses import dataclass @@ -43,9 +42,10 @@ from .modeling_utils import ( find_pruneable_heads_and_indices, prune_conv1d_layer, ) +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "GPT2Config" _TOKENIZER_FOR_DOC = "GPT2Tokenizer" diff --git a/src/transformers/modeling_longformer.py b/src/transformers/modeling_longformer.py index 2623e27f90..72bbf3eab9 100755 --- a/src/transformers/modeling_longformer.py +++ b/src/transformers/modeling_longformer.py @@ -14,7 +14,6 @@ # limitations under the License. """PyTorch Longformer model. """ -import logging import math import warnings @@ -47,9 +46,10 @@ from .modeling_utils import ( find_pruneable_heads_and_indices, prune_linear_layer, ) +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "LongformerConfig" _TOKENIZER_FOR_DOC = "LongformerTokenizer" diff --git a/src/transformers/modeling_mmbt.py b/src/transformers/modeling_mmbt.py index 18105269d0..faf9155a9e 100644 --- a/src/transformers/modeling_mmbt.py +++ b/src/transformers/modeling_mmbt.py @@ -16,8 +16,6 @@ """PyTorch MMBT model. """ -import logging - import torch import torch.nn as nn from torch.nn import CrossEntropyLoss, MSELoss @@ -25,9 +23,10 @@ from torch.nn import CrossEntropyLoss, MSELoss from .file_utils import add_start_docstrings, add_start_docstrings_to_callable, replace_return_docstrings from .modeling_outputs import BaseModelOutputWithPooling, SequenceClassifierOutput from .modeling_utils import ModuleUtilsMixin +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "MMBTConfig" diff --git a/src/transformers/modeling_mobilebert.py b/src/transformers/modeling_mobilebert.py index ea75ab16a9..0c39f61a52 100644 --- a/src/transformers/modeling_mobilebert.py +++ b/src/transformers/modeling_mobilebert.py @@ -20,7 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -import logging import math import os import warnings @@ -53,9 +52,10 @@ from .modeling_outputs import ( TokenClassifierOutput, ) from .modeling_utils import PreTrainedModel, find_pruneable_heads_and_indices, prune_linear_layer +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "MobileBertConfig" _TOKENIZER_FOR_DOC = "MobileBertTokenizer" diff --git a/src/transformers/modeling_openai.py b/src/transformers/modeling_openai.py index b71c5cdb42..846c8ff188 100644 --- a/src/transformers/modeling_openai.py +++ b/src/transformers/modeling_openai.py @@ -17,7 +17,6 @@ import json -import logging import math import os import warnings @@ -45,9 +44,10 @@ from .modeling_utils import ( find_pruneable_heads_and_indices, prune_conv1d_layer, ) +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "OpenAIGPTConfig" _TOKENIZER_FOR_DOC = "OpenAIGPTTokenizer" diff --git a/src/transformers/modeling_reformer.py b/src/transformers/modeling_reformer.py index 1e20ffb39f..89971f1da9 100755 --- a/src/transformers/modeling_reformer.py +++ b/src/transformers/modeling_reformer.py @@ -15,7 +15,6 @@ # limitations under the License. """PyTorch REFORMER model. """ -import logging import sys from collections import namedtuple from dataclasses import dataclass @@ -41,9 +40,10 @@ from .file_utils import ( ) from .modeling_outputs import CausalLMOutput, MaskedLMOutput, QuestionAnsweringModelOutput, SequenceClassifierOutput from .modeling_utils import PreTrainedModel, apply_chunking_to_forward +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "ReformerConfig" _TOKENIZER_FOR_DOC = "ReformerTokenizer" diff --git a/src/transformers/modeling_retribert.py b/src/transformers/modeling_retribert.py index 8b03a6d0f9..9d889ce07b 100644 --- a/src/transformers/modeling_retribert.py +++ b/src/transformers/modeling_retribert.py @@ -17,7 +17,6 @@ RetriBERT model """ -import logging import math import torch @@ -28,9 +27,10 @@ from .configuration_retribert import RetriBertConfig from .file_utils import add_start_docstrings from .modeling_bert import BertLayerNorm, BertModel from .modeling_utils import PreTrainedModel +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) RETRIBERT_PRETRAINED_MODEL_ARCHIVE_LIST = [ "yjernite/retribert-base-uncased", diff --git a/src/transformers/modeling_roberta.py b/src/transformers/modeling_roberta.py index 59030ab28b..ae4bdf1fa8 100644 --- a/src/transformers/modeling_roberta.py +++ b/src/transformers/modeling_roberta.py @@ -16,7 +16,6 @@ """PyTorch RoBERTa model. """ -import logging import warnings import torch @@ -39,9 +38,10 @@ from .modeling_outputs import ( SequenceClassifierOutput, TokenClassifierOutput, ) +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "RobertaConfig" _TOKENIZER_FOR_DOC = "RobertaTokenizer" diff --git a/src/transformers/modeling_t5.py b/src/transformers/modeling_t5.py index 9727ea5014..26a2cd813e 100644 --- a/src/transformers/modeling_t5.py +++ b/src/transformers/modeling_t5.py @@ -16,7 +16,6 @@ import copy -import logging import math import os import warnings @@ -36,9 +35,10 @@ from .file_utils import ( ) from .modeling_outputs import BaseModelOutput, BaseModelOutputWithPast, Seq2SeqLMOutput, Seq2SeqModelOutput from .modeling_utils import PreTrainedModel, find_pruneable_heads_and_indices, prune_linear_layer +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "T5Config" _TOKENIZER_FOR_DOC = "T5Tokenizer" diff --git a/src/transformers/modeling_tf_albert.py b/src/transformers/modeling_tf_albert.py index 514bc12b07..5958101c0c 100644 --- a/src/transformers/modeling_tf_albert.py +++ b/src/transformers/modeling_tf_albert.py @@ -16,7 +16,6 @@ """ TF 2.0 ALBERT model. """ -import logging from dataclasses import dataclass from typing import Optional, Tuple @@ -53,9 +52,10 @@ from .modeling_tf_utils import ( shape_list, ) from .tokenization_utils import BatchEncoding +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "AlbertConfig" _TOKENIZER_FOR_DOC = "AlbertTokenizer" diff --git a/src/transformers/modeling_tf_auto.py b/src/transformers/modeling_tf_auto.py index fa0f6961fe..77f0cf4c48 100644 --- a/src/transformers/modeling_tf_auto.py +++ b/src/transformers/modeling_tf_auto.py @@ -15,7 +15,6 @@ """ Auto Model class. """ -import logging import warnings from collections import OrderedDict @@ -139,9 +138,10 @@ from .modeling_tf_xlnet import ( TFXLNetLMHeadModel, TFXLNetModel, ) +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) TF_MODEL_MAPPING = OrderedDict( diff --git a/src/transformers/modeling_tf_bert.py b/src/transformers/modeling_tf_bert.py index f03001a2a0..c0f7050f51 100644 --- a/src/transformers/modeling_tf_bert.py +++ b/src/transformers/modeling_tf_bert.py @@ -16,7 +16,6 @@ """ TF 2.0 BERT model. """ -import logging from dataclasses import dataclass from typing import Optional, Tuple @@ -56,9 +55,10 @@ from .modeling_tf_utils import ( shape_list, ) from .tokenization_utils import BatchEncoding +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "BertConfig" _TOKENIZER_FOR_DOC = "BertTokenizer" diff --git a/src/transformers/modeling_tf_camembert.py b/src/transformers/modeling_tf_camembert.py index e7a5a1d38e..d59bd7c657 100644 --- a/src/transformers/modeling_tf_camembert.py +++ b/src/transformers/modeling_tf_camembert.py @@ -15,9 +15,6 @@ # limitations under the License. """ TF 2.0 CamemBERT model. """ - -import logging - from .configuration_camembert import CamembertConfig from .file_utils import add_start_docstrings from .modeling_tf_roberta import ( @@ -28,9 +25,10 @@ from .modeling_tf_roberta import ( TFRobertaForTokenClassification, TFRobertaModel, ) +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) TF_CAMEMBERT_PRETRAINED_MODEL_ARCHIVE_LIST = [ # See all CamemBERT models at https://huggingface.co/models?filter=camembert diff --git a/src/transformers/modeling_tf_ctrl.py b/src/transformers/modeling_tf_ctrl.py index 760944099a..f2b7e13954 100644 --- a/src/transformers/modeling_tf_ctrl.py +++ b/src/transformers/modeling_tf_ctrl.py @@ -16,8 +16,6 @@ """ TF 2.0 CTRL model.""" -import logging - import numpy as np import tensorflow as tf @@ -32,9 +30,10 @@ from .modeling_tf_utils import ( shape_list, ) from .tokenization_utils import BatchEncoding +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "CTRLConfig" _TOKENIZER_FOR_DOC = "CTRLTokenizer" diff --git a/src/transformers/modeling_tf_distilbert.py b/src/transformers/modeling_tf_distilbert.py index 4a9484aa1f..b196f26390 100644 --- a/src/transformers/modeling_tf_distilbert.py +++ b/src/transformers/modeling_tf_distilbert.py @@ -16,7 +16,6 @@ """ -import logging import math import numpy as np @@ -50,9 +49,10 @@ from .modeling_tf_utils import ( shape_list, ) from .tokenization_utils import BatchEncoding +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "DistilBertConfig" _TOKENIZER_FOR_DOC = "DistilBertTokenizer" diff --git a/src/transformers/modeling_tf_electra.py b/src/transformers/modeling_tf_electra.py index 0e67c2f858..a562882bf1 100644 --- a/src/transformers/modeling_tf_electra.py +++ b/src/transformers/modeling_tf_electra.py @@ -1,4 +1,3 @@ -import logging from dataclasses import dataclass from typing import Optional, Tuple @@ -35,9 +34,10 @@ from .modeling_tf_utils import ( shape_list, ) from .tokenization_utils import BatchEncoding +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "ElectraConfig" _TOKENIZER_FOR_DOC = "ElectraTokenizer" diff --git a/src/transformers/modeling_tf_flaubert.py b/src/transformers/modeling_tf_flaubert.py index a9dae60e8e..9a0cc9c26c 100644 --- a/src/transformers/modeling_tf_flaubert.py +++ b/src/transformers/modeling_tf_flaubert.py @@ -15,7 +15,6 @@ """ TF 2.0 Flaubert model. """ -import logging import random import tensorflow as tf @@ -36,9 +35,10 @@ from .modeling_tf_xlm import ( get_masks, ) from .tokenization_utils import BatchEncoding +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) TF_FLAUBERT_PRETRAINED_MODEL_ARCHIVE_LIST = [ # See all Flaubert models at https://huggingface.co/models?filter=flaubert diff --git a/src/transformers/modeling_tf_gpt2.py b/src/transformers/modeling_tf_gpt2.py index 4952e286fb..86db28a177 100644 --- a/src/transformers/modeling_tf_gpt2.py +++ b/src/transformers/modeling_tf_gpt2.py @@ -16,7 +16,6 @@ """ TF 2.0 OpenAI GPT-2 model. """ -import logging from dataclasses import dataclass from typing import List, Optional, Tuple @@ -43,9 +42,10 @@ from .modeling_tf_utils import ( shape_list, ) from .tokenization_utils import BatchEncoding +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "GPT2Config" _TOKENIZER_FOR_DOC = "GPT2Tokenizer" diff --git a/src/transformers/modeling_tf_longformer.py b/src/transformers/modeling_tf_longformer.py index f1d420d9ae..948c5e6714 100644 --- a/src/transformers/modeling_tf_longformer.py +++ b/src/transformers/modeling_tf_longformer.py @@ -14,8 +14,6 @@ # limitations under the License. """Tensorflow Longformer model. """ -import logging - import tensorflow as tf from .configuration_longformer import LongformerConfig @@ -37,9 +35,10 @@ from .modeling_tf_utils import ( shape_list, ) from .tokenization_utils import BatchEncoding +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "LongformerConfig" _TOKENIZER_FOR_DOC = "LongformerTokenizer" diff --git a/src/transformers/modeling_tf_mobilebert.py b/src/transformers/modeling_tf_mobilebert.py index fd748c30ca..6f7c2d087d 100644 --- a/src/transformers/modeling_tf_mobilebert.py +++ b/src/transformers/modeling_tf_mobilebert.py @@ -16,7 +16,6 @@ """ TF 2.0 MobileBERT model. """ -import logging from dataclasses import dataclass from typing import Optional, Tuple @@ -54,9 +53,10 @@ from .modeling_tf_utils import ( shape_list, ) from .tokenization_utils import BatchEncoding +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "MobileBertConfig" _TOKENIZER_FOR_DOC = "MobileBertTokenizer" diff --git a/src/transformers/modeling_tf_openai.py b/src/transformers/modeling_tf_openai.py index e37478ef51..931f3b7108 100644 --- a/src/transformers/modeling_tf_openai.py +++ b/src/transformers/modeling_tf_openai.py @@ -16,7 +16,6 @@ """ TF 2.0 OpenAI GPT model.""" -import logging from dataclasses import dataclass from typing import Optional, Tuple @@ -43,9 +42,10 @@ from .modeling_tf_utils import ( shape_list, ) from .tokenization_utils import BatchEncoding +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "OpenAIGPTConfig" _TOKENIZER_FOR_DOC = "OpenAIGPTTokenizer" diff --git a/src/transformers/modeling_tf_pytorch_utils.py b/src/transformers/modeling_tf_pytorch_utils.py index 925e141edb..40e32f8bac 100644 --- a/src/transformers/modeling_tf_pytorch_utils.py +++ b/src/transformers/modeling_tf_pytorch_utils.py @@ -16,14 +16,15 @@ """ PyTorch - TF 2.0 general utilities.""" -import logging import os import re import numpy +from .utils import logging -logger = logging.getLogger(__name__) + +logger = logging.get_logger(__name__) def convert_tf_weight_name_to_pt_weight_name(tf_name, start_prefix_to_remove=""): diff --git a/src/transformers/modeling_tf_roberta.py b/src/transformers/modeling_tf_roberta.py index 3eb5e5a698..cd2befbea1 100644 --- a/src/transformers/modeling_tf_roberta.py +++ b/src/transformers/modeling_tf_roberta.py @@ -16,8 +16,6 @@ """ TF 2.0 RoBERTa model. """ -import logging - import tensorflow as tf from .configuration_roberta import RobertaConfig @@ -48,9 +46,10 @@ from .modeling_tf_utils import ( shape_list, ) from .tokenization_utils_base import BatchEncoding +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "RobertaConfig" _TOKENIZER_FOR_DOC = "RobertaTokenizer" diff --git a/src/transformers/modeling_tf_t5.py b/src/transformers/modeling_tf_t5.py index 819240ee78..80e4af724f 100644 --- a/src/transformers/modeling_tf_t5.py +++ b/src/transformers/modeling_tf_t5.py @@ -18,7 +18,6 @@ import copy import itertools -import logging import math import warnings @@ -42,9 +41,10 @@ from .modeling_tf_utils import ( shape_list, ) from .tokenization_utils import BatchEncoding +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "T5Config" _TOKENIZER_FOR_DOC = "T5Tokenizer" diff --git a/src/transformers/modeling_tf_transfo_xl.py b/src/transformers/modeling_tf_transfo_xl.py index abeef52ff1..4766322843 100644 --- a/src/transformers/modeling_tf_transfo_xl.py +++ b/src/transformers/modeling_tf_transfo_xl.py @@ -17,7 +17,6 @@ """ -import logging from dataclasses import dataclass from typing import List, Optional, Tuple @@ -28,9 +27,10 @@ from .file_utils import ModelOutput, add_code_sample_docstrings, add_start_docst from .modeling_tf_transfo_xl_utilities import TFAdaptiveSoftmaxMask from .modeling_tf_utils import TFPreTrainedModel, get_initializer, keras_serializable, shape_list from .tokenization_utils import BatchEncoding +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "TransfoXLConfig" _TOKENIZER_FOR_DOC = "TransfoXLTokenizer" diff --git a/src/transformers/modeling_tf_utils.py b/src/transformers/modeling_tf_utils.py index 7d9957e3d0..1fdc062202 100644 --- a/src/transformers/modeling_tf_utils.py +++ b/src/transformers/modeling_tf_utils.py @@ -15,7 +15,6 @@ # limitations under the License. """TF general model utils.""" import functools -import logging import os import warnings from typing import Dict, List, Optional, Union @@ -29,9 +28,10 @@ from .configuration_utils import PretrainedConfig from .file_utils import DUMMY_INPUTS, TF2_WEIGHTS_NAME, WEIGHTS_NAME, cached_path, hf_bucket_url, is_remote_url from .generation_tf_utils import TFGenerationMixin from .modeling_tf_pytorch_utils import load_pytorch_checkpoint_in_tf2_model +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) class TFModelUtilsMixin: diff --git a/src/transformers/modeling_tf_xlm.py b/src/transformers/modeling_tf_xlm.py index 1cd0d7e580..7f9b8572a6 100644 --- a/src/transformers/modeling_tf_xlm.py +++ b/src/transformers/modeling_tf_xlm.py @@ -17,7 +17,6 @@ import itertools -import logging import math import warnings from dataclasses import dataclass @@ -54,9 +53,10 @@ from .modeling_tf_utils import ( shape_list, ) from .tokenization_utils import BatchEncoding +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "XLMConfig" _TOKENIZER_FOR_DOC = "XLMTokenizer" diff --git a/src/transformers/modeling_tf_xlm_roberta.py b/src/transformers/modeling_tf_xlm_roberta.py index 46bc96950c..8f4c2ae6d7 100644 --- a/src/transformers/modeling_tf_xlm_roberta.py +++ b/src/transformers/modeling_tf_xlm_roberta.py @@ -15,9 +15,6 @@ # limitations under the License. """ TF 2.0 XLM-RoBERTa model. """ - -import logging - from .configuration_xlm_roberta import XLMRobertaConfig from .file_utils import add_start_docstrings from .modeling_tf_roberta import ( @@ -28,9 +25,10 @@ from .modeling_tf_roberta import ( TFRobertaForTokenClassification, TFRobertaModel, ) +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) TF_XLM_ROBERTA_PRETRAINED_MODEL_ARCHIVE_LIST = [ # See all XLM-RoBERTa models at https://huggingface.co/models?filter=xlm-roberta diff --git a/src/transformers/modeling_tf_xlnet.py b/src/transformers/modeling_tf_xlnet.py index 2054d230ce..333d0ab72d 100644 --- a/src/transformers/modeling_tf_xlnet.py +++ b/src/transformers/modeling_tf_xlnet.py @@ -17,7 +17,6 @@ """ -import logging from dataclasses import dataclass from typing import List, Optional, Tuple @@ -47,9 +46,10 @@ from .modeling_tf_utils import ( shape_list, ) from .tokenization_utils import BatchEncoding +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "XLNetConfig" _TOKENIZER_FOR_DOC = "XLNetTokenizer" diff --git a/src/transformers/modeling_transfo_xl.py b/src/transformers/modeling_transfo_xl.py index 87bf6d9b21..10fae29e97 100644 --- a/src/transformers/modeling_transfo_xl.py +++ b/src/transformers/modeling_transfo_xl.py @@ -19,7 +19,6 @@ """ -import logging from dataclasses import dataclass from typing import List, Optional, Tuple @@ -31,9 +30,10 @@ from .configuration_transfo_xl import TransfoXLConfig from .file_utils import ModelOutput, add_code_sample_docstrings, add_start_docstrings, add_start_docstrings_to_callable from .modeling_transfo_xl_utilities import ProjectedAdaptiveLogSoftmax from .modeling_utils import PreTrainedModel +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "TransfoXLConfig" _TOKENIZER_FOR_DOC = "TransfoXLTokenizer" diff --git a/src/transformers/modeling_utils.py b/src/transformers/modeling_utils.py index 8c6c5cfdd8..ef7e2dfcc7 100755 --- a/src/transformers/modeling_utils.py +++ b/src/transformers/modeling_utils.py @@ -15,7 +15,6 @@ # limitations under the License. import inspect -import logging import os import re from dataclasses import dataclass @@ -41,9 +40,10 @@ from .file_utils import ( replace_return_docstrings, ) from .generation_utils import GenerationMixin +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) try: diff --git a/src/transformers/modeling_xlm.py b/src/transformers/modeling_xlm.py index 4542c66105..c70eaf2638 100755 --- a/src/transformers/modeling_xlm.py +++ b/src/transformers/modeling_xlm.py @@ -17,7 +17,6 @@ import itertools -import logging import math import warnings from dataclasses import dataclass @@ -54,9 +53,10 @@ from .modeling_utils import ( find_pruneable_heads_and_indices, prune_linear_layer, ) +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "XLMConfig" _TOKENIZER_FOR_DOC = "XLMTokenizer" diff --git a/src/transformers/modeling_xlm_roberta.py b/src/transformers/modeling_xlm_roberta.py index b76d974440..00be724410 100644 --- a/src/transformers/modeling_xlm_roberta.py +++ b/src/transformers/modeling_xlm_roberta.py @@ -15,9 +15,6 @@ # limitations under the License. """PyTorch XLM-RoBERTa model. """ - -import logging - from .configuration_xlm_roberta import XLMRobertaConfig from .file_utils import add_start_docstrings from .modeling_roberta import ( @@ -28,9 +25,10 @@ from .modeling_roberta import ( RobertaForTokenClassification, RobertaModel, ) +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) XLM_ROBERTA_PRETRAINED_MODEL_ARCHIVE_LIST = [ "xlm-roberta-base", diff --git a/src/transformers/modeling_xlnet.py b/src/transformers/modeling_xlnet.py index d3c9fd94c6..f8949ddadb 100755 --- a/src/transformers/modeling_xlnet.py +++ b/src/transformers/modeling_xlnet.py @@ -17,7 +17,6 @@ """ -import logging from dataclasses import dataclass from typing import List, Optional, Tuple @@ -43,9 +42,10 @@ from .modeling_utils import ( SequenceSummary, apply_chunking_to_forward, ) +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _CONFIG_FOR_DOC = "XLNetConfig" _TOKENIZER_FOR_DOC = "XLNetTokenizer" diff --git a/src/transformers/optimization.py b/src/transformers/optimization.py index 7ae28d3ecf..72c089efef 100644 --- a/src/transformers/optimization.py +++ b/src/transformers/optimization.py @@ -14,7 +14,6 @@ # limitations under the License. """PyTorch optimization for BERT model.""" -import logging import math from typing import Callable, Iterable, Tuple @@ -22,8 +21,10 @@ import torch from torch.optim import Optimizer from torch.optim.lr_scheduler import LambdaLR +from .utils import logging -logger = logging.getLogger(__name__) + +logger = logging.get_logger(__name__) def get_constant_schedule(optimizer: Optimizer, last_epoch: int = -1): diff --git a/src/transformers/pipelines.py b/src/transformers/pipelines.py index dea226d90f..8d6799a722 100755 --- a/src/transformers/pipelines.py +++ b/src/transformers/pipelines.py @@ -16,7 +16,6 @@ import csv import json -import logging import os import pickle import sys @@ -39,6 +38,7 @@ from .tokenization_auto import AutoTokenizer from .tokenization_bert import BasicTokenizer from .tokenization_utils import PreTrainedTokenizer from .tokenization_utils_base import BatchEncoding, PaddingStrategy +from .utils import logging if is_tf_available(): @@ -80,7 +80,7 @@ if TYPE_CHECKING: from .modeling_utils import PreTrainedModel -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) def get_framework(model=None): diff --git a/src/transformers/tokenization_albert.py b/src/transformers/tokenization_albert.py index 0b7ca36e81..3b135825f7 100644 --- a/src/transformers/tokenization_albert.py +++ b/src/transformers/tokenization_albert.py @@ -15,16 +15,16 @@ """ Tokenization classes for ALBERT model.""" -import logging import os import unicodedata from shutil import copyfile from typing import List, Optional from .tokenization_utils import PreTrainedTokenizer +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) VOCAB_FILES_NAMES = {"vocab_file": "spiece.model"} PRETRAINED_VOCAB_FILES_MAP = { diff --git a/src/transformers/tokenization_auto.py b/src/transformers/tokenization_auto.py index 8fee16f1bc..49b80f2f8f 100644 --- a/src/transformers/tokenization_auto.py +++ b/src/transformers/tokenization_auto.py @@ -15,7 +15,6 @@ """ Auto Tokenizer class. """ -import logging from collections import OrderedDict from .configuration_auto import ( @@ -69,9 +68,10 @@ from .tokenization_transfo_xl import TransfoXLTokenizer, TransfoXLTokenizerFast from .tokenization_xlm import XLMTokenizer from .tokenization_xlm_roberta import XLMRobertaTokenizer from .tokenization_xlnet import XLNetTokenizer +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) TOKENIZER_MAPPING = OrderedDict( diff --git a/src/transformers/tokenization_bart.py b/src/transformers/tokenization_bart.py index 671753b0ff..8ee85f7fac 100644 --- a/src/transformers/tokenization_bart.py +++ b/src/transformers/tokenization_bart.py @@ -13,14 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -import logging from typing import List, Optional from .tokenization_roberta import RobertaTokenizer, RobertaTokenizerFast from .tokenization_utils_base import BatchEncoding +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) # vocab and merges same as roberta diff --git a/src/transformers/tokenization_bert.py b/src/transformers/tokenization_bert.py index 254398b34d..10a5b46540 100644 --- a/src/transformers/tokenization_bert.py +++ b/src/transformers/tokenization_bert.py @@ -16,7 +16,6 @@ import collections -import logging import os import unicodedata from typing import List, Optional @@ -25,9 +24,10 @@ from tokenizers import BertWordPieceTokenizer from .tokenization_utils import PreTrainedTokenizer, _is_control, _is_punctuation, _is_whitespace from .tokenization_utils_fast import PreTrainedTokenizerFast +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) VOCAB_FILES_NAMES = {"vocab_file": "vocab.txt"} diff --git a/src/transformers/tokenization_bert_japanese.py b/src/transformers/tokenization_bert_japanese.py index e476f463d4..c75320aa3b 100644 --- a/src/transformers/tokenization_bert_japanese.py +++ b/src/transformers/tokenization_bert_japanese.py @@ -16,15 +16,15 @@ import collections -import logging import os import unicodedata from typing import Optional from .tokenization_bert import BasicTokenizer, BertTokenizer, WordpieceTokenizer, load_vocab +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) VOCAB_FILES_NAMES = {"vocab_file": "vocab.txt"} diff --git a/src/transformers/tokenization_camembert.py b/src/transformers/tokenization_camembert.py index 84ecd2fef3..af49850626 100644 --- a/src/transformers/tokenization_camembert.py +++ b/src/transformers/tokenization_camembert.py @@ -15,7 +15,6 @@ """ Tokenization classes for Camembert model.""" -import logging import os from shutil import copyfile from typing import List, Optional @@ -24,9 +23,10 @@ import sentencepiece as spm from .tokenization_utils import PreTrainedTokenizer from .tokenization_xlnet import SPIECE_UNDERLINE +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) VOCAB_FILES_NAMES = {"vocab_file": "sentencepiece.bpe.model"} diff --git a/src/transformers/tokenization_ctrl.py b/src/transformers/tokenization_ctrl.py index 9757b05803..8130b1f21e 100644 --- a/src/transformers/tokenization_ctrl.py +++ b/src/transformers/tokenization_ctrl.py @@ -16,15 +16,15 @@ import json -import logging import os import regex as re from .tokenization_utils import PreTrainedTokenizer +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) VOCAB_FILES_NAMES = { "vocab_file": "vocab.json", diff --git a/src/transformers/tokenization_distilbert.py b/src/transformers/tokenization_distilbert.py index 1c34f3f80e..10e9d54601 100644 --- a/src/transformers/tokenization_distilbert.py +++ b/src/transformers/tokenization_distilbert.py @@ -14,13 +14,11 @@ # limitations under the License. """Tokenization classes for DistilBERT.""" - -import logging - from .tokenization_bert import BertTokenizer, BertTokenizerFast +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) VOCAB_FILES_NAMES = {"vocab_file": "vocab.txt"} diff --git a/src/transformers/tokenization_dpr.py b/src/transformers/tokenization_dpr.py index 0c7b70eff9..41f6efcc2c 100644 --- a/src/transformers/tokenization_dpr.py +++ b/src/transformers/tokenization_dpr.py @@ -16,15 +16,15 @@ import collections -import logging from typing import List, Optional, Union from .file_utils import add_end_docstrings, add_start_docstrings from .tokenization_bert import BertTokenizer, BertTokenizerFast from .tokenization_utils_base import BatchEncoding, TensorType +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) VOCAB_FILES_NAMES = {"vocab_file": "vocab.txt"} diff --git a/src/transformers/tokenization_flaubert.py b/src/transformers/tokenization_flaubert.py index e8857c014e..73bf202032 100644 --- a/src/transformers/tokenization_flaubert.py +++ b/src/transformers/tokenization_flaubert.py @@ -15,15 +15,15 @@ """Tokenization classes for Flaubert, based on XLM.""" -import logging import unicodedata import six from .tokenization_xlm import XLMTokenizer +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) VOCAB_FILES_NAMES = { "vocab_file": "vocab.json", diff --git a/src/transformers/tokenization_gpt2.py b/src/transformers/tokenization_gpt2.py index 05376b1f6e..fbe9817de0 100644 --- a/src/transformers/tokenization_gpt2.py +++ b/src/transformers/tokenization_gpt2.py @@ -16,7 +16,6 @@ import json -import logging import os from functools import lru_cache @@ -26,9 +25,10 @@ from tokenizers import ByteLevelBPETokenizer from .tokenization_utils import AddedToken, PreTrainedTokenizer from .tokenization_utils_base import BatchEncoding from .tokenization_utils_fast import PreTrainedTokenizerFast +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) VOCAB_FILES_NAMES = { "vocab_file": "vocab.json", diff --git a/src/transformers/tokenization_longformer.py b/src/transformers/tokenization_longformer.py index 92f36dc573..4c7fff5b6f 100644 --- a/src/transformers/tokenization_longformer.py +++ b/src/transformers/tokenization_longformer.py @@ -13,12 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import logging - from .tokenization_roberta import RobertaTokenizer, RobertaTokenizerFast +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) # vocab and merges same as roberta diff --git a/src/transformers/tokenization_mbart.py b/src/transformers/tokenization_mbart.py index e74a765340..9a4dffb725 100644 --- a/src/transformers/tokenization_mbart.py +++ b/src/transformers/tokenization_mbart.py @@ -13,16 +13,16 @@ # See the License for the specific language governing permissions and # limitations under the License. -import logging from typing import List, Optional from .file_utils import add_start_docstrings_to_callable from .tokenization_utils import BatchEncoding from .tokenization_utils_base import PREPARE_SEQ2SEQ_BATCH_DOCSTRING from .tokenization_xlm_roberta import XLMRobertaTokenizer +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) _all_mbart_models = ["facebook/mbart-large-en-ro", "facebook/mbart-large-cc25"] SPM_URL = "https://s3.amazonaws.com/models.huggingface.co/bert/facebook/mbart-large-en-ro/sentence.bpe.model" diff --git a/src/transformers/tokenization_mobilebert.py b/src/transformers/tokenization_mobilebert.py index 5b524d9787..4bcd961518 100644 --- a/src/transformers/tokenization_mobilebert.py +++ b/src/transformers/tokenization_mobilebert.py @@ -13,13 +13,11 @@ # limitations under the License. """Tokenization classes for MobileBERT.""" - -import logging - from .tokenization_bert import BertTokenizer, BertTokenizerFast +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) VOCAB_FILES_NAMES = {"vocab_file": "vocab.txt"} diff --git a/src/transformers/tokenization_openai.py b/src/transformers/tokenization_openai.py index 61b515834c..5ed70c2540 100644 --- a/src/transformers/tokenization_openai.py +++ b/src/transformers/tokenization_openai.py @@ -16,7 +16,6 @@ import json -import logging import os import re @@ -25,9 +24,10 @@ from tokenizers import CharBPETokenizer from .tokenization_bert import BasicTokenizer from .tokenization_utils import PreTrainedTokenizer from .tokenization_utils_fast import PreTrainedTokenizerFast +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) VOCAB_FILES_NAMES = { "vocab_file": "vocab.json", diff --git a/src/transformers/tokenization_reformer.py b/src/transformers/tokenization_reformer.py index 6d9a57cc09..81ac73b31e 100644 --- a/src/transformers/tokenization_reformer.py +++ b/src/transformers/tokenization_reformer.py @@ -15,14 +15,14 @@ """ Tokenization class for model Reformer.""" -import logging import os from shutil import copyfile from .tokenization_utils import PreTrainedTokenizer +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) SPIECE_UNDERLINE = "▁" diff --git a/src/transformers/tokenization_retribert.py b/src/transformers/tokenization_retribert.py index a544d0b8b9..ad6ace2f9e 100644 --- a/src/transformers/tokenization_retribert.py +++ b/src/transformers/tokenization_retribert.py @@ -14,13 +14,11 @@ # limitations under the License. """Tokenization classes for RetriBERT.""" - -import logging - from .tokenization_bert import BertTokenizer, BertTokenizerFast +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) VOCAB_FILES_NAMES = {"vocab_file": "vocab.txt"} diff --git a/src/transformers/tokenization_roberta.py b/src/transformers/tokenization_roberta.py index 450e659f8f..4c5d1c92bf 100644 --- a/src/transformers/tokenization_roberta.py +++ b/src/transformers/tokenization_roberta.py @@ -15,16 +15,16 @@ """Tokenization classes for RoBERTa.""" -import logging from typing import List, Optional from tokenizers.processors import RobertaProcessing from .tokenization_gpt2 import GPT2Tokenizer, GPT2TokenizerFast from .tokenization_utils import AddedToken +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) VOCAB_FILES_NAMES = { "vocab_file": "vocab.json", diff --git a/src/transformers/tokenization_t5.py b/src/transformers/tokenization_t5.py index 898d2ff0c2..a21bfa766b 100644 --- a/src/transformers/tokenization_t5.py +++ b/src/transformers/tokenization_t5.py @@ -15,7 +15,6 @@ """ Tokenization class for model T5.""" -import logging import os import re import warnings @@ -23,9 +22,10 @@ from shutil import copyfile from typing import List, Optional from .tokenization_utils import BatchEncoding, PreTrainedTokenizer +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) SPIECE_UNDERLINE = "▁" diff --git a/src/transformers/tokenization_transfo_xl.py b/src/transformers/tokenization_transfo_xl.py index 50502022f6..531fc5b06a 100644 --- a/src/transformers/tokenization_transfo_xl.py +++ b/src/transformers/tokenization_transfo_xl.py @@ -19,7 +19,6 @@ import glob -import logging import os import pickle import re @@ -38,13 +37,14 @@ from tokenizers.processors import BertProcessing from .file_utils import cached_path, is_torch_available from .tokenization_utils import PreTrainedTokenizer from .tokenization_utils_fast import PreTrainedTokenizerFast +from .utils import logging if is_torch_available(): import torch -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) VOCAB_FILES_NAMES = {"pretrained_vocab_file": "vocab.bin", "vocab_file": "vocab.txt"} VOCAB_FILES_NAMES_FAST = {"pretrained_vocab_file": "vocab.json", "vocab_file": "vocab.json"} diff --git a/src/transformers/tokenization_utils.py b/src/transformers/tokenization_utils.py index 36bec61d01..9eaf5bfc3d 100644 --- a/src/transformers/tokenization_utils.py +++ b/src/transformers/tokenization_utils.py @@ -17,7 +17,6 @@ """ import itertools -import logging import re import unicodedata from typing import Any, Dict, List, Optional, Tuple, Union, overload @@ -40,9 +39,10 @@ from .tokenization_utils_base import ( TextInputPair, TruncationStrategy, ) +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) def _is_whitespace(char): diff --git a/src/transformers/tokenization_utils_base.py b/src/transformers/tokenization_utils_base.py index d7cd5d3686..c2101695e5 100644 --- a/src/transformers/tokenization_utils_base.py +++ b/src/transformers/tokenization_utils_base.py @@ -20,7 +20,6 @@ import copy import json -import logging import os import warnings from collections import OrderedDict, UserDict @@ -41,6 +40,7 @@ from .file_utils import ( is_torch_available, torch_required, ) +from .utils import logging if is_tf_available(): @@ -49,7 +49,7 @@ if is_torch_available(): import torch -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) VERY_LARGE_INTEGER = int(1e30) # This is used to set the max input length for a model with infinite size input LARGE_INTEGER = int(1e20) # This is used when we need something big but slightly smaller than VERY_LARGE_INTEGER diff --git a/src/transformers/tokenization_utils_fast.py b/src/transformers/tokenization_utils_fast.py index fd1778590d..4f133f4ec6 100644 --- a/src/transformers/tokenization_utils_fast.py +++ b/src/transformers/tokenization_utils_fast.py @@ -16,7 +16,6 @@ For slow (python) tokenizers see tokenization_utils.py """ -import logging import os from collections import defaultdict from typing import Any, Dict, List, Optional, Tuple, Union @@ -38,9 +37,10 @@ from .tokenization_utils_base import ( TextInputPair, TruncationStrategy, ) +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) @add_end_docstrings( diff --git a/src/transformers/tokenization_xlm.py b/src/transformers/tokenization_xlm.py index 0a62468ea5..91ff481113 100644 --- a/src/transformers/tokenization_xlm.py +++ b/src/transformers/tokenization_xlm.py @@ -16,7 +16,6 @@ import json -import logging import os import re import sys @@ -26,9 +25,10 @@ from typing import List, Optional import sacremoses as sm from .tokenization_utils import PreTrainedTokenizer +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) VOCAB_FILES_NAMES = { "vocab_file": "vocab.json", diff --git a/src/transformers/tokenization_xlm_roberta.py b/src/transformers/tokenization_xlm_roberta.py index 787be9b064..dd16577325 100644 --- a/src/transformers/tokenization_xlm_roberta.py +++ b/src/transformers/tokenization_xlm_roberta.py @@ -15,16 +15,16 @@ """ Tokenization classes for XLM-RoBERTa model.""" -import logging import os from shutil import copyfile from typing import List, Optional from .tokenization_utils import PreTrainedTokenizer from .tokenization_xlnet import SPIECE_UNDERLINE +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) VOCAB_FILES_NAMES = {"vocab_file": "sentencepiece.bpe.model"} diff --git a/src/transformers/tokenization_xlnet.py b/src/transformers/tokenization_xlnet.py index c3689b21d4..78cf17a3df 100644 --- a/src/transformers/tokenization_xlnet.py +++ b/src/transformers/tokenization_xlnet.py @@ -15,16 +15,16 @@ """ Tokenization classes for XLNet model.""" -import logging import os import unicodedata from shutil import copyfile from typing import List, Optional from .tokenization_utils import PreTrainedTokenizer +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) VOCAB_FILES_NAMES = {"vocab_file": "spiece.model"} diff --git a/src/transformers/trainer.py b/src/transformers/trainer.py index 8a662da3a2..656a5dd8ff 100755 --- a/src/transformers/trainer.py +++ b/src/transformers/trainer.py @@ -1,5 +1,4 @@ import inspect -import logging import math import os import re @@ -44,6 +43,7 @@ from .trainer_utils import ( set_seed, ) from .training_args import TrainingArguments +from .utils import logging _use_native_amp = False @@ -86,7 +86,7 @@ if is_optuna_available(): if is_ray_available(): from ray import tune -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) @contextmanager diff --git a/src/transformers/trainer_tf.py b/src/transformers/trainer_tf.py index ecc15719a9..2b8050bbf4 100644 --- a/src/transformers/trainer_tf.py +++ b/src/transformers/trainer_tf.py @@ -1,7 +1,6 @@ """Tensorflow trainer class.""" import datetime -import logging import math import os import warnings @@ -16,6 +15,7 @@ from .modeling_tf_utils import TFPreTrainedModel from .optimization_tf import GradientAccumulator, create_optimizer from .trainer_utils import PREFIX_CHECKPOINT_DIR, EvalPrediction, PredictionOutput, set_seed from .training_args_tf import TFTrainingArguments +from .utils import logging if is_wandb_available(): @@ -24,7 +24,7 @@ if is_wandb_available(): if is_comet_available(): import comet_ml -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) class TFTrainer: diff --git a/src/transformers/training_args.py b/src/transformers/training_args.py index 6e3f22fad8..25eabe6e5b 100644 --- a/src/transformers/training_args.py +++ b/src/transformers/training_args.py @@ -1,11 +1,11 @@ import dataclasses import json -import logging import os from dataclasses import dataclass, field from typing import Any, Dict, Optional, Tuple from .file_utils import cached_property, is_torch_available, is_torch_tpu_available, torch_required +from .utils import logging if is_torch_available(): @@ -15,7 +15,7 @@ if is_torch_tpu_available(): import torch_xla.core.xla_model as xm -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) def default_logdir() -> str: diff --git a/src/transformers/training_args_tf.py b/src/transformers/training_args_tf.py index c1dea84d58..b1f3666389 100644 --- a/src/transformers/training_args_tf.py +++ b/src/transformers/training_args_tf.py @@ -1,13 +1,13 @@ -import logging import warnings from dataclasses import dataclass, field from typing import Tuple from .file_utils import cached_property, is_tf_available, tf_required from .training_args import TrainingArguments +from .utils import logging -logger = logging.getLogger(__name__) +logger = logging.get_logger(__name__) if is_tf_available(): import tensorflow as tf diff --git a/src/transformers/utils/logging.py b/src/transformers/utils/logging.py new file mode 100644 index 0000000000..0be08d78d1 --- /dev/null +++ b/src/transformers/utils/logging.py @@ -0,0 +1,165 @@ +# coding=utf-8 +# Copyright 2020 Optuna, Hugging Face +# +# 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. +""" Logging utilities. """ + +import logging +import threading +from logging import CRITICAL # NOQA +from logging import DEBUG # NOQA +from logging import ERROR # NOQA +from logging import FATAL # NOQA +from logging import INFO # NOQA +from logging import NOTSET # NOQA +from logging import WARN # NOQA +from logging import WARNING # NOQA +from typing import Optional + + +_lock = threading.Lock() +_default_handler: Optional[logging.Handler] = None + + +def _get_library_name() -> str: + + return __name__.split(".")[0] + + +def _get_library_root_logger() -> logging.Logger: + + return logging.getLogger(_get_library_name()) + + +def _configure_library_root_logger() -> None: + + global _default_handler + + with _lock: + if _default_handler: + # This library has already configured the library root logger. + return + _default_handler = logging.StreamHandler() # Set sys.stderr as stream. + + # Apply our default configuration to the library root logger. + library_root_logger = _get_library_root_logger() + library_root_logger.addHandler(_default_handler) + library_root_logger.setLevel(logging.INFO) + library_root_logger.propagate = False + + +def _reset_library_root_logger() -> None: + + global _default_handler + + with _lock: + if not _default_handler: + return + + library_root_logger = _get_library_root_logger() + library_root_logger.removeHandler(_default_handler) + library_root_logger.setLevel(logging.NOTSET) + _default_handler = None + + +def get_logger(name: Optional[str] = None) -> logging.Logger: + """Return a logger with the specified name. + This function is not supposed to be directly accessed by library users. + """ + + if name is None: + name = _get_library_name() + + _configure_library_root_logger() + return logging.getLogger(name) + + +def get_verbosity() -> int: + """Return the current level for the HuggingFace Transformers's root logger. + Returns: + Logging level, e.g., ``transformers.logging.DEBUG`` and ``transformers.logging.INFO``. + .. note:: + HuggingFace Transformers has following logging levels: + - ``transformers.logging.CRITICAL``, ``transformers.logging.FATAL`` + - ``transformers.logging.ERROR`` + - ``transformers.logging.WARNING``, ``transformers.logging.WARN`` + - ``transformers.logging.INFO`` + - ``transformers.logging.DEBUG`` + """ + + _configure_library_root_logger() + return _get_library_root_logger().getEffectiveLevel() + + +def set_verbosity(verbosity: int) -> None: + """Set the level for the HuggingFace Transformers's root logger. + Args: + verbosity: + Logging level, e.g., ``transformers.logging.DEBUG`` and ``transformers.logging.INFO``. + """ + + _configure_library_root_logger() + _get_library_root_logger().setLevel(verbosity) + + +def set_verbosity_info(): + return set_verbosity(INFO) + + +def set_verbosity_warning(): + return set_verbosity(WARNING) + + +def set_verbosity_debug(): + return set_verbosity(DEBUG) + + +def set_verbosity_error(): + return set_verbosity(ERROR) + + +def disable_default_handler() -> None: + """Disable the default handler of the HuggingFace Transformers's root logger.""" + + _configure_library_root_logger() + + assert _default_handler is not None + _get_library_root_logger().removeHandler(_default_handler) + + +def enable_default_handler() -> None: + """Enable the default handler of the HuggingFace Transformers's root logger.""" + + _configure_library_root_logger() + + assert _default_handler is not None + _get_library_root_logger().addHandler(_default_handler) + + +def disable_propagation() -> None: + """Disable propagation of the library log outputs. + Note that log propagation is disabled by default. + """ + + _configure_library_root_logger() + _get_library_root_logger().propagate = False + + +def enable_propagation() -> None: + """Enable propagation of the library log outputs. + Please disable the HuggingFace Transformers's default handler to prevent double logging if the root logger has + been configured. + """ + + _configure_library_root_logger() + _get_library_root_logger().propagate = True diff --git a/tests/test_logging.py b/tests/test_logging.py new file mode 100644 index 0000000000..9f5e3f9b74 --- /dev/null +++ b/tests/test_logging.py @@ -0,0 +1,20 @@ +import unittest + +from transformers import logging + + +class HfArgumentParserTest(unittest.TestCase): + def test_set_level(self): + logger = logging.get_logger() + + logging.set_verbosity_error() + self.assertEqual(logger.getEffectiveLevel(), logging.get_verbosity()) + + logging.set_verbosity_warning() + self.assertEqual(logger.getEffectiveLevel(), logging.get_verbosity()) + + logging.set_verbosity_info() + self.assertEqual(logger.getEffectiveLevel(), logging.get_verbosity()) + + logging.set_verbosity_debug() + self.assertEqual(logger.getEffectiveLevel(), logging.get_verbosity())