Skip to content

[None][chore] Remove is_disaggregated param in executor request queue #9049

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
merged 1 commit into from
Nov 12, 2025
Merged

[None][chore] Remove is_disaggregated param in executor request queue #9049

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
3 changes: 1 addition & 2 deletions tensorrt_llm/_torch/pyexecutor/executor_request_queue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class ExecutorRequestQueue:
def __init__(self, dist: Distributed, enable_attention_dp: bool,
max_batch_size: int, max_beam_width: int,
max_num_active_requests: int, enable_iter_perf_stats: bool,
batch_wait_timeout_ms: float, is_disaggregated: bool):
batch_wait_timeout_ms: float):
self.dist = dist
self.request_queue: queue.Queue[RequestQueueItem] = queue.Queue()
self.waiting_queue: deque[RequestQueueItem] = deque()
Expand All @@ -59,7 +59,6 @@ def __init__(self, dist: Distributed, enable_attention_dp: bool,
self.max_batch_size = max_batch_size
self.max_beam_width = max_beam_width
self.max_num_active_requests = max_num_active_requests
self.is_disaggregated = is_disaggregated
self.enqueue_lock = threading.Lock()
self.next_request_id = max_batch_size
self.enable_iter_perf_stats = enable_iter_perf_stats
Expand Down
1 change: 0 additions & 1 deletion tensorrt_llm/_torch/pyexecutor/py_executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,6 @@ def __init__(self,
max_num_active_requests=self.max_num_active_requests,
enable_iter_perf_stats=self.enable_iter_perf_stats,
batch_wait_timeout_ms=self.batch_wait_timeout_ms,
is_disaggregated=kv_cache_transceiver is not None,
)
self.executor_request_queue.set_exclude_last_generation_logits(
self.disable_overlap_scheduler, self.dist.pp_size)
Expand Down
19 changes: 6 additions & 13 deletions tests/unittest/_torch/executor/test_executor_request_queue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ def executor_queue(mock_dist):
max_beam_width=1,
max_num_active_requests=16,
enable_iter_perf_stats=True,
batch_wait_timeout_ms=0.0,
is_disaggregated=False)
batch_wait_timeout_ms=0.0)


@pytest.fixture
Expand All @@ -55,8 +54,7 @@ def integration_queue(mock_dist):
max_beam_width=2,
max_num_active_requests=8,
enable_iter_perf_stats=True,
batch_wait_timeout_ms=0.0,
is_disaggregated=False)
batch_wait_timeout_ms=0.0)


def test_executor_queue_init(executor_queue, mock_dist):
Expand All @@ -65,7 +63,6 @@ def test_executor_queue_init(executor_queue, mock_dist):
assert not executor_queue.enable_attention_dp
assert executor_queue.max_beam_width == 1
assert executor_queue.max_num_active_requests == 16
assert not executor_queue.is_disaggregated
assert executor_queue.next_request_id == 8
assert executor_queue.enable_iter_perf_stats
assert executor_queue.active
Expand Down Expand Up @@ -124,8 +121,7 @@ def test_merge_helix_requests_with_padding(mock_dist):
max_beam_width=1,
max_num_active_requests=16,
enable_iter_perf_stats=True,
batch_wait_timeout_ms=0.0,
is_disaggregated=True)
batch_wait_timeout_ms=0.0)

# Mock _should_exclude_last_generation_logits.
with patch.object(executor_queue,
Expand Down Expand Up @@ -181,8 +177,7 @@ def test_merge_helix_requests_without_padding(mock_dist):
max_beam_width=1,
max_num_active_requests=16,
enable_iter_perf_stats=True,
batch_wait_timeout_ms=0.0,
is_disaggregated=True)
batch_wait_timeout_ms=0.0)

# Mock _should_exclude_last_generation_logits.
with patch.object(executor_queue,
Expand Down Expand Up @@ -235,8 +230,7 @@ def test_merge_helix_requests_insufficient_blocks_error(mock_dist):
max_beam_width=1,
max_num_active_requests=16,
enable_iter_perf_stats=True,
batch_wait_timeout_ms=0.0,
is_disaggregated=True)
batch_wait_timeout_ms=0.0)

with pytest.raises(
ValueError,
Expand Down Expand Up @@ -598,8 +592,7 @@ def attention_dp_queue(mock_dist_attention_dp):
max_beam_width=2,
max_num_active_requests=8,
enable_iter_perf_stats=True,
batch_wait_timeout_ms=0.0,
is_disaggregated=False)
batch_wait_timeout_ms=0.0)
# Initialize all_ranks_num_active_requests
return queue

Expand Down
Loading