From b8e5cd5396f7c0cc2d5e10be6696ea38742abf51 Mon Sep 17 00:00:00 2001 From: Sai-Suraj-27 Date: Fri, 26 Jul 2024 14:03:02 +0530 Subject: [PATCH] Refactor: Removed un-necessary `object` base class (#32230) * Refactored to remove un-necessary object base class. * small fix. --- examples/research_projects/bertabs/modeling_bertabs.py | 10 +++++----- .../fsner/src/fsner/tokenizer_utils.py | 2 +- examples/research_projects/lxmert/modeling_frcnn.py | 8 ++++---- .../movement-pruning/emmental/modules/binarizer.py | 2 +- .../performer/modeling_flax_performer_utils.py | 4 ++-- .../research_projects/visual_bert/modeling_frcnn.py | 8 ++++---- src/transformers/models/bert/tokenization_bert.py | 4 ++-- .../models/bert_japanese/tokenization_bert_japanese.py | 6 +++--- src/transformers/models/clip/tokenization_clip.py | 2 +- .../conditional_detr/modeling_conditional_detr.py | 2 +- .../models/convbert/tokenization_convbert.py | 4 ++-- src/transformers/models/cpmant/tokenization_cpmant.py | 2 +- src/transformers/models/deberta/modeling_deberta.py | 2 +- .../models/deberta_v2/modeling_deberta_v2.py | 2 +- .../models/deformable_detr/modeling_deformable_detr.py | 2 +- .../models/deprecated/deta/modeling_deta.py | 2 +- .../gptsan_japanese/tokenization_gptsan_japanese.py | 2 +- .../models/deprecated/mmbt/configuration_mmbt.py | 2 +- .../models/deprecated/realm/tokenization_realm.py | 4 ++-- .../deprecated/retribert/tokenization_retribert.py | 4 ++-- .../deprecated/transfo_xl/tokenization_transfo_xl.py | 6 +++--- src/transformers/models/detr/modeling_detr.py | 2 +- .../models/distilbert/tokenization_distilbert.py | 4 ++-- .../models/dpt/convert_dinov2_depth_to_hf.py | 2 +- .../models/electra/tokenization_electra.py | 4 ++-- src/transformers/models/funnel/tokenization_funnel.py | 4 ++-- .../tokenization_gpt_neox_japanese.py | 2 +- .../models/grounding_dino/modeling_grounding_dino.py | 2 +- .../models/herbert/tokenization_herbert.py | 2 +- .../models/layoutlm/tokenization_layoutlm.py | 4 ++-- .../models/layoutlmv2/tokenization_layoutlmv2.py | 4 ++-- src/transformers/models/lxmert/tokenization_lxmert.py | 4 ++-- .../models/mobilebert/tokenization_mobilebert.py | 4 ++-- src/transformers/models/mpnet/tokenization_mpnet.py | 4 ++-- src/transformers/models/openai/tokenization_openai.py | 2 +- .../models/prophetnet/tokenization_prophetnet.py | 4 ++-- .../models/roc_bert/tokenization_roc_bert.py | 4 ++-- .../models/roformer/tokenization_roformer.py | 4 ++-- src/transformers/models/rt_detr/modeling_rt_detr.py | 2 +- src/transformers/models/sew_d/modeling_sew_d.py | 2 +- .../models/splinter/tokenization_splinter.py | 4 ++-- .../models/squeezebert/tokenization_squeezebert.py | 4 ++-- .../table_transformer/modeling_table_transformer.py | 2 +- src/transformers/models/tapas/modeling_tapas.py | 2 +- src/transformers/models/tapas/modeling_tf_tapas.py | 2 +- src/transformers/models/tapas/tokenization_tapas.py | 4 ++-- src/transformers/models/yolos/modeling_yolos.py | 2 +- tests/models/ctrl/test_modeling_tf_ctrl.py | 2 +- tests/models/deberta/test_modeling_deberta.py | 2 +- tests/models/deberta_v2/test_modeling_deberta_v2.py | 2 +- tests/models/distilbert/test_modeling_distilbert.py | 2 +- tests/models/flaubert/test_modeling_flaubert.py | 2 +- tests/models/lxmert/test_modeling_tf_lxmert.py | 2 +- tests/models/mobilebert/test_modeling_tf_mobilebert.py | 2 +- tests/models/squeezebert/test_modeling_squeezebert.py | 2 +- tests/test_configuration_common.py | 2 +- 56 files changed, 89 insertions(+), 89 deletions(-) diff --git a/examples/research_projects/bertabs/modeling_bertabs.py b/examples/research_projects/bertabs/modeling_bertabs.py index 66f2320ebd..c2c6a54be7 100644 --- a/examples/research_projects/bertabs/modeling_bertabs.py +++ b/examples/research_projects/bertabs/modeling_bertabs.py @@ -557,7 +557,7 @@ class MultiHeadedAttention(nn.Module): return context -class DecoderState(object): +class DecoderState: """Interface for grouping together the current state of a recurrent decoder. In the simplest case just represents the hidden state of the model. But can also be used for implementing various forms of @@ -694,7 +694,7 @@ def build_predictor(args, tokenizer, symbols, model, logger=None): return translator -class GNMTGlobalScorer(object): +class GNMTGlobalScorer: """ NMT re-ranking score from "Google's Neural Machine Translation System" :cite:`wu2016google` @@ -717,7 +717,7 @@ class GNMTGlobalScorer(object): return normalized_probs -class PenaltyBuilder(object): +class PenaltyBuilder: """ Returns the Length and Coverage Penalty function for Beam Search. @@ -763,7 +763,7 @@ class PenaltyBuilder(object): return logprobs -class Translator(object): +class Translator: """ Uses a model to translate a batch of sentences. @@ -1002,7 +1002,7 @@ def tile(x, count, dim=0): # -class BertSumOptimizer(object): +class BertSumOptimizer: """Specific optimizer for BertSum. As described in [1], the authors fine-tune BertSum for abstractive diff --git a/examples/research_projects/fsner/src/fsner/tokenizer_utils.py b/examples/research_projects/fsner/src/fsner/tokenizer_utils.py index b281ae6cfb..7169e23dbe 100644 --- a/examples/research_projects/fsner/src/fsner/tokenizer_utils.py +++ b/examples/research_projects/fsner/src/fsner/tokenizer_utils.py @@ -3,7 +3,7 @@ import torch from transformers import AutoTokenizer -class FSNERTokenizerUtils(object): +class FSNERTokenizerUtils: def __init__(self, pretrained_model_name_or_path): self.tokenizer = AutoTokenizer.from_pretrained(pretrained_model_name_or_path) diff --git a/examples/research_projects/lxmert/modeling_frcnn.py b/examples/research_projects/lxmert/modeling_frcnn.py index 8aea9b5e1a..c7c3bf376c 100644 --- a/examples/research_projects/lxmert/modeling_frcnn.py +++ b/examples/research_projects/lxmert/modeling_frcnn.py @@ -417,7 +417,7 @@ class ShapeSpec(namedtuple("_ShapeSpec", ["channels", "height", "width", "stride return super().__new__(cls, channels, height, width, stride) -class Box2BoxTransform(object): +class Box2BoxTransform: """ This R-CNN transformation scales the box's width and height by exp(dw), exp(dh) and shifts a box's center by the offset @@ -519,7 +519,7 @@ class Box2BoxTransform(object): return pred_boxes -class Matcher(object): +class Matcher: """ This class assigns to each predicted "element" (e.g., a box) a ground-truth element. Each predicted element will have exactly zero or one matches; each @@ -622,7 +622,7 @@ class Matcher(object): match_labels[pred_inds_with_highest_quality] = 1 -class RPNOutputs(object): +class RPNOutputs: def __init__( self, box2box_transform, @@ -1132,7 +1132,7 @@ class ROIPooler(nn.Module): return output -class ROIOutputs(object): +class ROIOutputs: def __init__(self, cfg, training=False): self.smooth_l1_beta = cfg.ROI_BOX_HEAD.SMOOTH_L1_BETA self.box2box_transform = Box2BoxTransform(weights=cfg.ROI_BOX_HEAD.BBOX_REG_WEIGHTS) diff --git a/examples/research_projects/movement-pruning/emmental/modules/binarizer.py b/examples/research_projects/movement-pruning/emmental/modules/binarizer.py index b4a801d56d..c96975e3b3 100644 --- a/examples/research_projects/movement-pruning/emmental/modules/binarizer.py +++ b/examples/research_projects/movement-pruning/emmental/modules/binarizer.py @@ -108,7 +108,7 @@ class TopKBinarizer(autograd.Function): return gradOutput, None -class MagnitudeBinarizer(object): +class MagnitudeBinarizer: """ Magnitude Binarizer. Computes a binary mask M from a real value matrix S such that `M_{i,j} = 1` if and only if `S_{i,j}` diff --git a/examples/research_projects/performer/modeling_flax_performer_utils.py b/examples/research_projects/performer/modeling_flax_performer_utils.py index 6e6173729c..24c5e4d7c7 100644 --- a/examples/research_projects/performer/modeling_flax_performer_utils.py +++ b/examples/research_projects/performer/modeling_flax_performer_utils.py @@ -284,7 +284,7 @@ def make_fast_generalized_attention( return attention_fn -class RandomMatrix(object): +class RandomMatrix: r""" Abstract class providing a method for constructing 2D random arrays. Class is responsible for constructing 2D random arrays. @@ -348,7 +348,7 @@ class GaussianOrthogonalRandomMatrix(RandomMatrix): return jnp.matmul(jnp.diag(multiplier), final_matrix) -class FastAttention(object): +class FastAttention: r""" Abstract class providing a method for fast attention. Class is responsible for providing a method for fast approximate attention. diff --git a/examples/research_projects/visual_bert/modeling_frcnn.py b/examples/research_projects/visual_bert/modeling_frcnn.py index 8aea9b5e1a..c7c3bf376c 100644 --- a/examples/research_projects/visual_bert/modeling_frcnn.py +++ b/examples/research_projects/visual_bert/modeling_frcnn.py @@ -417,7 +417,7 @@ class ShapeSpec(namedtuple("_ShapeSpec", ["channels", "height", "width", "stride return super().__new__(cls, channels, height, width, stride) -class Box2BoxTransform(object): +class Box2BoxTransform: """ This R-CNN transformation scales the box's width and height by exp(dw), exp(dh) and shifts a box's center by the offset @@ -519,7 +519,7 @@ class Box2BoxTransform(object): return pred_boxes -class Matcher(object): +class Matcher: """ This class assigns to each predicted "element" (e.g., a box) a ground-truth element. Each predicted element will have exactly zero or one matches; each @@ -622,7 +622,7 @@ class Matcher(object): match_labels[pred_inds_with_highest_quality] = 1 -class RPNOutputs(object): +class RPNOutputs: def __init__( self, box2box_transform, @@ -1132,7 +1132,7 @@ class ROIPooler(nn.Module): return output -class ROIOutputs(object): +class ROIOutputs: def __init__(self, cfg, training=False): self.smooth_l1_beta = cfg.ROI_BOX_HEAD.SMOOTH_L1_BETA self.box2box_transform = Box2BoxTransform(weights=cfg.ROI_BOX_HEAD.BBOX_REG_WEIGHTS) diff --git a/src/transformers/models/bert/tokenization_bert.py b/src/transformers/models/bert/tokenization_bert.py index a8f1274663..cd70e38d00 100644 --- a/src/transformers/models/bert/tokenization_bert.py +++ b/src/transformers/models/bert/tokenization_bert.py @@ -281,7 +281,7 @@ class BertTokenizer(PreTrainedTokenizer): return (vocab_file,) -class BasicTokenizer(object): +class BasicTokenizer: """ Constructs a BasicTokenizer that will run basic tokenization (punctuation splitting, lower casing, etc.). @@ -442,7 +442,7 @@ class BasicTokenizer(object): return "".join(output) -class WordpieceTokenizer(object): +class WordpieceTokenizer: """Runs WordPiece tokenization.""" def __init__(self, vocab, unk_token, max_input_chars_per_word=100): diff --git a/src/transformers/models/bert_japanese/tokenization_bert_japanese.py b/src/transformers/models/bert_japanese/tokenization_bert_japanese.py index 58ff3d2b83..10d71c417a 100644 --- a/src/transformers/models/bert_japanese/tokenization_bert_japanese.py +++ b/src/transformers/models/bert_japanese/tokenization_bert_japanese.py @@ -691,7 +691,7 @@ class CharacterTokenizer: # Copied from transformers.models.bert.tokenization_bert.BasicTokenizer -class BasicTokenizer(object): +class BasicTokenizer: """ Constructs a BasicTokenizer that will run basic tokenization (punctuation splitting, lower casing, etc.). @@ -853,7 +853,7 @@ class BasicTokenizer(object): # Copied from transformers.models.bert.tokenization_bert.WordpieceTokenizer -class WordpieceTokenizer(object): +class WordpieceTokenizer: """Runs WordPiece tokenization.""" def __init__(self, vocab, unk_token, max_input_chars_per_word=100): @@ -910,7 +910,7 @@ class WordpieceTokenizer(object): return output_tokens -class SentencepieceTokenizer(object): +class SentencepieceTokenizer: """ Runs sentencepiece tokenization. Based on transformers.models.albert.tokenization_albert.AlbertTokenizer. """ diff --git a/src/transformers/models/clip/tokenization_clip.py b/src/transformers/models/clip/tokenization_clip.py index 7b4ad88b80..83e79890d0 100644 --- a/src/transformers/models/clip/tokenization_clip.py +++ b/src/transformers/models/clip/tokenization_clip.py @@ -90,7 +90,7 @@ def whitespace_tokenize(text): # Copied from transformers.models.bert.tokenization_bert.BasicTokenizer -class BasicTokenizer(object): +class BasicTokenizer: """ Constructs a BasicTokenizer that will run basic tokenization (punctuation splitting, lower casing, etc.). diff --git a/src/transformers/models/conditional_detr/modeling_conditional_detr.py b/src/transformers/models/conditional_detr/modeling_conditional_detr.py index e72daa6471..e0dcca67ae 100644 --- a/src/transformers/models/conditional_detr/modeling_conditional_detr.py +++ b/src/transformers/models/conditional_detr/modeling_conditional_detr.py @@ -2596,7 +2596,7 @@ def _max_by_axis(the_list): # Copied from transformers.models.detr.modeling_detr.NestedTensor -class NestedTensor(object): +class NestedTensor: def __init__(self, tensors, mask: Optional[Tensor]): self.tensors = tensors self.mask = mask diff --git a/src/transformers/models/convbert/tokenization_convbert.py b/src/transformers/models/convbert/tokenization_convbert.py index f1bc98bf41..cc8cb1b9a7 100644 --- a/src/transformers/models/convbert/tokenization_convbert.py +++ b/src/transformers/models/convbert/tokenization_convbert.py @@ -285,7 +285,7 @@ class ConvBertTokenizer(PreTrainedTokenizer): # Copied from transformers.models.bert.tokenization_bert.BasicTokenizer -class BasicTokenizer(object): +class BasicTokenizer: """ Constructs a BasicTokenizer that will run basic tokenization (punctuation splitting, lower casing, etc.). @@ -447,7 +447,7 @@ class BasicTokenizer(object): # Copied from transformers.models.bert.tokenization_bert.WordpieceTokenizer -class WordpieceTokenizer(object): +class WordpieceTokenizer: """Runs WordPiece tokenization.""" def __init__(self, vocab, unk_token, max_input_chars_per_word=100): diff --git a/src/transformers/models/cpmant/tokenization_cpmant.py b/src/transformers/models/cpmant/tokenization_cpmant.py index 2ccb296c70..094a14ffce 100644 --- a/src/transformers/models/cpmant/tokenization_cpmant.py +++ b/src/transformers/models/cpmant/tokenization_cpmant.py @@ -44,7 +44,7 @@ def load_vocab(vocab_file): return vocab -class WordpieceTokenizer(object): +class WordpieceTokenizer: def __init__(self, vocab, unk_token="", max_input_chars_per_word=200): self.vocab = vocab self.unk_token = unk_token diff --git a/src/transformers/models/deberta/modeling_deberta.py b/src/transformers/models/deberta/modeling_deberta.py index 964e3add91..af6d630a4d 100644 --- a/src/transformers/models/deberta/modeling_deberta.py +++ b/src/transformers/models/deberta/modeling_deberta.py @@ -138,7 +138,7 @@ class XSoftmax(torch.autograd.Function): return masked_fill(g, output, r_mask, g.op("Constant", value_t=torch.tensor(0, dtype=torch.bool))) -class DropoutContext(object): +class DropoutContext: def __init__(self): self.dropout = 0 self.mask = None diff --git a/src/transformers/models/deberta_v2/modeling_deberta_v2.py b/src/transformers/models/deberta_v2/modeling_deberta_v2.py index fd910e9daf..72653582d2 100644 --- a/src/transformers/models/deberta_v2/modeling_deberta_v2.py +++ b/src/transformers/models/deberta_v2/modeling_deberta_v2.py @@ -133,7 +133,7 @@ class XSoftmax(torch.autograd.Function): # Copied from transformers.models.deberta.modeling_deberta.DropoutContext -class DropoutContext(object): +class DropoutContext: def __init__(self): self.dropout = 0 self.mask = None diff --git a/src/transformers/models/deformable_detr/modeling_deformable_detr.py b/src/transformers/models/deformable_detr/modeling_deformable_detr.py index 03648d33b9..46e00787ba 100755 --- a/src/transformers/models/deformable_detr/modeling_deformable_detr.py +++ b/src/transformers/models/deformable_detr/modeling_deformable_detr.py @@ -2491,7 +2491,7 @@ def _max_by_axis(the_list): # Copied from transformers.models.detr.modeling_detr.NestedTensor -class NestedTensor(object): +class NestedTensor: def __init__(self, tensors, mask: Optional[Tensor]): self.tensors = tensors self.mask = mask diff --git a/src/transformers/models/deprecated/deta/modeling_deta.py b/src/transformers/models/deprecated/deta/modeling_deta.py index bc19574939..075b490cfa 100644 --- a/src/transformers/models/deprecated/deta/modeling_deta.py +++ b/src/transformers/models/deprecated/deta/modeling_deta.py @@ -2516,7 +2516,7 @@ def nonzero_tuple(x): # from https://github.com/facebookresearch/detectron2/blob/9921a2caa585d4fa66c4b534b6fab6e74d89b582/detectron2/modeling/matcher.py#L9 -class DetaMatcher(object): +class DetaMatcher: """ This class assigns to each predicted "element" (e.g., a box) a ground-truth element. Each predicted element will have exactly zero or one matches; each ground-truth element may be matched to zero or more predicted elements. diff --git a/src/transformers/models/deprecated/gptsan_japanese/tokenization_gptsan_japanese.py b/src/transformers/models/deprecated/gptsan_japanese/tokenization_gptsan_japanese.py index 782f68bf92..f1331da83e 100644 --- a/src/transformers/models/deprecated/gptsan_japanese/tokenization_gptsan_japanese.py +++ b/src/transformers/models/deprecated/gptsan_japanese/tokenization_gptsan_japanese.py @@ -365,7 +365,7 @@ class GPTSanJapaneseTokenizer(PreTrainedTokenizer): ) -class SubWordJapaneseTokenizer(object): +class SubWordJapaneseTokenizer: """ This tokenizer is based on GPTNeoXJapaneseTokenizer and has the following modifications - Decoding byte0~byte255 tokens correctly diff --git a/src/transformers/models/deprecated/mmbt/configuration_mmbt.py b/src/transformers/models/deprecated/mmbt/configuration_mmbt.py index 8fcc0f1d63..73696087fa 100644 --- a/src/transformers/models/deprecated/mmbt/configuration_mmbt.py +++ b/src/transformers/models/deprecated/mmbt/configuration_mmbt.py @@ -21,7 +21,7 @@ from ....utils import logging logger = logging.get_logger(__name__) -class MMBTConfig(object): +class MMBTConfig: """ This is the configuration class to store the configuration of a [`MMBTModel`]. It is used to instantiate a MMBT model according to the specified arguments, defining the model architecture. diff --git a/src/transformers/models/deprecated/realm/tokenization_realm.py b/src/transformers/models/deprecated/realm/tokenization_realm.py index 671405301d..8211c1aee8 100644 --- a/src/transformers/models/deprecated/realm/tokenization_realm.py +++ b/src/transformers/models/deprecated/realm/tokenization_realm.py @@ -354,7 +354,7 @@ class RealmTokenizer(PreTrainedTokenizer): return (vocab_file,) -class BasicTokenizer(object): +class BasicTokenizer: """ Constructs a BasicTokenizer that will run basic tokenization (punctuation splitting, lower casing, etc.). @@ -503,7 +503,7 @@ class BasicTokenizer(object): return "".join(output) -class WordpieceTokenizer(object): +class WordpieceTokenizer: """Runs WordPiece tokenization.""" def __init__(self, vocab, unk_token, max_input_chars_per_word=100): diff --git a/src/transformers/models/deprecated/retribert/tokenization_retribert.py b/src/transformers/models/deprecated/retribert/tokenization_retribert.py index 2f66fcc1ed..8b3570f162 100644 --- a/src/transformers/models/deprecated/retribert/tokenization_retribert.py +++ b/src/transformers/models/deprecated/retribert/tokenization_retribert.py @@ -283,7 +283,7 @@ class RetriBertTokenizer(PreTrainedTokenizer): return (vocab_file,) -class BasicTokenizer(object): +class BasicTokenizer: """ Constructs a BasicTokenizer that will run basic tokenization (punctuation splitting, lower casing, etc.). @@ -444,7 +444,7 @@ class BasicTokenizer(object): return "".join(output) -class WordpieceTokenizer(object): +class WordpieceTokenizer: """Runs WordPiece tokenization.""" def __init__(self, vocab, unk_token, max_input_chars_per_word=100): diff --git a/src/transformers/models/deprecated/transfo_xl/tokenization_transfo_xl.py b/src/transformers/models/deprecated/transfo_xl/tokenization_transfo_xl.py index 4229e8e5b3..ca80636b23 100644 --- a/src/transformers/models/deprecated/transfo_xl/tokenization_transfo_xl.py +++ b/src/transformers/models/deprecated/transfo_xl/tokenization_transfo_xl.py @@ -511,7 +511,7 @@ class TransfoXLTokenizer(PreTrainedTokenizer): return symbols -class LMOrderedIterator(object): +class LMOrderedIterator: def __init__(self, data, bsz, bptt, device="cpu", ext_len=None): """ data -- LongTensor -- the LongTensor is strictly ordered @@ -570,7 +570,7 @@ class LMOrderedIterator(object): return self.get_fixlen_iter() -class LMShuffledIterator(object): +class LMShuffledIterator: def __init__(self, data, bsz, bptt, device="cpu", ext_len=None, shuffle=False): """ data -- list[LongTensor] -- there is no order among the LongTensors @@ -679,7 +679,7 @@ class LMMultiFileIterator(LMShuffledIterator): yield batch -class TransfoXLCorpus(object): +class TransfoXLCorpus: @classmethod @torch_only_method def from_pretrained(cls, pretrained_model_name_or_path, cache_dir=None, *inputs, **kwargs): diff --git a/src/transformers/models/detr/modeling_detr.py b/src/transformers/models/detr/modeling_detr.py index 447f8a807f..c3c1c033e5 100644 --- a/src/transformers/models/detr/modeling_detr.py +++ b/src/transformers/models/detr/modeling_detr.py @@ -2292,7 +2292,7 @@ def _max_by_axis(the_list): return maxes -class NestedTensor(object): +class NestedTensor: def __init__(self, tensors, mask: Optional[Tensor]): self.tensors = tensors self.mask = mask diff --git a/src/transformers/models/distilbert/tokenization_distilbert.py b/src/transformers/models/distilbert/tokenization_distilbert.py index ff8854ba3d..87b1eb192e 100644 --- a/src/transformers/models/distilbert/tokenization_distilbert.py +++ b/src/transformers/models/distilbert/tokenization_distilbert.py @@ -295,7 +295,7 @@ class DistilBertTokenizer(PreTrainedTokenizer): # Copied from transformers.models.bert.tokenization_bert.BasicTokenizer -class BasicTokenizer(object): +class BasicTokenizer: """ Constructs a BasicTokenizer that will run basic tokenization (punctuation splitting, lower casing, etc.). @@ -457,7 +457,7 @@ class BasicTokenizer(object): # Copied from transformers.models.bert.tokenization_bert.WordpieceTokenizer -class WordpieceTokenizer(object): +class WordpieceTokenizer: """Runs WordPiece tokenization.""" def __init__(self, vocab, unk_token, max_input_chars_per_word=100): diff --git a/src/transformers/models/dpt/convert_dinov2_depth_to_hf.py b/src/transformers/models/dpt/convert_dinov2_depth_to_hf.py index 7b3715bddf..367aff7f90 100644 --- a/src/transformers/models/dpt/convert_dinov2_depth_to_hf.py +++ b/src/transformers/models/dpt/convert_dinov2_depth_to_hf.py @@ -200,7 +200,7 @@ name_to_url = { def get_original_pixel_values(image): - class CenterPadding(object): + class CenterPadding: def __init__(self, multiple): super().__init__() self.multiple = multiple diff --git a/src/transformers/models/electra/tokenization_electra.py b/src/transformers/models/electra/tokenization_electra.py index ceb3e75602..9ecbce63f5 100644 --- a/src/transformers/models/electra/tokenization_electra.py +++ b/src/transformers/models/electra/tokenization_electra.py @@ -284,7 +284,7 @@ class ElectraTokenizer(PreTrainedTokenizer): # Copied from transformers.models.bert.tokenization_bert.BasicTokenizer -class BasicTokenizer(object): +class BasicTokenizer: """ Constructs a BasicTokenizer that will run basic tokenization (punctuation splitting, lower casing, etc.). @@ -446,7 +446,7 @@ class BasicTokenizer(object): # Copied from transformers.models.bert.tokenization_bert.WordpieceTokenizer -class WordpieceTokenizer(object): +class WordpieceTokenizer: """Runs WordPiece tokenization.""" def __init__(self, vocab, unk_token, max_input_chars_per_word=100): diff --git a/src/transformers/models/funnel/tokenization_funnel.py b/src/transformers/models/funnel/tokenization_funnel.py index 6a710d660c..68e7d958b7 100644 --- a/src/transformers/models/funnel/tokenization_funnel.py +++ b/src/transformers/models/funnel/tokenization_funnel.py @@ -315,7 +315,7 @@ class FunnelTokenizer(PreTrainedTokenizer): # Copied from transformers.models.bert.tokenization_bert.BasicTokenizer -class BasicTokenizer(object): +class BasicTokenizer: """ Constructs a BasicTokenizer that will run basic tokenization (punctuation splitting, lower casing, etc.). @@ -477,7 +477,7 @@ class BasicTokenizer(object): # Copied from transformers.models.bert.tokenization_bert.WordpieceTokenizer -class WordpieceTokenizer(object): +class WordpieceTokenizer: """Runs WordPiece tokenization.""" def __init__(self, vocab, unk_token, max_input_chars_per_word=100): diff --git a/src/transformers/models/gpt_neox_japanese/tokenization_gpt_neox_japanese.py b/src/transformers/models/gpt_neox_japanese/tokenization_gpt_neox_japanese.py index ea7f3959c7..285dcb7d18 100644 --- a/src/transformers/models/gpt_neox_japanese/tokenization_gpt_neox_japanese.py +++ b/src/transformers/models/gpt_neox_japanese/tokenization_gpt_neox_japanese.py @@ -192,7 +192,7 @@ class GPTNeoXJapaneseTokenizer(PreTrainedTokenizer): return vocab_file, emoji_file -class SubWordJapaneseTokenizer(object): +class SubWordJapaneseTokenizer: """ https://github.com/tanreinama/Japanese-BPEEncoder_V2 This tokenizer class is under MIT Lisence according to the original repository. diff --git a/src/transformers/models/grounding_dino/modeling_grounding_dino.py b/src/transformers/models/grounding_dino/modeling_grounding_dino.py index dcdccc50cc..6527a36bd2 100644 --- a/src/transformers/models/grounding_dino/modeling_grounding_dino.py +++ b/src/transformers/models/grounding_dino/modeling_grounding_dino.py @@ -2617,7 +2617,7 @@ def sigmoid_focal_loss(inputs, targets, num_boxes, alpha: float = 0.25, gamma: f # Copied from transformers.models.detr.modeling_detr.NestedTensor -class NestedTensor(object): +class NestedTensor: def __init__(self, tensors, mask: Optional[Tensor]): self.tensors = tensors self.mask = mask diff --git a/src/transformers/models/herbert/tokenization_herbert.py b/src/transformers/models/herbert/tokenization_herbert.py index 6e37922028..bb078d4dde 100644 --- a/src/transformers/models/herbert/tokenization_herbert.py +++ b/src/transformers/models/herbert/tokenization_herbert.py @@ -113,7 +113,7 @@ def whitespace_tokenize(text): # Copied from transformers.models.bert.tokenization_bert.BasicTokenizer -class BasicTokenizer(object): +class BasicTokenizer: """ Constructs a BasicTokenizer that will run basic tokenization (punctuation splitting, lower casing, etc.). diff --git a/src/transformers/models/layoutlm/tokenization_layoutlm.py b/src/transformers/models/layoutlm/tokenization_layoutlm.py index fa6a5f29e9..b0a57dac5f 100644 --- a/src/transformers/models/layoutlm/tokenization_layoutlm.py +++ b/src/transformers/models/layoutlm/tokenization_layoutlm.py @@ -285,7 +285,7 @@ class LayoutLMTokenizer(PreTrainedTokenizer): # Copied from transformers.models.bert.tokenization_bert.BasicTokenizer -class BasicTokenizer(object): +class BasicTokenizer: """ Constructs a BasicTokenizer that will run basic tokenization (punctuation splitting, lower casing, etc.). @@ -447,7 +447,7 @@ class BasicTokenizer(object): # Copied from transformers.models.bert.tokenization_bert.WordpieceTokenizer -class WordpieceTokenizer(object): +class WordpieceTokenizer: """Runs WordPiece tokenization.""" def __init__(self, vocab, unk_token, max_input_chars_per_word=100): diff --git a/src/transformers/models/layoutlmv2/tokenization_layoutlmv2.py b/src/transformers/models/layoutlmv2/tokenization_layoutlmv2.py index c9a138391e..fe03055623 100644 --- a/src/transformers/models/layoutlmv2/tokenization_layoutlmv2.py +++ b/src/transformers/models/layoutlmv2/tokenization_layoutlmv2.py @@ -1323,7 +1323,7 @@ class LayoutLMv2Tokenizer(PreTrainedTokenizer): # Copied from transformers.models.bert.tokenization_bert.BasicTokenizer -class BasicTokenizer(object): +class BasicTokenizer: """ Constructs a BasicTokenizer that will run basic tokenization (punctuation splitting, lower casing, etc.). @@ -1485,7 +1485,7 @@ class BasicTokenizer(object): # Copied from transformers.models.bert.tokenization_bert.WordpieceTokenizer -class WordpieceTokenizer(object): +class WordpieceTokenizer: """Runs WordPiece tokenization.""" def __init__(self, vocab, unk_token, max_input_chars_per_word=100): diff --git a/src/transformers/models/lxmert/tokenization_lxmert.py b/src/transformers/models/lxmert/tokenization_lxmert.py index 8d2fca9328..5800f6b0d4 100644 --- a/src/transformers/models/lxmert/tokenization_lxmert.py +++ b/src/transformers/models/lxmert/tokenization_lxmert.py @@ -284,7 +284,7 @@ class LxmertTokenizer(PreTrainedTokenizer): # Copied from transformers.models.bert.tokenization_bert.BasicTokenizer -class BasicTokenizer(object): +class BasicTokenizer: """ Constructs a BasicTokenizer that will run basic tokenization (punctuation splitting, lower casing, etc.). @@ -446,7 +446,7 @@ class BasicTokenizer(object): # Copied from transformers.models.bert.tokenization_bert.WordpieceTokenizer -class WordpieceTokenizer(object): +class WordpieceTokenizer: """Runs WordPiece tokenization.""" def __init__(self, vocab, unk_token, max_input_chars_per_word=100): diff --git a/src/transformers/models/mobilebert/tokenization_mobilebert.py b/src/transformers/models/mobilebert/tokenization_mobilebert.py index 32dc995668..972f57fae0 100644 --- a/src/transformers/models/mobilebert/tokenization_mobilebert.py +++ b/src/transformers/models/mobilebert/tokenization_mobilebert.py @@ -286,7 +286,7 @@ class MobileBertTokenizer(PreTrainedTokenizer): # Copied from transformers.models.bert.tokenization_bert.BasicTokenizer -class BasicTokenizer(object): +class BasicTokenizer: """ Constructs a BasicTokenizer that will run basic tokenization (punctuation splitting, lower casing, etc.). @@ -448,7 +448,7 @@ class BasicTokenizer(object): # Copied from transformers.models.bert.tokenization_bert.WordpieceTokenizer -class WordpieceTokenizer(object): +class WordpieceTokenizer: """Runs WordPiece tokenization.""" def __init__(self, vocab, unk_token, max_input_chars_per_word=100): diff --git a/src/transformers/models/mpnet/tokenization_mpnet.py b/src/transformers/models/mpnet/tokenization_mpnet.py index 003575300e..8f152fa343 100644 --- a/src/transformers/models/mpnet/tokenization_mpnet.py +++ b/src/transformers/models/mpnet/tokenization_mpnet.py @@ -310,7 +310,7 @@ class MPNetTokenizer(PreTrainedTokenizer): # Copied from transformers.models.bert.tokenization_bert.BasicTokenizer -class BasicTokenizer(object): +class BasicTokenizer: """ Constructs a BasicTokenizer that will run basic tokenization (punctuation splitting, lower casing, etc.). @@ -472,7 +472,7 @@ class BasicTokenizer(object): # Copied from transformers.models.bert.tokenization_bert.WordpieceTokenizer -class WordpieceTokenizer(object): +class WordpieceTokenizer: """Runs WordPiece tokenization.""" def __init__(self, vocab, unk_token, max_input_chars_per_word=100): diff --git a/src/transformers/models/openai/tokenization_openai.py b/src/transformers/models/openai/tokenization_openai.py index d7427aa429..091dc56973 100644 --- a/src/transformers/models/openai/tokenization_openai.py +++ b/src/transformers/models/openai/tokenization_openai.py @@ -43,7 +43,7 @@ def whitespace_tokenize(text): # Copied from transformers.models.bert.tokenization_bert.BasicTokenizer -class BasicTokenizer(object): +class BasicTokenizer: """ Constructs a BasicTokenizer that will run basic tokenization (punctuation splitting, lower casing, etc.). diff --git a/src/transformers/models/prophetnet/tokenization_prophetnet.py b/src/transformers/models/prophetnet/tokenization_prophetnet.py index cd387520af..b253ca7099 100644 --- a/src/transformers/models/prophetnet/tokenization_prophetnet.py +++ b/src/transformers/models/prophetnet/tokenization_prophetnet.py @@ -38,7 +38,7 @@ def whitespace_tokenize(text): # Copied from transformers.models.bert.tokenization_bert.BasicTokenizer -class BasicTokenizer(object): +class BasicTokenizer: """ Constructs a BasicTokenizer that will run basic tokenization (punctuation splitting, lower casing, etc.). @@ -200,7 +200,7 @@ class BasicTokenizer(object): # Copied from transformers.models.bert.tokenization_bert.WordpieceTokenizer -class WordpieceTokenizer(object): +class WordpieceTokenizer: """Runs WordPiece tokenization.""" def __init__(self, vocab, unk_token, max_input_chars_per_word=100): diff --git a/src/transformers/models/roc_bert/tokenization_roc_bert.py b/src/transformers/models/roc_bert/tokenization_roc_bert.py index 85e1cd1d32..eaf2a1a491 100644 --- a/src/transformers/models/roc_bert/tokenization_roc_bert.py +++ b/src/transformers/models/roc_bert/tokenization_roc_bert.py @@ -889,7 +889,7 @@ class RoCBertTokenizer(PreTrainedTokenizer): # Copied from transformers.models.bert.tokenization_bert.BasicTokenizer with BasicTokenizer->RoCBertBasicTokenizer -class RoCBertBasicTokenizer(object): +class RoCBertBasicTokenizer: """ Constructs a RoCBertBasicTokenizer that will run basic tokenization (punctuation splitting, lower casing, etc.). @@ -1051,7 +1051,7 @@ class RoCBertBasicTokenizer(object): # Copied from transformers.models.bert.tokenization_bert.WordpieceTokenizer with WordpieceTokenizer->RoCBertWordpieceTokenizer -class RoCBertWordpieceTokenizer(object): +class RoCBertWordpieceTokenizer: """Runs WordPiece tokenization.""" def __init__(self, vocab, unk_token, max_input_chars_per_word=100): diff --git a/src/transformers/models/roformer/tokenization_roformer.py b/src/transformers/models/roformer/tokenization_roformer.py index ebaf8e56b1..33fe68f822 100644 --- a/src/transformers/models/roformer/tokenization_roformer.py +++ b/src/transformers/models/roformer/tokenization_roformer.py @@ -51,7 +51,7 @@ def whitespace_tokenize(text): # Copied from transformers.models.bert.tokenization_bert.BasicTokenizer -class BasicTokenizer(object): +class BasicTokenizer: """ Constructs a BasicTokenizer that will run basic tokenization (punctuation splitting, lower casing, etc.). @@ -213,7 +213,7 @@ class BasicTokenizer(object): # Copied from transformers.models.bert.tokenization_bert.WordpieceTokenizer -class WordpieceTokenizer(object): +class WordpieceTokenizer: """Runs WordPiece tokenization.""" def __init__(self, vocab, unk_token, max_input_chars_per_word=100): diff --git a/src/transformers/models/rt_detr/modeling_rt_detr.py b/src/transformers/models/rt_detr/modeling_rt_detr.py index e61521d888..3f47672594 100644 --- a/src/transformers/models/rt_detr/modeling_rt_detr.py +++ b/src/transformers/models/rt_detr/modeling_rt_detr.py @@ -2452,7 +2452,7 @@ def _max_by_axis(the_list): # Copied from transformers.models.detr.modeling_detr.NestedTensor -class NestedTensor(object): +class NestedTensor: def __init__(self, tensors, mask: Optional[Tensor]): self.tensors = tensors self.mask = mask diff --git a/src/transformers/models/sew_d/modeling_sew_d.py b/src/transformers/models/sew_d/modeling_sew_d.py index b7899c5760..21e211bbba 100644 --- a/src/transformers/models/sew_d/modeling_sew_d.py +++ b/src/transformers/models/sew_d/modeling_sew_d.py @@ -555,7 +555,7 @@ class XSoftmax(torch.autograd.Function): # Copied from transformers.models.deberta.modeling_deberta.DropoutContext -class DropoutContext(object): +class DropoutContext: def __init__(self): self.dropout = 0 self.mask = None diff --git a/src/transformers/models/splinter/tokenization_splinter.py b/src/transformers/models/splinter/tokenization_splinter.py index ee82e19c6c..2859497ba8 100644 --- a/src/transformers/models/splinter/tokenization_splinter.py +++ b/src/transformers/models/splinter/tokenization_splinter.py @@ -297,7 +297,7 @@ class SplinterTokenizer(PreTrainedTokenizer): return (vocab_file,) -class BasicTokenizer(object): +class BasicTokenizer: """ Constructs a BasicTokenizer that will run basic tokenization (punctuation splitting, lower casing, etc.). @@ -446,7 +446,7 @@ class BasicTokenizer(object): return "".join(output) -class WordpieceTokenizer(object): +class WordpieceTokenizer: """Runs WordPiece tokenization.""" def __init__(self, vocab, unk_token, max_input_chars_per_word=100): diff --git a/src/transformers/models/squeezebert/tokenization_squeezebert.py b/src/transformers/models/squeezebert/tokenization_squeezebert.py index 30f866770d..191e57c0f8 100644 --- a/src/transformers/models/squeezebert/tokenization_squeezebert.py +++ b/src/transformers/models/squeezebert/tokenization_squeezebert.py @@ -285,7 +285,7 @@ class SqueezeBertTokenizer(PreTrainedTokenizer): # Copied from transformers.models.bert.tokenization_bert.BasicTokenizer -class BasicTokenizer(object): +class BasicTokenizer: """ Constructs a BasicTokenizer that will run basic tokenization (punctuation splitting, lower casing, etc.). @@ -446,7 +446,7 @@ class BasicTokenizer(object): return "".join(output) -class WordpieceTokenizer(object): +class WordpieceTokenizer: """Runs WordPiece tokenization.""" def __init__(self, vocab, unk_token, max_input_chars_per_word=100): diff --git a/src/transformers/models/table_transformer/modeling_table_transformer.py b/src/transformers/models/table_transformer/modeling_table_transformer.py index 1ebb6cd53b..38978e9ada 100644 --- a/src/transformers/models/table_transformer/modeling_table_transformer.py +++ b/src/transformers/models/table_transformer/modeling_table_transformer.py @@ -1888,7 +1888,7 @@ def _max_by_axis(the_list): # Copied from transformers.models.detr.modeling_detr.NestedTensor -class NestedTensor(object): +class NestedTensor: def __init__(self, tensors, mask: Optional[Tensor]): self.tensors = tensors self.mask = mask diff --git a/src/transformers/models/tapas/modeling_tapas.py b/src/transformers/models/tapas/modeling_tapas.py index 17a01da150..b74a27ae5c 100644 --- a/src/transformers/models/tapas/modeling_tapas.py +++ b/src/transformers/models/tapas/modeling_tapas.py @@ -1550,7 +1550,7 @@ class AverageApproximationFunction(str, enum.Enum): # Beginning of everything related to segmented tensors -class IndexMap(object): +class IndexMap: """Index grouping entries within a tensor.""" def __init__(self, indices, num_segments, batch_dims=0): diff --git a/src/transformers/models/tapas/modeling_tf_tapas.py b/src/transformers/models/tapas/modeling_tf_tapas.py index 3515dfe655..afb1c3cbda 100644 --- a/src/transformers/models/tapas/modeling_tf_tapas.py +++ b/src/transformers/models/tapas/modeling_tf_tapas.py @@ -1830,7 +1830,7 @@ class AverageApproximationFunction(str, enum.Enum): # Beginning of everything related to segmented tensors -class IndexMap(object): +class IndexMap: """Index grouping entries within a tensor.""" def __init__(self, indices, num_segments, batch_dims=0): diff --git a/src/transformers/models/tapas/tokenization_tapas.py b/src/transformers/models/tapas/tokenization_tapas.py index 529ecb444e..a306f3384e 100644 --- a/src/transformers/models/tapas/tokenization_tapas.py +++ b/src/transformers/models/tapas/tokenization_tapas.py @@ -1961,7 +1961,7 @@ class TapasTokenizer(PreTrainedTokenizer): # Copied from transformers.models.bert.tokenization_bert.BasicTokenizer -class BasicTokenizer(object): +class BasicTokenizer: """ Constructs a BasicTokenizer that will run basic tokenization (punctuation splitting, lower casing, etc.). @@ -2123,7 +2123,7 @@ class BasicTokenizer(object): # Copied from transformers.models.bert.tokenization_bert.WordpieceTokenizer -class WordpieceTokenizer(object): +class WordpieceTokenizer: """Runs WordPiece tokenization.""" def __init__(self, vocab, unk_token, max_input_chars_per_word=100): diff --git a/src/transformers/models/yolos/modeling_yolos.py b/src/transformers/models/yolos/modeling_yolos.py index 2acf48849a..d2cf57dc80 100755 --- a/src/transformers/models/yolos/modeling_yolos.py +++ b/src/transformers/models/yolos/modeling_yolos.py @@ -1322,7 +1322,7 @@ def _max_by_axis(the_list): # Copied from transformers.models.detr.modeling_detr.NestedTensor -class NestedTensor(object): +class NestedTensor: def __init__(self, tensors, mask: Optional[Tensor]): self.tensors = tensors self.mask = mask diff --git a/tests/models/ctrl/test_modeling_tf_ctrl.py b/tests/models/ctrl/test_modeling_tf_ctrl.py index d8317c919d..a3772474a1 100644 --- a/tests/models/ctrl/test_modeling_tf_ctrl.py +++ b/tests/models/ctrl/test_modeling_tf_ctrl.py @@ -37,7 +37,7 @@ if is_tf_available(): ) -class TFCTRLModelTester(object): +class TFCTRLModelTester: def __init__( self, parent, diff --git a/tests/models/deberta/test_modeling_deberta.py b/tests/models/deberta/test_modeling_deberta.py index d511279c78..4b6f570e9e 100644 --- a/tests/models/deberta/test_modeling_deberta.py +++ b/tests/models/deberta/test_modeling_deberta.py @@ -34,7 +34,7 @@ if is_torch_available(): ) -class DebertaModelTester(object): +class DebertaModelTester: def __init__( self, parent, diff --git a/tests/models/deberta_v2/test_modeling_deberta_v2.py b/tests/models/deberta_v2/test_modeling_deberta_v2.py index 80df003b1e..0a9256aaf7 100644 --- a/tests/models/deberta_v2/test_modeling_deberta_v2.py +++ b/tests/models/deberta_v2/test_modeling_deberta_v2.py @@ -35,7 +35,7 @@ if is_torch_available(): ) -class DebertaV2ModelTester(object): +class DebertaV2ModelTester: def __init__( self, parent, diff --git a/tests/models/distilbert/test_modeling_distilbert.py b/tests/models/distilbert/test_modeling_distilbert.py index cde65080d2..3a74a1557c 100644 --- a/tests/models/distilbert/test_modeling_distilbert.py +++ b/tests/models/distilbert/test_modeling_distilbert.py @@ -40,7 +40,7 @@ if is_torch_available(): from transformers.models.distilbert.modeling_distilbert import _create_sinusoidal_embeddings -class DistilBertModelTester(object): +class DistilBertModelTester: def __init__( self, parent, diff --git a/tests/models/flaubert/test_modeling_flaubert.py b/tests/models/flaubert/test_modeling_flaubert.py index 17502dc273..7e0ef42091 100644 --- a/tests/models/flaubert/test_modeling_flaubert.py +++ b/tests/models/flaubert/test_modeling_flaubert.py @@ -39,7 +39,7 @@ if is_torch_available(): from transformers.models.flaubert.modeling_flaubert import create_sinusoidal_embeddings -class FlaubertModelTester(object): +class FlaubertModelTester: def __init__( self, parent, diff --git a/tests/models/lxmert/test_modeling_tf_lxmert.py b/tests/models/lxmert/test_modeling_tf_lxmert.py index d40ffbb3b9..d6728f4cc3 100644 --- a/tests/models/lxmert/test_modeling_tf_lxmert.py +++ b/tests/models/lxmert/test_modeling_tf_lxmert.py @@ -34,7 +34,7 @@ if is_tf_available(): from transformers.models.lxmert.modeling_tf_lxmert import TFLxmertForPreTraining, TFLxmertModel -class TFLxmertModelTester(object): +class TFLxmertModelTester: def __init__( self, parent, diff --git a/tests/models/mobilebert/test_modeling_tf_mobilebert.py b/tests/models/mobilebert/test_modeling_tf_mobilebert.py index c6c7d00da0..bf1ad0b1d1 100644 --- a/tests/models/mobilebert/test_modeling_tf_mobilebert.py +++ b/tests/models/mobilebert/test_modeling_tf_mobilebert.py @@ -84,7 +84,7 @@ class TFMobileBertModelTest(TFModelTesterMixin, PipelineTesterMixin, unittest.Te return inputs_dict - class TFMobileBertModelTester(object): + class TFMobileBertModelTester: def __init__( self, parent, diff --git a/tests/models/squeezebert/test_modeling_squeezebert.py b/tests/models/squeezebert/test_modeling_squeezebert.py index 1682146e1a..e5323fe3e4 100644 --- a/tests/models/squeezebert/test_modeling_squeezebert.py +++ b/tests/models/squeezebert/test_modeling_squeezebert.py @@ -37,7 +37,7 @@ if is_torch_available(): ) -class SqueezeBertModelTester(object): +class SqueezeBertModelTester: def __init__( self, parent, diff --git a/tests/test_configuration_common.py b/tests/test_configuration_common.py index 8d6ae394cf..81c6a008b1 100644 --- a/tests/test_configuration_common.py +++ b/tests/test_configuration_common.py @@ -23,7 +23,7 @@ from transformers import is_torch_available from .utils.test_configuration_utils import config_common_kwargs -class ConfigTester(object): +class ConfigTester: def __init__(self, parent, config_class=None, has_text_modality=True, common_properties=None, **kwargs): self.parent = parent self.config_class = config_class