Unverified Commit db8e52f2 authored by Yan Ru Pei's avatar Yan Ru Pei Committed by GitHub
Browse files

fix: correct prefill/decode block defaults when no overlaps (#3811)


Signed-off-by: default avatarPeaBrane <yanrpei@gmail.com>
parent 87ea346d
...@@ -826,25 +826,29 @@ impl ActiveSequencesMultiWorker { ...@@ -826,25 +826,29 @@ impl ActiveSequencesMultiWorker {
let token_sequence_shared = token_sequence.map(Arc::new); let token_sequence_shared = token_sequence.map(Arc::new);
let mut receivers = Vec::new(); let mut receivers = Vec::new();
// Iterate through overlaps to process each WorkerWithDpRank // Iterate through all workers, not just those with overlap
for (worker, overlap) in overlaps.scores.iter() { // This ensures we properly account for active tokens/blocks on all workers
// Check if the worker has a sender for sender_entry in self.senders.iter() {
if let Some(sender) = self.senders.get(worker) { let worker = *sender_entry.key();
let (resp_tx, resp_rx) = tokio::sync::oneshot::channel(); let sender = sender_entry.value();
receivers.push((*worker, resp_rx));
// Get overlap for this worker (defaults to 0 if not in overlaps)
if let Err(e) = sender.send(UpdateSequences::PotentialBlocksAndTokens { let overlap = *overlaps.scores.get(&worker).unwrap_or(&0);
token_sequence: token_sequence_shared.clone(),
isl, let (resp_tx, resp_rx) = tokio::sync::oneshot::channel();
overlap: *overlap, receivers.push((worker, resp_rx));
resp_tx,
}) { if let Err(e) = sender.send(UpdateSequences::PotentialBlocksAndTokens {
tracing::error!( token_sequence: token_sequence_shared.clone(),
"Failed to send potential_tokens command to worker {:?}: {}", isl,
worker, overlap,
e resp_tx,
); }) {
} tracing::error!(
"Failed to send potential_tokens command to worker {:?}: {}",
worker,
e
);
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment