Skip to content

Commit fcd015c

Browse files
get deep ll to run
Signed-off-by: Lucas Wilkinson <[email protected]>
1 parent 2682bb7 commit fcd015c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

vllm/model_executor/layers/fused_moe/deepep_ll_prepare_finalize.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ def _create_finalize_ops(
220220

221221
_, _, recv_hook = self.buffer.low_latency_combine(
222222
fused_expert_output,
223-
topk_weights,
224223
topk_ids,
225224
combine_topk_weights,
226225
handle,

vllm/v1/worker/ubatching.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,11 @@ def __exit__(self, exc_type, exc_val, exc_tb):
112112

113113
def _restore_context(self):
114114
forward_context._forward_context = self.forward_context
115-
torch.cuda.set_stream(self.current_stream)
116115

117116
def update_stream(self, stream):
118117
self.current_stream = stream
119-
torch.cuda.set_stream(self.current_stream)
118+
if current_stream() != self.current_stream:
119+
torch.cuda.set_stream(self.current_stream)
120120

121121
def _signal_comm_done(self):
122122
self.gpu_comm_done_event.record(self.comm_stream)
@@ -271,9 +271,10 @@ def dbo_register_recv_hook(recv_hook: Callable[[], None],
271271
assert ctx is not None
272272
if all_schedules or ctx.schedule in schedules:
273273
next_ctx = _CURRENT_CONTEXTS[(ctx_idx + 1) % 2]
274-
assert next_ctx is not None
275-
next_ctx.recv_hook = recv_hook
276-
return True
274+
# Next context may have already exited
275+
if next_ctx is not None:
276+
next_ctx.recv_hook = recv_hook
277+
return True
277278
return False
278279

279280

0 commit comments

Comments
 (0)