Merge branch 'hotfix-2056' into user/perkzz/trtllm-gen-fmha-headim-256

yzh119 · yzh119 · commit 499e543ffd68 · 2025-11-24T00:35:08.000-08:00
diff --git a/tests/comm/test_trtllm_mnnvl_allreduce_custom_comm.py b/tests/comm/test_trtllm_mnnvl_allreduce_custom_comm.py
@@ -250,7 +250,7 @@ def test_mnnvl_allreduce_custom_communicator(
 
     available_gpus = torch.cuda.device_count()
     if world_size > available_gpus:
-        raise ValueError(
+        pytest.skip(
             f"world_size {world_size} is greater than available_gpus {available_gpus}"
         )
     print(f"Running test for world_size={world_size}")

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ def test_mnnvl_allreduce_custom_communicator(`
`250`	`250`
`251`	`251`	`available_gpus = torch.cuda.device_count()`
`252`	`252`	`if world_size > available_gpus:`
`253`		`- raise ValueError(`
	`253`	`+ pytest.skip(`
`254`	`254`	`f"world_size {world_size} is greater than available_gpus {available_gpus}"`
`255`	`255`	`)`
`256`	`256`	`print(f"Running test for world_size={world_size}")`