Skip to content

[https://nvbugs/6341070][fix] Fix scaffolding MajorityVoteController output handling #15925

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

Open
KleinBlueC wants to merge 2 commits into
base: main
Choose a base branch
from
+1 −10
Open

[https://nvbugs/6341070][fix] Fix scaffolding MajorityVoteController output handling #15925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66e2b45
[None][fix] Fix AttributeError in MajorityVoteController.process
KleinBlueC Jul 3, 2026
c5b95a4
[NVBUG/6341070][fix] Re-enable scaffolding tests fixed by MajorityVot…
KleinBlueC Jul 3, 2026
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
2 changes: 1 addition & 1 deletion tensorrt_llm/scaffolding/controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ def process(self,

assert isinstance(majority_answer, str), "majority_vote failed"
# The task returned by majority vote does not have output_tokens and logits.
tasks[0].result = tasks_list[majority_index][0].result
tasks[0].output_str = tasks_list[majority_index][0].output_str

def majority_vote(self, candidates_tasks: List[List[Task]],
**kwargs) -> Tuple[int, str]:
Expand Down
7 changes: 0 additions & 7 deletions tests/unittest/scaffolding/test_scaffolding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
# autoflake: skip_file

import pytest
from scaffolding.test_worker import (create_trtllm_worker,
deepseek_distill_7b_path, default_prompt)

from tensorrt_llm.scaffolding import (MajorityVoteController,
NativeGenerationController,
ScaffoldingLlm)

_SCAFFOLDING_EXECUTOR_NVBUG = pytest.mark.skip(reason="https://nvbugs/6341070")


def create_scaffolding_llm_with_native_generation_controller(
deepseek_distill_7b_path):
Expand Down Expand Up @@ -48,7 +45,6 @@ def create_scaffolding_llm_with_majority_vote_controller(
return llm


@_SCAFFOLDING_EXECUTOR_NVBUG
def test_unbatched_scaffolding_sync(default_prompt, deepseek_distill_7b_path):
scaffolding_llm = create_scaffolding_llm_with_native_generation_controller(
deepseek_distill_7b_path)
Expand All @@ -58,7 +54,6 @@ def test_unbatched_scaffolding_sync(default_prompt, deepseek_distill_7b_path):
scaffolding_llm.shutdown(shutdown_workers=True)


@_SCAFFOLDING_EXECUTOR_NVBUG
def test_batched_scaffolding_sync(default_prompt, deepseek_distill_7b_path):
scaffolding_llm = create_scaffolding_llm_with_native_generation_controller(
deepseek_distill_7b_path)
Expand All @@ -72,7 +67,6 @@ def test_batched_scaffolding_sync(default_prompt, deepseek_distill_7b_path):
scaffolding_llm.shutdown(shutdown_workers=True)


@_SCAFFOLDING_EXECUTOR_NVBUG
def test_async_scaffolding_generation(default_prompt, deepseek_distill_7b_path):

async def run_async_test():
Expand All @@ -88,7 +82,6 @@ async def run_async_test():
asyncio.run(run_async_test())


@_SCAFFOLDING_EXECUTOR_NVBUG
def test_majority_vote(default_prompt, deepseek_distill_7b_path):
scaffolding_llm = create_scaffolding_llm_with_majority_vote_controller(
deepseek_distill_7b_path, samples_num=3)
Expand Down
2 changes: 0 additions & 2 deletions tests/unittest/scaffolding/test_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
from llmapi.test_llm import get_model_path

_SCAFFOLDING_EXECUTOR_NVBUG = pytest.mark.skip(reason="https://nvbugs/6341070")
_SCAFFOLDING_MCP_NVBUG = pytest.mark.skip(reason="https://nvbugs/6337229")
_TRTOAI_PROCESSPOOL_NVBUG = pytest.mark.skip(reason="https://nvbugs/6341072")

Expand Down Expand Up @@ -98,7 +97,6 @@ def create_trtllm_worker(model_path):
return TRTLLMWorker.init_with_new_llm(str(model_path), backend="pytorch")


@_SCAFFOLDING_EXECUTOR_NVBUG
def test_trtllm_worker_generation(default_prompt, deepseek_distill_7b_path):
worker = create_trtllm_worker(deepseek_distill_7b_path)
task = GenerationTask.create_from_prompt(default_prompt)
Expand Down