Skip to content

Commit cefe957

Browse files
committed
finish pre-commit
Signed-off-by: scutizhang <scutizhang@tencent.com>
1 parent 983ba3f commit cefe957

File tree

6 files changed

+23
-17
lines changed

6 files changed

+23
-17
lines changed

cpp/include/tensorrt_llm/batch_manager/llmRequest.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,10 +1670,11 @@ class GenericLlmRequest
16701670
[[nodiscard]] bool isFinishedNormal() const noexcept
16711671
{
16721672
return std::all_of(mFinishReasons.begin(), mFinishReasons.end(),
1673-
[](auto reason) {
1674-
return reason == executor::FinishReason::kEND_ID || \
1675-
reason == executor::FinishReason::kSTOP_WORDS || \
1676-
reason == executor::FinishReason::kLENGTH; });
1673+
[](auto reason)
1674+
{
1675+
return reason == executor::FinishReason::kEND_ID || reason == executor::FinishReason::kSTOP_WORDS
1676+
|| reason == executor::FinishReason::kLENGTH;
1677+
});
16771678
}
16781679

16791680
[[nodiscard]] bool isTimedOut() const

tensorrt_llm/_torch/pyexecutor/kv_cache_connector.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ def update_state_after_alloc(self, request: LlmRequest,
233233
request: The request that was allocated resources.
234234
block_ids: The KV cacheblock IDs that were allocated.
235235
"""
236-
236+
237237
def wait_for_initialization(self):
238238
"""
239239
Some connectors need to wait for some resources to be initialized.
@@ -580,4 +580,4 @@ def layer_post_hook(self, module, *args):
580580

581581
def wait_for_initialization(self):
582582
if self.scheduler is not None:
583-
self.scheduler.wait_for_initialization()
583+
self.scheduler.wait_for_initialization()

tensorrt_llm/_torch/pyexecutor/py_executor.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ def _maybe_init_kv_connector_manager(self):
338338
self.kv_connector_manager.layer_pre_hook)
339339
module.register_forward_hook(
340340
self.kv_connector_manager.layer_post_hook)
341-
341+
342342
self.kv_connector_manager.wait_for_initialization()
343343

344344
def _event_loop_wrapper(self):
@@ -1332,10 +1332,10 @@ def _executor_loop(self):
13321332
finished_requests = []
13331333

13341334
can_queue = self._can_queue(scheduled_batch)
1335-
1335+
13361336
if self.kv_connector_manager:
13371337
self.kv_connector_manager.handle_metadata()
1338-
1338+
13391339
if can_queue:
13401340
if self.kv_cache_transceiver:
13411341
# For generation requests which have completed KV cache transfer
@@ -1568,7 +1568,7 @@ def _executor_loop_overlap(self):
15681568

15691569
if self.kv_connector_manager:
15701570
self.kv_connector_manager.handle_metadata()
1571-
1571+
15721572
can_queue = self._can_queue(scheduled_batch)
15731573
if can_queue:
15741574
if self.kv_cache_transceiver:
@@ -2617,7 +2617,7 @@ def _handle_responses(self):
26172617
self.ctx_in_transmission_counter))
26182618
else:
26192619
requests_to_terminate.append(request)
2620-
2620+
26212621
if self.kv_connector_manager is not None:
26222622
self.resource_manager.free_slot_only(request)
26232623
else:

tensorrt_llm/_torch/pyexecutor/resource_manager.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1440,10 +1440,12 @@ def free_slot_only(self, request: LlmRequest):
14401440
This is used to release the slot early when decode finishes, before
14411441
the put task completes.
14421442
"""
1443-
seq_slot_manager = self.get_resource_manager(ResourceManagerType.SEQ_SLOT_MANAGER)
1443+
seq_slot_manager = self.get_resource_manager(
1444+
ResourceManagerType.SEQ_SLOT_MANAGER)
14441445
if seq_slot_manager is not None:
14451446
seq_slot_manager.free_resources(request)
14461447

1448+
14471449
class PeftCacheManager(BaseResourceManager):
14481450

14491451
def __init__(self,

tests/integration/defs/conftest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ def llm_models_root() -> str:
9292

9393
return str(root)
9494

95+
9596
def tests_path() -> Path:
9697
return (Path(os.path.dirname(__file__)) / "../..").resolve()
9798

tests/integration/defs/llmapi/test_llm_api_connector.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -443,8 +443,8 @@ def test_connector_multi_request(enforce_single_worker, model_with_connector):
443443

444444
@pytest.mark.threadleak(enabled=False)
445445
@pytest.mark.parametrize("matched_tokens", [0, 32])
446-
def test_connector_num_matched_tokens(enforce_single_worker, model_with_connector,
447-
matched_tokens):
446+
def test_connector_num_matched_tokens(enforce_single_worker,
447+
model_with_connector, matched_tokens):
448448
"""Test setNumConnectorMatchedTokens (set) and num_connector_matched_tokens (get)."""
449449
NUM_INPUT_TOKENS = 64
450450
NUM_OUTPUT_TOKENS = 8
@@ -455,7 +455,9 @@ def test_connector_num_matched_tokens(enforce_single_worker, model_with_connecto
455455
scheduler.get_num_new_matched_tokens.return_value = matched_tokens, False
456456
worker.get_finished.return_value = [], []
457457

458-
model.generate([1] * NUM_INPUT_TOKENS, SamplingParams(max_tokens=NUM_OUTPUT_TOKENS, ignore_eos=True))
458+
model.generate([1] * NUM_INPUT_TOKENS,
459+
SamplingParams(max_tokens=NUM_OUTPUT_TOKENS,
460+
ignore_eos=True))
459461

460462
# Get request before setNumConnectorMatchedTokens is called
461463
request_before = scheduler.get_num_new_matched_tokens.call_args.args[0]
@@ -467,11 +469,11 @@ def test_connector_num_matched_tokens(enforce_single_worker, model_with_connecto
467469

468470
# Test get: verify property exists and can be accessed
469471
assert hasattr(request_after, 'num_connector_matched_tokens')
470-
472+
471473
# Test set: verify value is correctly set
472474
assert final_value == matched_tokens, \
473475
f"Expected {matched_tokens}, got {final_value}"
474-
476+
475477
# Verify set worked (value changed when matched_tokens != 0)
476478
if matched_tokens != 0:
477479
assert final_value != initial_value

0 commit comments

Comments
 (0)