Skip to content

Commit cf1c044

Browse files
more tests passing
Signed-off-by: Lucas Wilkinson <[email protected]>
1 parent 9cbb5a5 commit cf1c044

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed

tests/v1/core/test_scheduler.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -818,9 +818,6 @@ def test_schedule_spec_decoding_stats(spec_tokens, output_tokens, expected):
818818
scheduler_stats = engine_core_outputs[0].scheduler_stats \
819819
if engine_core_outputs else None
820820

821-
822-
print("engine_core_outputs", engine_core_outputs)
823-
824821
if expected[0] == 0:
825822
assert scheduler_stats.spec_decoding_stats is None
826823
else:

vllm/v1/core/sched/scheduler.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -668,8 +668,7 @@ def _try_schedule_encoder_inputs(
668668
num_new_tokens = start_pos - num_computed_tokens
669669
break
670670

671-
if (not self.encoder_cache_manager.can_allocate(request, i)
672-
or num_encoder_tokens > encoder_budget):
671+
if num_encoder_tokens > encoder_budget:
673672
# The encoder cache is full or the encoder budget is exhausted.
674673
# NOTE(woosuk): We assume that the encoder input tokens should
675674
# be processed altogether, as the encoder usually uses

vllm/v1/request.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -137,15 +137,15 @@ def __getattribute__(self, name: str) -> Any:
137137
return object.__getattribute__(self, name)
138138

139139
def append_output_token_ids(
140-
self,
141-
token_ids: Union[int, list[int]],
142-
) -> None:
143-
if isinstance(token_ids, int):
144-
self._output_token_ids.append(token_ids)
145-
self._all_token_ids.append(token_ids)
146-
else:
147-
self._output_token_ids.extend(token_ids)
148-
self._all_token_ids.extend(token_ids)
140+
self,
141+
token_ids: Union[int, list[int]],
142+
) -> None:
143+
if isinstance(token_ids, int):
144+
self._output_token_ids.append(token_ids)
145+
self._all_token_ids.append(token_ids)
146+
else:
147+
self._output_token_ids.extend(token_ids)
148+
self._all_token_ids.extend(token_ids)
149149

150150
@property
151151
def num_tokens(self) -> int:

0 commit comments

Comments
 (0)