Revert "Refactoring the generate() function (huggingface#6949)"

This reverts commit 7c2a6bc.
fabiocapsouza · Nov 15, 2020 · 5e0ea22 · 5e0ea22
1 parent 45723a5
commit 5e0ea22
Show file tree

Hide file tree

Showing 38 changed files with 1,162 additions and 2,993 deletions.
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -272,4 +272,3 @@ conversion utilities for the following models:
     internal/pipelines_utils
     internal/tokenization_utils
     internal/trainer_utils
-    internal/generation_utils
diff --git a/docs/source/internal/generation_utils.rst b/docs/source/internal/generation_utils.rst
diff --git a/docs/source/main_classes/model.rst b/docs/source/main_classes/model.rst
@@ -45,7 +45,7 @@ TFModelUtilsMixin
     :members:
 
 
-Generation
+Generative models
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. autoclass:: transformers.generation_utils.GenerationMixin

diff --git a/src/transformers/__init__.py b/src/transformers/__init__.py
@@ -299,19 +299,6 @@
         TextDataset,
         TextDatasetForNextSentencePrediction,
     )
-    from .generation_beam_search import BeamScorer, BeamSearchScorer
-    from .generation_logits_process import (
-        LogitsProcessor,
-        LogitsProcessorList,
-        LogitsWarper,
-        MinLengthLogitsProcessor,
-        NoBadWordsLogitsProcessor,
-        NoRepeatNGramLogitsProcessor,
-        RepetitionPenaltyLogitsProcessor,
-        TemperatureLogitsWarper,
-        TopKLogitsWarper,
-        TopPLogitsWarper,
-    )
     from .generation_utils import top_k_top_p_filtering
     from .modeling_albert import (
         ALBERT_PRETRAINED_MODEL_ARCHIVE_LIST,