diff --git a/tests/utils.py b/tests/utils.py index e8fd3f1e8152..da122458c033 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1557,16 +1557,18 @@ def wrapper(*args: _P.args, **kwargs: _P.kwargs) -> None: ) if result.returncode != 0: - # Read traceback written by child, fall back to stderr - tb = "" + # Read traceback written by child; stderr is shown separately + tb = "(no traceback file written)" if os.path.exists(tb_file) and os.path.getsize(tb_file) > 0: with open(tb_file) as fp: tb = fp.read() - else: - tb = result.stderr.decode() + stdout = result.stdout.decode(errors="replace") + stderr = result.stderr.decode(errors="replace") raise RuntimeError( f"Test subprocess '{f.__name__}' failed " f"(exit code {result.returncode}):\n{tb}" + f"\n=== child stdout ===\n{stdout}" + f"\n=== child stderr ===\n{stderr}" ) finally: with contextlib.suppress(OSError): diff --git a/vllm/compilation/compiler_interface.py b/vllm/compilation/compiler_interface.py index 933554faa280..784d06b4d86b 100644 --- a/vllm/compilation/compiler_interface.py +++ b/vllm/compilation/compiler_interface.py @@ -141,6 +141,7 @@ class AlwaysHitShapeEnv: def __init__(self) -> None: self.guards: list[Any] = [] + self.var_to_hint_override: dict[Any, int] = {} def evaluate_guards_expression(self, *args: Any, **kwargs: Any) -> Literal[True]: return True