Skip to content

Commit a9d1c08

Browse files
committed
fix conflict
Signed-off-by: Dylan Chen <[email protected]>
1 parent 4846074 commit a9d1c08

File tree

1 file changed

+41
-5
lines changed

1 file changed

+41
-5
lines changed

tests/unittest/_torch/speculative/test_eagle3.py

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,56 @@ def enforce_single_worker(monkeypatch):
2929
[True, "TRTLLM", True, False, False, False, True, False, False, False],
3030
[True, "TRTLLM", True, False, False, False, False, False, False, False],
3131
[False, "TRTLLM", True, False, False, False, True, False, False, False],
32-
[False, "TRTLLM", True, False, False, False, False, False, False, False],
33-
[True, "FLASHINFER", True, False, False, False, True, False, False, False],
34-
[False, "FLASHINFER", True, False, False, False, True, False, False, False],
32+
[
33+
False, "TRTLLM", True, False, False, False, False, False, False,
34+
False
35+
],
36+
[
37+
True, "FLASHINFER", True, False, False, False, True, False, False,
38+
False
39+
],
40+
[
41+
False, "FLASHINFER", True, False, False, False, True, False, False,
42+
False
43+
],
3544
[False, "TRTLLM", False, True, True, False, True, False, False, False],
3645
[True, "TRTLLM", False, True, True, False, True, False, False, False],
3746
[True, "TRTLLM", True, False, True, True, True, False, False, False],
3847
[True, "TRTLLM", True, False, True, False, True, False, False, False],
3948
# TODO: nvbugs/5461761
4049
# [True, "TRTLLM", True, False, False, True, True, False, False, False],
4150
[True, "TRTLLM", False, False, False, False, True, False, False, False],
42-
[False, "TRTLLM", False, False, False, False, True, False, False, False],
51+
[
52+
False, "TRTLLM", False, False, False, False, True, False, False,
53+
False
54+
],
4355
[True, "TRTLLM", False, False, False, False, False, True, False, False],
4456
[True, "TRTLLM", False, False, False, False, False, True, True, False],
45-
[True, "TRTLLM", False, True, True, True, True, True, True, True],
57+
[
58+
False, "TRTLLM", False, False, False, False, False, True, False,
59+
False
60+
],
61+
[True, "TRTLLM", False, False, False, False, True, True, False, False],
62+
[False, "TRTLLM", False, False, False, False, True, True, False, False],
63+
[
64+
True, "TRTLLM", False, False, False, False, False, False, False,
65+
False
66+
],
67+
[
68+
False, "TRTLLM", False, False, False, False, False, False, False,
69+
False
70+
],
71+
[True, "TRTLLM", False, False, False, True, True, False, False, False],
72+
[True, "TRTLLM", False, False, False, True, False, False, False, False],
73+
[
74+
True, "FLASHINFER", False, False, False, False, True, False, False,
75+
False
76+
],
77+
[
78+
False, "FLASHINFER", False, False, False, False, True, False, False,
79+
False
80+
],
81+
[True, "TRTLLM", False, True, True, True, True, True, True, True, True],
4682
])
4783
@pytest.mark.high_cuda_memory
4884
def test_llama_eagle3(use_cuda_graph: bool, attn_backend: str,

0 commit comments

Comments
 (0)