Skip to content

Commit 313504b

Browse files
authored
🚨 [v5] remove deprecated generate classes (constraints and beam scorers) (#41223)
rm
1 parent 8f14300 commit 313504b

File tree

6 files changed

+0
-1696
lines changed

6 files changed

+0
-1696
lines changed

‎docs/source/en/internal/generation_utils.md‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -193,28 +193,6 @@ A [`StoppingCriteria`] can be used to change when to stop generation (other than
193193
[[autodoc]] EosTokenCriteria
194194
- __call__
195195

196-
## Constraints
197-
198-
A [`Constraint`] can be used to force the generation to include specific tokens or sequences in the output. Please note that this is exclusively available to our PyTorch implementations.
199-
200-
[[autodoc]] Constraint
201-
202-
[[autodoc]] PhrasalConstraint
203-
204-
[[autodoc]] DisjunctiveConstraint
205-
206-
[[autodoc]] ConstraintListState
207-
208-
## BeamSearch
209-
210-
[[autodoc]] BeamScorer
211-
- process
212-
- finalize
213-
214-
[[autodoc]] ConstrainedBeamSearchScorer
215-
- process
216-
- finalize
217-
218196
## Streamers
219197

220198
[[autodoc]] TextStreamer

‎src/transformers/__init__.py‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -389,12 +389,7 @@
389389
"AlternatingCodebooksLogitsProcessor",
390390
"BayesianDetectorConfig",
391391
"BayesianDetectorModel",
392-
"BeamScorer",
393392
"ClassifierFreeGuidanceLogitsProcessor",
394-
"ConstrainedBeamSearchScorer",
395-
"Constraint",
396-
"ConstraintListState",
397-
"DisjunctiveConstraint",
398393
"EncoderNoRepeatNGramLogitsProcessor",
399394
"EncoderRepetitionPenaltyLogitsProcessor",
400395
"EosTokenCriteria",
@@ -415,7 +410,6 @@
415410
"MinPLogitsWarper",
416411
"NoBadWordsLogitsProcessor",
417412
"NoRepeatNGramLogitsProcessor",
418-
"PhrasalConstraint",
419413
"PrefixConstrainedLogitsProcessor",
420414
"RepetitionPenaltyLogitsProcessor",
421415
"SequenceBiasLogitsProcessor",
@@ -555,13 +549,8 @@
555549
from .generation import AsyncTextIteratorStreamer as AsyncTextIteratorStreamer
556550
from .generation import BayesianDetectorConfig as BayesianDetectorConfig
557551
from .generation import BayesianDetectorModel as BayesianDetectorModel
558-
from .generation import BeamScorer as BeamScorer
559552
from .generation import ClassifierFreeGuidanceLogitsProcessor as ClassifierFreeGuidanceLogitsProcessor
560553
from .generation import CompileConfig as CompileConfig
561-
from .generation import ConstrainedBeamSearchScorer as ConstrainedBeamSearchScorer
562-
from .generation import Constraint as Constraint
563-
from .generation import ConstraintListState as ConstraintListState
564-
from .generation import DisjunctiveConstraint as DisjunctiveConstraint
565554
from .generation import EncoderNoRepeatNGramLogitsProcessor as EncoderNoRepeatNGramLogitsProcessor
566555
from .generation import EncoderRepetitionPenaltyLogitsProcessor as EncoderRepetitionPenaltyLogitsProcessor
567556
from .generation import EosTokenCriteria as EosTokenCriteria
@@ -583,7 +572,6 @@
583572
from .generation import MinPLogitsWarper as MinPLogitsWarper
584573
from .generation import NoBadWordsLogitsProcessor as NoBadWordsLogitsProcessor
585574
from .generation import NoRepeatNGramLogitsProcessor as NoRepeatNGramLogitsProcessor
586-
from .generation import PhrasalConstraint as PhrasalConstraint
587575
from .generation import PrefixConstrainedLogitsProcessor as PrefixConstrainedLogitsProcessor
588576
from .generation import RepetitionPenaltyLogitsProcessor as RepetitionPenaltyLogitsProcessor
589577
from .generation import SequenceBiasLogitsProcessor as SequenceBiasLogitsProcessor

‎src/transformers/generation/__init__.py‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,6 @@
3535
except OptionalDependencyNotAvailable:
3636
pass
3737
else:
38-
_import_structure["beam_constraints"] = [
39-
"Constraint",
40-
"ConstraintListState",
41-
"DisjunctiveConstraint",
42-
"PhrasalConstraint",
43-
]
44-
_import_structure["beam_search"] = [
45-
"BeamHypotheses",
46-
"BeamScorer",
47-
"ConstrainedBeamSearchScorer",
48-
]
4938
_import_structure["candidate_generator"] = [
5039
"AssistedCandidateGenerator",
5140
"CandidateGenerator",
@@ -131,8 +120,6 @@
131120
except OptionalDependencyNotAvailable:
132121
pass
133122
else:
134-
from .beam_constraints import Constraint, ConstraintListState, DisjunctiveConstraint, PhrasalConstraint
135-
from .beam_search import BeamHypotheses, BeamScorer, ConstrainedBeamSearchScorer
136123
from .candidate_generator import (
137124
AssistedCandidateGenerator,
138125
CandidateGenerator,

0 commit comments

Comments
 (0)