Skip to content

Commit 16cad8a

Browse files
author
Lord_of_Ironhill
committed
use triton_util instaed of triton
1 parent d50a577 commit 16cad8a

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

vllm_ascend/sample/rejection_sampler.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,10 @@
99
apply_sampling_constraints,
1010
generate_uniform_probs)
1111
from vllm.v1.spec_decode.metadata import SpecDecodeMetadata
12+
from vllm.triton_utils import HAS_TRITON, triton
13+
from vllm.triton_utils import triton.language as tl
1214

13-
<<<<<<< HEAD
14-
from vllm_ascend.utils import vllm_version_is
1515

16-
if vllm_version_is("0.11.0"):
17-
from vllm.v1.sample.rejection_sampler import compute_probs
18-
else:
19-
from vllm.v1.sample.rejection_sampler import apply_sampling_constraints
20-
21-
import triton.language as tl
22-
23-
=======
24-
>>>>>>> a1f142b... Drop 0.11.0 support (#4377)
2516
PLACEHOLDER_TOKEN_ID = -1
2617
GREEDY_TEMPERATURE = -1
2718
# Maximum number of speculative draft tokens allowed per request in a single

0 commit comments

Comments
 (0)