From 0370b0fedae680de55460b9e09ce761512021163 Mon Sep 17 00:00:00 2001 From: drbh Date: Wed, 28 Feb 2024 19:54:46 +0000 Subject: [PATCH] fix: simplify changes --- benchmark/src/lib.rs | 1 - proto/generate.proto | 2 -- router/client/src/client.rs | 1 - router/src/health.rs | 1 - router/src/queue.rs | 1 - router/src/validation.rs | 1 - server/text_generation_server/utils/tokens.py | 6 +++--- 7 files changed, 3 insertions(+), 10 deletions(-) diff --git a/benchmark/src/lib.rs b/benchmark/src/lib.rs index 034c056c..638c6514 100644 --- a/benchmark/src/lib.rs +++ b/benchmark/src/lib.rs @@ -47,7 +47,6 @@ pub async fn run( watermark, grammar: String::new(), grammar_type: GrammarType::None as i32, - grammar_state: 0, }; // Initialize terminal properties diff --git a/proto/generate.proto b/proto/generate.proto index 59bf253e..6351e37f 100644 --- a/proto/generate.proto +++ b/proto/generate.proto @@ -80,8 +80,6 @@ message NextTokenChooserParameters { string grammar = 10; /// grammar type GrammarType grammar_type = 11; - /// grammar fsm state - uint32 grammar_state = 12; } message StoppingCriteriaParameters { diff --git a/router/client/src/client.rs b/router/client/src/client.rs index a8f7a499..f8658318 100644 --- a/router/client/src/client.rs +++ b/router/client/src/client.rs @@ -130,7 +130,6 @@ impl Client { watermark: true, grammar: String::new(), grammar_type: GrammarType::None as i32, - grammar_state: 0, }), stopping_parameters: Some(StoppingCriteriaParameters { max_new_tokens: max_total_tokens - truncate, diff --git a/router/src/health.rs b/router/src/health.rs index 8e5cbf02..b05b3094 100644 --- a/router/src/health.rs +++ b/router/src/health.rs @@ -48,7 +48,6 @@ impl Health { watermark: false, grammar: String::new(), grammar_type: ProtoGrammarType::None as i32, - grammar_state: 0, }), stopping_parameters: Some(StoppingCriteriaParameters { max_new_tokens: 1, diff --git a/router/src/queue.rs b/router/src/queue.rs index 69d0aba8..52ea16ca 100644 --- a/router/src/queue.rs +++ b/router/src/queue.rs @@ -372,7 +372,6 @@ mod tests { watermark: false, grammar: String::new(), grammar_type: ProtoGrammarType::None as i32, - grammar_state: 0, }, stopping_parameters: StoppingCriteriaParameters { ignore_eos_token: false, diff --git a/router/src/validation.rs b/router/src/validation.rs index f829395f..204dbf92 100644 --- a/router/src/validation.rs +++ b/router/src/validation.rs @@ -356,7 +356,6 @@ impl Validation { watermark, grammar, grammar_type, - grammar_state: 0, }; let stopping_parameters = StoppingCriteriaParameters { max_new_tokens, diff --git a/server/text_generation_server/utils/tokens.py b/server/text_generation_server/utils/tokens.py index c64d2664..7c8a18f0 100644 --- a/server/text_generation_server/utils/tokens.py +++ b/server/text_generation_server/utils/tokens.py @@ -468,8 +468,6 @@ class HeterogeneousNextTokenChooser: tokenizer: PreTrainedTokenizerBase, fsm_grammar_states: Optional[List[int]] = None, ) -> "HeterogeneousNextTokenChooser": - if fsm_grammar_states is None: - fsm_grammar_states = [pb_.grammar_state for pb_ in pb] return HeterogeneousNextTokenChooser( watermark=[pb_.watermark for pb_ in pb], temperature=[pb_.temperature for pb_ in pb], @@ -485,7 +483,9 @@ class HeterogeneousNextTokenChooser: tokenizer=tokenizer, grammars=[pb_.grammar for pb_ in pb], grammar_types=[pb_.grammar_type for pb_ in pb], - fsm_grammar_states=fsm_grammar_states, + fsm_grammar_states=( + fsm_grammar_states if fsm_grammar_states else [0] * len(pb) + ), )