Skip to content

[0.13.0][CI]fix for CI lint #6093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wangxiyuan merged 1 commit into from
Jan 21, 2026
Merged

[0.13.0][CI]fix for CI lint #6093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 23 additions & 18 deletions vllm_ascend/distributed/kvpool/pool_scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,13 +162,14 @@ def build_connector_meta(
self._request_trackers.pop(finished_req_id, None)
self._unfinished_requests.pop(finished_req_id, None)
self._unfinished_request_ids.discard(finished_req_id)

for req_id in scheduler_output.preempted_req_ids:
self._preempted_req_ids.update(scheduler_output.preempted_req_ids)
self._request_trackers.pop(req_id, None)
self._unfinished_requests.pop(req_id, None)

meta = AscendConnectorMetadata(self._unfinished_request_ids, scheduler_output.preempted_req_ids)
meta = AscendConnectorMetadata(self._unfinished_request_ids,
scheduler_output.preempted_req_ids)

for request in scheduler_output.scheduled_new_reqs:
# Right now, we only load KV for new requests
Expand All @@ -183,17 +184,17 @@ def build_connector_meta(
else:
unfolded_block_ids = request.block_ids[0].copy()
request_tracker = RequestTracker(
req_id=request.req_id,
token_len=num_tokens_to_compute,
allocated_block_ids=unfolded_block_ids,
num_saved_tokens=0,
)
req_id=request.req_id,
token_len=num_tokens_to_compute,
allocated_block_ids=unfolded_block_ids,
num_saved_tokens=0,
)
self._request_trackers[request.req_id] = request_tracker
last_chunk_tokens_num = ((len(request.prompt_token_ids) //
self._block_size * self._block_size)
if self._discard_partial_chunks else len(
request.prompt_token_ids))

req_meta = ReqMeta.from_request_tracker(
request_tracker,
self._block_size,
Expand Down Expand Up @@ -233,10 +234,11 @@ def build_connector_meta(
num_saved_tokens=0,
)
self._request_trackers[req_id] = request_tracker
last_chunk_tokens_num = ((len(request_real.prompt_token_ids) //
self._block_size * self._block_size)
if self._discard_partial_chunks else len(
request_real.prompt_token_ids))
last_chunk_tokens_num = (
(len(request_real.prompt_token_ids) //
self._block_size *
self._block_size) if self._discard_partial_chunks else
len(request_real.prompt_token_ids))
req_meta = ReqMeta.from_request_tracker(
request_tracker,
self._block_size,
Expand All @@ -247,17 +249,19 @@ def build_connector_meta(
>= last_chunk_tokens_num,
discard_partial_chunks=self._discard_partial_chunks,
)

# decode/chunked request
else:
request_tracker = self._request_trackers[req_id]
num_new_tokens = scheduler_output.num_scheduled_tokens[req_id]
num_new_tokens = scheduler_output.num_scheduled_tokens[
req_id]
req_tuple = self._unfinished_requests.get(req_id)
if req_tuple:
request = req_tuple[0]
num_current_tokens = request_tracker.token_len
new_token_ids = request.all_token_ids[
num_current_tokens:num_current_tokens + num_new_tokens]
num_current_tokens:num_current_tokens +
num_new_tokens]
request_tracker.token_len += len(new_token_ids)
else:
raise ValueError(
Expand All @@ -269,9 +273,10 @@ def build_connector_meta(
request_tracker.update(new_block_ids)

last_chunk_tokens_num = ((len(request.prompt_token_ids) //
self._block_size * self._block_size)
if self._discard_partial_chunks else
len(request.prompt_token_ids))
self._block_size *
self._block_size) if
self._discard_partial_chunks else
len(request.prompt_token_ids))
req_meta = ReqMeta.from_request_tracker(
request_tracker,
self._block_size,
Expand Down
11 changes: 7 additions & 4 deletions vllm_ascend/distributed/kvpool/pool_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,11 +461,13 @@ def store_layer(
for layer_id in range(self.num_layers):
yield

def get_finished(self,
finished_req_ids: set[str], meta:AscendConnectorMetadata) -> tuple[set[str], set[str]]:
def get_finished(
self, finished_req_ids: set[str],
meta: AscendConnectorMetadata) -> tuple[set[str], set[str]]:
done_sending = (
self.get_and_clear_finished_requests(
finished_req_ids, meta # type: ignore[union-attr]
finished_req_ids,
meta # type: ignore[union-attr]
Comment on lines +469 to +470
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot Jan 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

high: Consistent formatting improves readability. Add a line break after the first argument to align with the formatting used elsewhere in the file.

            self.get_and_clear_finished_requests(
                finished_req_ids,
                meta  # type: ignore[union-attr]

) if self.kv_role in ['kv_producer', 'kv_both']
or self.consumer_is_to_put else set())

Expand All @@ -480,7 +482,8 @@ def get_finished(self,
self.tp_rank)
return done_sending, done_recving

def get_and_clear_finished_requests(self, finished_req_ids, meta:AscendConnectorMetadata) -> set[str]:
def get_and_clear_finished_requests(
self, finished_req_ids, meta: AscendConnectorMetadata) -> set[str]:
finished_sending = set()
for req_id in meta.preempted_req_ids:
self.kv_send_thread.delete_finished_stored_request( # type: ignore[union-attr]
Expand Down
Loading