Skip to content

Commit 44d4367

Browse files
committed
fix ci
1 parent 86c539b commit 44d4367

4 files changed

Lines changed: 12 additions & 10 deletions

File tree

fastdeploy/worker/gpu_model_runner.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2957,9 +2957,8 @@ def _get_prompt_logprobs_list(
29572957
raw_logprobs = self.sampler.compute_logprobs(logits)
29582958
elif logprobs_mode == "raw_logits":
29592959
raw_logprobs = logits
2960-
token_ids, logprobs, ranks = self.sampler.gather_logprobs(
2961-
raw_logprobs, num_prompt_logprobs, prompt_token_ids_tensor
2962-
)
2960+
gathered = self.sampler.gather_logprobs(raw_logprobs, num_prompt_logprobs, prompt_token_ids_tensor)
2961+
token_ids, logprobs, ranks = gathered.logprob_token_ids, gathered.logprobs, gathered.selected_token_ranks
29632962
# Synchronize before using token_ids, logprobs and ranks to ensure async copy are completed.
29642963
paddle.device.synchronize()
29652964
chunk_slice = slice(start_idx, start_idx + num_logits)

fastdeploy/worker/metax_model_runner.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2833,9 +2833,8 @@ def _get_prompt_logprobs_list(
28332833
raw_logprobs = self.sampler.compute_logprobs(logits)
28342834
elif logprobs_mode == "raw_logits":
28352835
raw_logprobs = logits
2836-
token_ids, logprobs, ranks = self.sampler.gather_logprobs(
2837-
raw_logprobs, num_prompt_logprobs, prompt_token_ids_tensor
2838-
)
2836+
gathered = self.sampler.gather_logprobs(raw_logprobs, num_prompt_logprobs, prompt_token_ids_tensor)
2837+
token_ids, logprobs, ranks = gathered.logprob_token_ids, gathered.logprobs, gathered.selected_token_ranks
28392838
chunk_slice = slice(start_idx, start_idx + num_logits)
28402839
logprobs_tensors.logprob_token_ids[chunk_slice].copy_(token_ids, False)
28412840
logprobs_tensors.logprobs[chunk_slice].copy_(logprobs, False)

fastdeploy/worker/xpu_model_runner.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,8 @@ def _get_prompt_logprobs_list(self, hidden_states: paddle.Tensor) -> list[Option
271271
raw_logprobs = logits
272272
else:
273273
raw_logprobs = self.sampler.compute_logprobs(logits)
274-
token_ids, logprobs, ranks = self.sampler.gather_logprobs(
275-
raw_logprobs, num_prompt_logprobs, prompt_token_ids_tensor
276-
)
274+
gathered = self.sampler.gather_logprobs(raw_logprobs, num_prompt_logprobs, prompt_token_ids_tensor)
275+
token_ids, logprobs, ranks = gathered.logprob_token_ids, gathered.logprobs, gathered.selected_token_ranks
277276
chunk_slice = slice(start_idx, start_idx + num_logits)
278277
logprobs_tensors.logprob_token_ids[chunk_slice].copy_(token_ids, False)
279278
logprobs_tensors.logprobs[chunk_slice].copy_(logprobs, False)

tests/worker/test_gpu_prompt_logprobs.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,14 @@ def test_prompt_logprobs(self):
206206
ref_raw_logprobs = model_runner.sampler.compute_logprobs(ref_logits)
207207
token_is = paddle.to_tensor(req.prompt_token_ids[1:], dtype="int64")
208208

209-
ref_token_ids, ref_logprobs, ref_ranks = model_runner.sampler.gather_logprobs(
209+
gathered = model_runner.sampler.gather_logprobs(
210210
ref_raw_logprobs, model_runner.fd_config.model_config.ori_vocab_size, token_is
211211
)
212+
ref_token_ids, ref_logprobs, ref_ranks = (
213+
gathered.logprob_token_ids,
214+
gathered.logprobs,
215+
gathered.selected_token_ranks,
216+
)
212217
prompt_logprobs = model_runner._get_prompt_logprobs_list(hidden_states)[0]
213218
np.testing.assert_allclose(ref_logprobs.numpy(), prompt_logprobs.logprobs.numpy(), rtol=1e-04, atol=1e-04)
214219
np.testing.assert_allclose(

0 commit comments

Comments
 (0)