Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ def apply_penalty_multi_scores(
presence_penalties,
temperature,
bad_words_token_ids,
bad_words_token_len,
step_idx,
min_dec_lens,
eos_token_ids,
Expand Down
14 changes: 6 additions & 8 deletions fastdeploy/worker/metax_model_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -717,12 +717,12 @@ def insert_tasks_v1(self, req_dicts: List[Request], num_running_requests: int =

if request.get("bad_words_token_ids") is not None and len(request.get("bad_words_token_ids")) > 0:
bad_words_len = len(request.get("bad_words_token_ids"))
self.share_inputs["bad_tokens_len"][idx : idx + 1] = bad_words_len
self.share_inputs["bad_tokens_len"][idx] = bad_words_len
self.share_inputs["bad_tokens"][idx : idx + 1, :bad_words_len] = np.array(
request.get("bad_words_token_ids"), dtype="int64"
)
else:
self.share_inputs["bad_tokens_len"][idx : idx + 1] = 1
self.share_inputs["bad_tokens_len"][idx] = 1
self.share_inputs["bad_tokens"][idx : idx + 1, :] = np.array([-1], dtype="int64")

if request.get("stop_token_ids") is not None and request.get("stop_seqs_len") is not None:
Expand Down Expand Up @@ -940,12 +940,12 @@ def get_attr_from_request(request, attr, default_value=None):

if request.get("bad_words_token_ids") is not None and len(request.get("bad_words_token_ids")) > 0:
bad_words_len = len(request.get("bad_words_token_ids"))
self.share_inputs["bad_tokens_len"][idx : idx + 1] = bad_words_len
self.share_inputs["bad_tokens_len"][idx] = bad_words_len
self.share_inputs["bad_tokens"][idx : idx + 1, :bad_words_len] = np.array(
request.get("bad_words_token_ids"), dtype="int64"
)
else:
self.share_inputs["bad_tokens_len"][idx : idx + 1] = 1
self.share_inputs["bad_tokens_len"][idx] = 1
self.share_inputs["bad_tokens"][idx : idx + 1, :] = np.array([-1], dtype="int64")

if request.get("stop_token_ids") is not None and request.get("stop_seqs_len") is not None:
Expand Down Expand Up @@ -1382,9 +1382,6 @@ def _prepare_inputs(self, is_dummy_or_profile_run=False) -> None:
self.share_inputs["output_cum_offsets"].copy_(output_cum_offsets, False)
self.share_inputs["output_padding_offset"].copy_(output_padding_offset, False)

# Update bad tokens len
max_bad_tokens_len = np.max(self.share_inputs["bad_tokens_len"].numpy())

# Initialize forward meta data
self.initialize_forward_meta(is_dummy_or_profile_run=is_dummy_or_profile_run)

Expand All @@ -1405,7 +1402,8 @@ def _prepare_inputs(self, is_dummy_or_profile_run=False) -> None:
presence_penalties=self.share_inputs["presence_score"],
repetition_penalties=self.share_inputs["penalty_score"],
min_dec_lens=self.share_inputs["min_dec_len"],
bad_words_token_ids=self.share_inputs["bad_tokens"][:, :max_bad_tokens_len],
bad_words_token_ids=self.share_inputs["bad_tokens"],
bad_words_token_len=self.share_inputs["bad_tokens_len"],
eos_token_ids=self.share_inputs["eos_token_id"],
max_num_logprobs=self.max_logprobs,
enable_early_stop=self.enable_early_stop,
Expand Down
Loading