From 018d61fa245c32b1f4f0ff44975ce1292b37aa59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Felipe=20Cruz?= Date: Tue, 28 Jul 2020 01:19:17 -0700 Subject: [PATCH] Moving transformers package import statements to relative imports in some files (#5796) * Moving rom transformers statements to relative imports in some files under src/ * Import order Co-authored-by: Lysandre Debut --- src/transformers/configuration_encoder_decoder.py | 2 +- src/transformers/modeling_encoder_decoder.py | 6 +++--- src/transformers/modeling_marian.py | 4 ++-- src/transformers/modeling_mobilebert.py | 3 +-- src/transformers/modeling_tf_electra.py | 3 +-- src/transformers/testing_utils.py | 2 +- src/transformers/tokenization_auto.py | 3 +-- 7 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/transformers/configuration_encoder_decoder.py b/src/transformers/configuration_encoder_decoder.py index 261fa505e9..ae71dbecc1 100644 --- a/src/transformers/configuration_encoder_decoder.py +++ b/src/transformers/configuration_encoder_decoder.py @@ -69,7 +69,7 @@ class EncoderDecoderConfig(PretrainedConfig): decoder_config = kwargs.pop("decoder") decoder_model_type = decoder_config.pop("model_type") - from transformers import AutoConfig + from .configuration_auto import AutoConfig self.encoder = AutoConfig.for_model(encoder_model_type, **encoder_config) self.decoder = AutoConfig.for_model(decoder_model_type, **decoder_config) diff --git a/src/transformers/modeling_encoder_decoder.py b/src/transformers/modeling_encoder_decoder.py index 6db2d176e2..52d7058d1b 100644 --- a/src/transformers/modeling_encoder_decoder.py +++ b/src/transformers/modeling_encoder_decoder.py @@ -56,12 +56,12 @@ class EncoderDecoderModel(PreTrainedModel): super().__init__(config) if encoder is None: - from transformers import AutoModel + from .modeling_auto import AutoModel encoder = AutoModel.from_config(config.encoder) if decoder is None: - from transformers import AutoModelForCausalLM + from .modeling_auto import AutoModelForCausalLM decoder = AutoModelForCausalLM.from_config(config.decoder) @@ -159,7 +159,7 @@ class EncoderDecoderModel(PreTrainedModel): from .modeling_auto import AutoModelForCausalLM if "config" not in kwargs_decoder: - from transformers import AutoConfig + from .configuration_auto import AutoConfig decoder_config = AutoConfig.from_pretrained(decoder_pretrained_model_name_or_path) if decoder_config.is_decoder is False: diff --git a/src/transformers/modeling_marian.py b/src/transformers/modeling_marian.py index 16ebf838f8..e747ee515a 100644 --- a/src/transformers/modeling_marian.py +++ b/src/transformers/modeling_marian.py @@ -15,8 +15,8 @@ """PyTorch MarianMTModel model, ported from the Marian C++ repo.""" -from transformers.configuration_marian import MarianConfig -from transformers.modeling_bart import BartForConditionalGeneration +from .configuration_marian import MarianConfig +from .modeling_bart import BartForConditionalGeneration MARIAN_PRETRAINED_MODEL_ARCHIVE_LIST = [ diff --git a/src/transformers/modeling_mobilebert.py b/src/transformers/modeling_mobilebert.py index 4d78ca0396..13c9ade027 100644 --- a/src/transformers/modeling_mobilebert.py +++ b/src/transformers/modeling_mobilebert.py @@ -32,8 +32,6 @@ import torch.nn.functional as F from torch import nn from torch.nn import CrossEntropyLoss, MSELoss -from transformers.modeling_bert import BertIntermediate - from .activations import gelu, gelu_new, swish from .configuration_mobilebert import MobileBertConfig from .file_utils import ( @@ -43,6 +41,7 @@ from .file_utils import ( add_start_docstrings_to_callable, replace_return_docstrings, ) +from .modeling_bert import BertIntermediate from .modeling_outputs import ( BaseModelOutput, BaseModelOutputWithPooling, diff --git a/src/transformers/modeling_tf_electra.py b/src/transformers/modeling_tf_electra.py index 595482ee27..3d04e22a2a 100644 --- a/src/transformers/modeling_tf_electra.py +++ b/src/transformers/modeling_tf_electra.py @@ -2,8 +2,7 @@ import logging import tensorflow as tf -from transformers import ElectraConfig - +from .configuration_electra import ElectraConfig from .file_utils import add_code_sample_docstrings, add_start_docstrings, add_start_docstrings_to_callable from .modeling_tf_bert import ACT2FN, TFBertEncoder, TFBertPreTrainedModel from .modeling_tf_utils import ( diff --git a/src/transformers/testing_utils.py b/src/transformers/testing_utils.py index d6fbabcbdf..1fb9e83868 100644 --- a/src/transformers/testing_utils.py +++ b/src/transformers/testing_utils.py @@ -2,7 +2,7 @@ import os import unittest from distutils.util import strtobool -from transformers.file_utils import _tf_available, _torch_available, _torch_tpu_available +from .file_utils import _tf_available, _torch_available, _torch_tpu_available SMALL_MODEL_IDENTIFIER = "julien-c/bert-xsmall-dummy" diff --git a/src/transformers/tokenization_auto.py b/src/transformers/tokenization_auto.py index 7e2992c782..f16324ab78 100644 --- a/src/transformers/tokenization_auto.py +++ b/src/transformers/tokenization_auto.py @@ -18,8 +18,6 @@ import logging from collections import OrderedDict -from transformers.configuration_mobilebert import MobileBertConfig - from .configuration_auto import ( AlbertConfig, AutoConfig, @@ -44,6 +42,7 @@ from .configuration_auto import ( XLNetConfig, ) from .configuration_marian import MarianConfig +from .configuration_mobilebert import MobileBertConfig from .configuration_utils import PretrainedConfig from .tokenization_albert import AlbertTokenizer from .tokenization_bart import BartTokenizer, MBartTokenizer